Merge pull request #698 from skrah/split_tests

izaid · izaid · commit f017a86161c6 · 2016-05-22T15:57:11.000+01:00
Split tests
diff --git a/TESTING.md b/TESTING.md
@@ -2,18 +2,17 @@ Running The Python Tests
 ========================
 
 The Python tests are written using Python's built in unittest module,
-and can either be run by executing the scripts or with nose. To run
-a test script directly, simply execute the test .py file:
+and can either be run by executing the scripts or with nose.  The two
+modules dynd.nd and dynd.ndt have separate tests. To run a test script
+directly, simply execute the test .py file.
 
-    D:\Develop\dynd-python>python dynd\tests\test_dtype.py
-    ...........
-    ----------------------------------------------------------------------
-    Ran 11 tests in 0.003s
+Examples:
 
-    OK
+    D:\Develop\dynd-python>python dynd\ndt\test\test_type_basics.py
+    D:\Develop\dynd-python>python dynd\nd\test\test_array_basics.py
 
-To execute the full test suite, run the following (not from the root project
-directory):
+To execute the full test suite for both modules, run the following
+(not from the root project directory):
 
     D:\Develop>python -c "import dynd; dynd.test()"
     Running unit tests for the DyND Python bindings
diff --git a/dynd/__init__.py b/dynd/__init__.py
@@ -104,7 +104,8 @@ def test(verbosity=1, xunitfile=None, exit=False):
     """
     import os, sys, subprocess
     import numpy
-    from .tests import get_tst_module
+    from .ndt.test import get_tst_module as ndt_test
+    from .nd.test import get_tst_module as nd_test
     import unittest
 
     print('Running unit tests for the DyND Python bindings')
@@ -120,9 +121,13 @@ def test(verbosity=1, xunitfile=None, exit=False):
     if xunitfile is None:
         # Run all the tests
         all_suites = []
-        for fn in os.listdir(os.path.join(os.path.dirname(__file__), 'tests')):
+        for fn in os.listdir(os.path.join(os.path.dirname(__file__), 'ndt/test')):
             if fn.startswith('test_') and fn.endswith('.py'):
-                tst = get_tst_module(fn[:-3])
+                tst = ndt_test(fn[:-3])
+                all_suites.append(unittest.defaultTestLoader.loadTestsFromModule(tst))
+        for fn in os.listdir(os.path.join(os.path.dirname(__file__), 'nd/test')):
+            if fn.startswith('test_') and fn.endswith('.py'):
+                tst = nd_test(fn[:-3])
                 all_suites.append(unittest.defaultTestLoader.loadTestsFromModule(tst))
         runner = unittest.TextTestRunner(stream=sys.stdout, verbosity=verbosity)
         result = runner.run(unittest.TestSuite(all_suites))
@@ -140,8 +145,8 @@ def test(verbosity=1, xunitfile=None, exit=False):
         # Add all 'tests' subdirectories to the options
         rootdir = os.path.dirname(__file__)
         for root, dirs, files in os.walk(rootdir):
-            if 'tests' in dirs:
-                testsdir = os.path.join(root, 'tests')
+            if 'test' in dirs:
+                testsdir = os.path.join(root, 'test')
                 argv.append(testsdir)
                 print('Test dir: %s' % testsdir[len(rootdir)+1:])
         # Ask nose to do its thing
diff --git a/dynd/nd/test/__init__.py b/dynd/nd/test/__init__.py
diff --git a/dynd/nd/test/test_annotate.py b/dynd/nd/test/test_annotate.py
@@ -376,4 +376,4 @@ def f(x, y):
                 pass
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_arithmetic.py b/dynd/nd/test/test_arithmetic.py
@@ -1,5 +1,5 @@
 import unittest
-from dynd import nd, ndt
+from dynd import nd
 import sys
 
 @unittest.skip('Test disabled since translate_exception is not being applied properly')
@@ -40,3 +40,6 @@ def test_arithmetic_exceptions(self):
         # but should not fail silently.
         self.assertRaises(ValueError, a.__pow__, a, a)
         self.assertRaises(RuntimeError, a.__rpow__, b)
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_as_py.py b/dynd/nd/test/test_array_as_py.py
@@ -46,3 +46,6 @@ def test_struct_or_tuple(self):
             """)
         a = nd.array(data, type=tp)
         self.assertEqual(nd.as_py(a), data)
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_basics.py b/dynd/nd/test/test_array_basics.py
diff --git a/dynd/nd/test/test_array_cast.py b/dynd/nd/test/test_array_cast.py
@@ -48,4 +48,4 @@ def test_array_complex(self):
         self.assertEqual(complex(a), 1.125e-20+3j)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_construct.py b/dynd/nd/test/test_array_construct.py
