Reorganized test cases and separated into classes.

Author: pykler

tests/test_yajl.py

@@ -24,11 +24,9 @@ def yajl_start_array(self, ctx):
     def yajl_end_array(self, ctx):
         pass
 
-class YajlPyTests(MockTestCase):
+class YajlParserTests(MockTestCase):
     '''
-    Testing YAJL-PY interfaces/callbacks
-
-    Description: Making sure yajl-py works with current installed yajl
+    Testing :class:`YajlParser` interfaces/callbacks
     '''
     def setUp(self):
         MockTestCase.setUp(self)
@@ -141,44 +139,10 @@ def test_raisesExceptionOnInvalidJson(self):
             yajl.YajlError,
             parser.parse, invalid_json)
 
-    def test_load_yajl_raisesOSErrorIfYajlNotFound(self):
-        self.mock('yajl.cdll.LoadLibrary', raises=OSError('ABCD'))
-        e = None
-        try:
-            yajl.load_yajl()
-        except OSError, e:
-            pass
-        self.failUnless('Yajl shared object cannot be found.' in str(e))
-
-    def test_get_yajl_version_correctlyParsesYajlVersion(self):
-        for major in [0, 1, 3, 7]:
-            for minor in [0, 1, 2, 5]:
-                for micro in [0, 5, 10, 15, 20]:
-                    yajl_version = major * 10000 + minor * 100 + micro
-                    self.mock('yajl.yajl.yajl_version', returns=yajl_version)
-                    self.failUnlessEqual(
-                        '%s.%s.%s' %(major, minor, micro),
-                        yajl.get_yajl_version())
-
-    def test_check_yajl_version_warnsOnlyWhenMismatchedVersions(self):
-        import warnings
-        self.mock('warnings.warn', [locals()])
-        self.mock('yajl.__version__', mock_obj='1.1.1')
-        self.mock('yajl.yajl_version', mock_obj='1.1.1')
-        self.failUnless(yajl.check_yajl_version())
-        self.assertSameTrace('')
-        self.mock('yajl.yajl_version', mock_obj='1.1.0')
-        self.failIf(yajl.check_yajl_version())
-        self.assertSameTrace(
-            "Called warnings.warn("
-                "'Using Yajl-Py v1.1.1 with Yajl v1.1.0. "
-                "It is advised to use the same Yajl-Py and Yajl versions',"
-                "<type 'exceptions.RuntimeWarning'>, stacklevel=3)"
-        )
-
-    def test_checkYajlPyAndYajlHaveSameVersion(self):
-        self.failUnless(yajl.check_yajl_version())
-
+class YajlGenTests(MockTestCase):
+    '''
+    Testing :class:`YajlGen` works as expected
+    '''
     def test_YajlGen_callsYajlGenFreeWhenDone(self):
         self.mock('yajl.yajl_gen.byref', tracker=None)
         self.mock('yajl.yajl.yajl_gen_alloc')
@@ -248,3 +212,45 @@ def test_YajlGen_indentOUtput(self):
             '**]\n'
             '}\n',
             ''.join(results))
+
+class YajlCommonTests(MockTestCase):
+    '''
+    Testing common functions and the loading libyajl
+    '''
+    def test_load_yajl_raisesOSErrorIfYajlNotFound(self):
+        self.mock('yajl.cdll.LoadLibrary', raises=OSError('ABCD'))
+        e = None
+        try:
+            yajl.load_yajl()
+        except OSError, e:
+            pass
+        self.failUnless('Yajl shared object cannot be found.' in str(e))
+
+    def test_get_yajl_version_correctlyParsesYajlVersion(self):
+        for major in [0, 1, 3, 7]:
+            for minor in [0, 1, 2, 5]:
+                for micro in [0, 5, 10, 15, 20]:
+                    yajl_version = major * 10000 + minor * 100 + micro
+                    self.mock('yajl.yajl.yajl_version', returns=yajl_version)
+                    self.failUnlessEqual(
+                        '%s.%s.%s' %(major, minor, micro),
+                        yajl.get_yajl_version())
+
+    def test_check_yajl_version_warnsOnlyWhenMismatchedVersions(self):
+        import warnings
+        self.mock('warnings.warn', [locals()])
+        self.mock('yajl.__version__', mock_obj='1.1.1')
+        self.mock('yajl.yajl_version', mock_obj='1.1.1')
+        self.failUnless(yajl.check_yajl_version())
+        self.assertSameTrace('')
+        self.mock('yajl.yajl_version', mock_obj='1.1.0')
+        self.failIf(yajl.check_yajl_version())
+        self.assertSameTrace(
+            "Called warnings.warn("
+                "'Using Yajl-Py v1.1.1 with Yajl v1.1.0. "
+                "It is advised to use the same Yajl-Py and Yajl versions',"
+                "<type 'exceptions.RuntimeWarning'>, stacklevel=3)"
+        )
+
+    def test_checkYajlPyAndYajlHaveSameVersion(self):
+        self.failUnless(yajl.check_yajl_version())