Uncomment some dimension deduction tests.

Author: insertinterestingnamehere

dynd/nd/test/test_array_construct.py

@@ -619,53 +619,50 @@ def test_extra_field(self):
 #        self.assertEqual(nd.type_of(a), ndt.type('var * int32'))
 #        self.assertEqual(nd.as_py(a), [2*x + 1 for x in range(7)])
 
-"""
 class TestDeduceDims(unittest.TestCase):
+    """
     def test_simplearr(self):
         val = [[[1, 2], [3, 4]], [[5, 6], [7, 8]],
                [[11, 12], [13, 14]], [[15, 16], [17, 18]]]
         # Deduce all the dims
-        a = nd.array(val, dtype=ndt.int16)
+        a = nd.array(val, type=ndt.int16)
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
         # Specify some dims as fixed
-        a = nd.array(val, dtype='Fixed * int16')
+        a = nd.array(val, type='Fixed * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
-        a = nd.array(val, dtype='Fixed * Fixed * int16')
+        a = nd.array(val, type='Fixed * Fixed * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
-        a = nd.array(val, dtype='Fixed * Fixed * Fixed * int16')
+        a = nd.array(val, type='Fixed * Fixed * Fixed * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
         # Specify some dims as fixed
-        a = nd.array(val, dtype='2 * int16')
+        a = nd.array(val, type='2 * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
-        a = nd.array(val, dtype='2 * 2 * int16')
+        a = nd.array(val, type='2 * 2 * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
-        a = nd.array(val, dtype='4 * 2 * 2 * int16')
+        a = nd.array(val, type='4 * 2 * 2 * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
         # Mix fixed, symbolic fixed, and var
-        a = nd.array(val, dtype='4 * var * Fixed * int16')
+        a = nd.array(val, type='4 * var * Fixed * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * var * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
-        a = nd.array(val, dtype='var * 2 * int16')
+        a = nd.array(val, type='var * 2 * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * var * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
-        a = nd.array(val, dtype='Fixed * 2 * int16')
+        a = nd.array(val, type='Fixed * 2 * int16')
         self.assertEqual(nd.type_of(a), ndt.type('4 * 2 * 2 * int16'))
         self.assertEqual(nd.as_py(a), val)
+    """
 
     def test_empty(self):
-        # A fixed dimension of non-zero size gets pushed down
-        a = nd.array([], dtype='3 * int32')
-        self.assertEqual(nd.type_of(a), ndt.type('0 * 3 * int32'))
-        self.assertEqual(nd.as_py(a), [])
         # A fixed dimension of zero size gets absorbed
-        a = nd.array([], dtype='0 * int32')
+        a = nd.array([], type='0 * int32')
         self.assertEqual(nd.type_of(a), ndt.type('0 * int32'))
         self.assertEqual(nd.as_py(a), [])
         # A symbolic fixed dimension gets absorbed
@@ -674,10 +671,9 @@ def test_empty(self):
 #        self.assertEqual(nd.type_of(a), ndt.type('0 * int32'))
  #       self.assertEqual(nd.as_py(a), [])
         # A var dimension gets absorbed
-        a = nd.array([], dtype='var * int32')
+        a = nd.array([], type='var * int32')
         self.assertEqual(nd.type_of(a), ndt.type('var * int32'))
         self.assertEqual(nd.as_py(a), [])
-"""
 
 #class TestConstructErrors(unittest.TestCase):
 #    def test_bad_params(self):