# HG changeset patch
# User kylev
# Date 1234682803 0
# Node ID 2d1a3d9e15b2461dcf2ede77b850e1b62d5261e0
# Parent  78e810705b3d9f04d7226cce743fc75cf2282e52
Update some of the constants and declarations to post python-2.0
convenience functions, increase related test coverage.

diff -r 78e810705b3d -r 2d1a3d9e15b2 tests/test_MySQLdb_nonstandard.py
--- a/tests/test_MySQLdb_nonstandard.py	Sun Feb 15 07:26:36 2009 +0000
+++ b/tests/test_MySQLdb_nonstandard.py	Sun Feb 15 07:26:43 2009 +0000
@@ -1,5 +1,6 @@
 import unittest
 
+import _mysql
 import MySQLdb
 from MySQLdb.constants import FIELD_TYPE
 
@@ -18,46 +19,57 @@
         self.assertTrue(FIELD_TYPE.DATE != MySQLdb.STRING)
 
 
-class NonStandard(unittest.TestCase):
-    """Test _mysql.connection internals."""
+class CoreAPI(unittest.TestCase):
+    """Test _mysql internals."""
 
     def setUp(self):
-        self.conn = MySQLdb.connect(db='test')
+        self.conn = _mysql.connect(db='test')
 
     def tearDown(self):
         self.conn.close()
 
+    def test_NULL(self):
+        """Should have a NULL constant."""
+        self.assertEqual(_mysql.NULL, 'NULL')
+
+    def test_version(self):
+        """Version information sanity."""
+        self.assertTrue(isinstance(_mysql.__version__, str))
+
+        self.assertTrue(isinstance(_mysql.version_info, tuple))
+        self.assertEqual(len(_mysql.version_info), 5)
+
     def test_thread_id(self):
-        tid = self.conn._db.thread_id()
+        tid = self.conn.thread_id()
         self.assertTrue(isinstance(tid, int),
                         "thread_id didn't return an int.")
 
-        self.assertRaises(TypeError, self.conn._db.thread_id, ('evil',),
+        self.assertRaises(TypeError, self.conn.thread_id, ('evil',),
                           "thread_id shouldn't accept arguments.")
 
     def test_affected_rows(self):
-        self.assertEquals(self.conn._db.affected_rows(), 0,
+        self.assertEquals(self.conn.affected_rows(), 0,
                           "Should return 0 before we do anything.")
 
 
     def test_debug(self):
         # FIXME Only actually tests if you lack SUPER
         self.assertRaises(MySQLdb.OperationalError,
-                          self.conn._db.dump_debug_info)
+                          self.conn.dump_debug_info)
 
     def test_charset_name(self):
-        self.assertTrue(isinstance(self.conn._db.character_set_name(), str),
+        self.assertTrue(isinstance(self.conn.character_set_name(), str),
                         "Should return a string.")
 
     def test_host_info(self):
-        self.assertTrue(isinstance(self.conn._db.get_host_info(), str),
+        self.assertTrue(isinstance(self.conn.get_host_info(), str),
                         "Should return a string.")
 
     def test_proto_info(self):
-        self.assertTrue(isinstance(self.conn._db.get_proto_info(), int),
+        self.assertTrue(isinstance(self.conn.get_proto_info(), int),
                         "Should return an int.")
 
     def test_server_info(self):
-        self.assertTrue(isinstance(self.conn._db.get_server_info(), str),
+        self.assertTrue(isinstance(self.conn.get_server_info(), str),
                         "Should return an str.")