@@ -720,4 +720,4 @@ def test_scalar_option(self):
 #                                       (u'\uc548\ub155', u'\uc548\ub155')])
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_copy.py b/dynd/nd/test/test_array_copy.py
@@ -1,6 +1,5 @@
 import sys
 import unittest
-from datetime import date
 from dynd import nd, ndt
 import numpy as np
 
@@ -241,4 +240,4 @@ def test_string_assign_to_slice(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_dtype.py b/dynd/nd/test/test_array_dtype.py
@@ -0,0 +1,59 @@
+import unittest
+from dynd import nd, ndt
+
+class TestDType(unittest.TestCase):
+    def test_complex_type_realimag(self):
+        a = nd.array(1 + 3j)
+        self.assertEqual(ndt.complex_float64, nd.type_of(a))
+        self.assertEqual(1, nd.as_py(a.real))
+        self.assertEqual(3, nd.as_py(a.imag))
+
+        a = nd.array([1 + 2j, 3 + 4j, 5 + 6j])
+        self.assertEqual(ndt.type('3 * complex[float64]'), nd.type_of(a))
+        self.assertEqual([1, 3, 5], nd.as_py(a.real))
+        self.assertEqual([2, 4, 6], nd.as_py(a.imag))
+
+    def test_type_type(self):
+        d = ndt.type('type')
+        self.assertEqual(str(d), 'type')
+
+        # Creating a dynd array out of a dtype
+        # results in it having the dtype 'dtype'
+        n = nd.array(d)
+        self.assertEqual(nd.type_of(n), d)
+
+        # Python float type converts to float64
+        n = nd.array(float)
+        self.assertEqual(nd.type_of(n), d)
+        self.assertEqual(nd.as_py(n), ndt.float64)
+
+    #def test_symbolic_type(self):
+    #    tp = ndt.type('(int, real) -> complex')
+    #    self.assertEqual(tp.type_id, 'callable')
+    #    self.assertEqual(nd.as_py(tp.pos_types), [ndt.int32, ndt.float64])
+    #    self.assertEqual(tp.return_type, ndt.complex_float64)
+    #    tp = ndt.type('MyType')
+    #    self.assertEqual(tp.type_id, 'typevar')
+    #    self.assertEqual(tp.name, 'MyType')
+    #    tp = ndt.type('MyDim * int')
+    #    self.assertEqual(tp.type_id, 'typevar_dim')
+    #    self.assertEqual(tp.name, 'MyDim')
+    #    self.assertEqual(tp.element_type, ndt.int32)
+    #    tp = ndt.type('... * int')
+    #    self.assertEqual(tp.type_id, 'ellipsis_dim')
+    #    self.assertEqual(tp.element_type, ndt.int32)
+    #    tp = ndt.type('MyEll... * int')
+    #    self.assertEqual(tp.type_id, 'ellipsis_dim')
+    #    self.assertEqual(tp.name, 'MyEll')
+    #    self.assertEqual(tp.element_type, ndt.int32)
+
+    """
+    ToDo: Fix this.
+    def test_var_dshape(self):
+        # Getting the dshape can see into leading var dims
+        a = nd.array([[[1], [2,3]]], type='var * var * var * int32')
+        self.assertEqual(nd.dshape_of(a), '1 * 2 * var * int32')
+    """
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_getitem.py b/dynd/nd/test/test_array_getitem.py
@@ -66,4 +66,4 @@ def test_nd_array_int(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_in.py b/dynd/nd/test/test_array_in.py
@@ -53,4 +53,4 @@ def test_strings_different_encoding(self):
 """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_array_setitem.py b/dynd/nd/test/test_array_setitem.py
diff --git a/dynd/nd/test/test_array_squeeze.py b/dynd/nd/test/test_array_squeeze.py
@@ -62,3 +62,6 @@ def test_squeeze_errors(self):
         # Axis not an integer
         self.assertRaises(TypeError, nd.squeeze, a, axis=2.0)
         self.assertRaises(TypeError, nd.squeeze, a, axis=(0, 2.0+0j))
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_arrfunc.py b/dynd/nd/test/test_arrfunc.py
@@ -270,4 +270,4 @@ def test_rolling_mean(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_computed_fields.py b/dynd/nd/test/test_computed_fields.py
@@ -79,4 +79,4 @@ def test_aggregate(self):
         """
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_ctypes_interop.py b/dynd/nd/test/test_ctypes_interop.py
@@ -58,4 +58,4 @@
 #                ndt.type(POINT * 10))
 #
 #if __name__ == '__main__':
-#    unittest.main()
+#    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_functional.py b/dynd/nd/test/test_functional.py
@@ -90,4 +90,4 @@ def callables():
 """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_int128.py b/dynd/nd/test/test_int128.py
@@ -48,4 +48,4 @@ def assign_val(x, val):
 """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_lowlevel.py b/dynd/nd/test/test_lowlevel.py
diff --git a/dynd/nd/test/test_nd_fields.py b/dynd/nd/test/test_nd_fields.py
@@ -95,4 +95,4 @@ def test_bad_field_name(self):
 """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_nd_groupby.py b/dynd/nd/test/test_nd_groupby.py
@@ -38,4 +38,4 @@ def test_grouped_slices(self):
 """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_numpy_compat.py b/dynd/nd/test/test_numpy_compat.py
@@ -25,4 +25,4 @@ def test_array_attributes(self):
         self.assertEqual(a.dtype, ndt.int32)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_numpy_interop.py b/dynd/nd/test/test_numpy_interop.py
@@ -1,8 +1,6 @@
-import sys
 import unittest
 from dynd import nd, ndt
 import numpy as np
-from datetime import date, datetime
 from numpy.testing import *
 
 @unittest.skip('Test disabled since callables were reworked')
@@ -633,4 +631,4 @@ def test_string_as_numpy(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_pickle.py b/dynd/nd/test/test_pickle.py
@@ -1,4 +1,3 @@
-import sys
 import unittest
 from pickle import loads, dumps
 from dynd import nd, ndt
@@ -8,3 +7,6 @@ def test_pickle_types(self):
         self.assertEqual(nd.array, loads(dumps(nd.array)))
         self.assertEqual(nd.callable, loads(dumps(nd.callable)))
         self.assertEqual(ndt.type, loads(dumps(ndt.type)))
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_python_list.py b/dynd/nd/test/test_python_list.py
@@ -1,6 +1,4 @@
-import sys
 import unittest
-from datetime import date, datetime
 from dynd import nd, ndt
 
 class TestPythonList(unittest.TestCase):
@@ -72,4 +70,4 @@ def test_float64(self):
     """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_python_scalar.py b/dynd/nd/test/test_python_scalar.py
@@ -1,7 +1,6 @@
 import sys
 import unittest
 from dynd import nd, ndt
-from datetime import date
 
 if sys.version_info >= (3, 0):
     unicode = str
@@ -92,4 +91,4 @@ def test_len(self):
         self.assertRaises(ValueError, len, a)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_range_linspace.py b/dynd/nd/test/test_range_linspace.py
@@ -1,4 +1,3 @@
-import sys
 import unittest
 from dynd import nd, ndt
 
@@ -101,4 +100,4 @@ def test_cast_errors(self):
         self.assertRaises(RuntimeError, nd.old_linspace, 0j, 1j, dtype=ndt.float64)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_types_categorical.py b/dynd/nd/test/test_types_categorical.py
@@ -62,4 +62,4 @@ def test_rainbow_example(self):
 """
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
diff --git a/dynd/nd/test/test_unicode.py b/dynd/nd/test/test_unicode.py
diff --git a/dynd/ndt/test/__init__.py b/dynd/ndt/test/__init__.py
@@ -0,0 +1,4 @@
+def get_tst_module(m):
+    l = dict(locals())
+    exec('from . import %s as tst' % m, globals(), l)
+    return l['tst']
diff --git a/dynd/ndt/test/test_dim_helpers.py b/dynd/ndt/test/test_dim_helpers.py
@@ -1,5 +1,5 @@
 import unittest
-from dynd import nd, ndt
+from dynd import ndt
 
 class TestDimHelpers(unittest.TestCase):
     def test_create(self):
@@ -34,3 +34,6 @@ def test_repr(self):
         self.assertEqual(repr(ndt.var * ndt.fixed *
                               ndt.fixed[2] * ndt.fixed[3]),
                          'ndt.var * ndt.fixed * ndt.fixed[2] * ndt.fixed[3]')
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/dynd/ndt/test/test_dtype.py b/dynd/ndt/test/test_dtype.py
diff --git a/dynd/ndt/test/test_dtype_datashape.py b/dynd/ndt/test/test_dtype_datashape.py
diff --git a/dynd/ndt/test/test_type_basics.py b/dynd/ndt/test/test_type_basics.py
diff --git a/dynd/ndt/test/test_type_pattern_match.py b/dynd/ndt/test/test_type_pattern_match.py
diff --git a/setup.py b/setup.py
