Merge pull request #11996 from eric-wieser/dtype-tests

TST: Parametrize and break apart dtype tests

1 files changed, 43 insertions, 35 deletions

diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py
index deaf587d6..fc4dc952a 100644
--- a/numpy/core/tests/test_dtype.py
+++ b/numpy/core/tests/test_dtype.py
@@ -21,26 +21,26 @@ def assert_dtype_not_equal(a, b):
             "two different types hash to the same value !")
 
 class TestBuiltin(object):
-    def test_run(self):
+    @pytest.mark.parametrize('t', [int, float, complex, np.int32, str, object,
+                                   np.unicode])
+    def test_run(self, t):
         """Only test hash runs at all."""
-        for t in [int, float, complex, np.int32, str, object,
-                np.unicode]:
-            dt = np.dtype(t)
-            hash(dt)
+        dt = np.dtype(t)
+        hash(dt)
 
-    def test_dtype(self):
+    @pytest.mark.parametrize('t', [int, float])
+    def test_dtype(self, t):
         # Make sure equivalent byte order char hash the same (e.g. < and = on
         # little endian)
-        for t in [int, float]:
-            dt = np.dtype(t)
-            dt2 = dt.newbyteorder("<")
-            dt3 = dt.newbyteorder(">")
-            if dt == dt2:
-                assert_(dt.byteorder != dt2.byteorder, "bogus test")
-                assert_dtype_equal(dt, dt2)
-            else:
-                assert_(dt.byteorder != dt3.byteorder, "bogus test")
-                assert_dtype_equal(dt, dt3)
+        dt = np.dtype(t)
+        dt2 = dt.newbyteorder("<")
+        dt3 = dt.newbyteorder(">")
+        if dt == dt2:
+            assert_(dt.byteorder != dt2.byteorder, "bogus test")
+            assert_dtype_equal(dt, dt2)
+        else:
+            assert_(dt.byteorder != dt3.byteorder, "bogus test")
+            assert_dtype_equal(dt, dt3)
 
     def test_equivalent_dtype_hashing(self):
         # Make sure equivalent dtypes with different type num hash equal
@@ -649,12 +649,12 @@ class TestDtypeAttributes(object):
         new_dtype = np.dtype(dtype.descr)
         assert_equal(new_dtype.itemsize, 16)
 
-    def test_name_builtin(self):
-        for t in np.typeDict.values():
-            name = t.__name__
-            if name.endswith('_'):
-                name = name[:-1]
-            assert_equal(np.dtype(t).name, name)
+    @pytest.mark.parametrize('t', np.typeDict.values())
+    def test_name_builtin(self, t):
+        name = t.__name__
+        if name.endswith('_'):
+            name = name[:-1]
+        assert_equal(np.dtype(t).name, name)
 
     def test_name_dtype_subclass(self):
         # Ticket #4357
@@ -678,38 +678,46 @@ class TestPickling(object):
             assert_equal(x, y)
             assert_equal(x[0], y[0])
 
-    def test_builtin(self):
-        for t in [int, float, complex, np.int32, str, object,
-                  np.unicode, bool]:
-            self.check_pickling(np.dtype(t))
+    @pytest.mark.parametrize('t', [int, float, complex, np.int32, str, object,
+                                   np.unicode, bool])
+    def test_builtin(self, t):
+        self.check_pickling(np.dtype(t))
 
     def test_structured(self):
         dt = np.dtype(([('a', '>f4', (2, 1)), ('b', '<f8', (1, 3))], (2, 2)))
         self.check_pickling(dt)
+
+    def test_structured_aligned(self):
         dt = np.dtype('i4, i1', align=True)
         self.check_pickling(dt)
+
+    def test_structured_unaligned(self):
         dt = np.dtype('i4, i1', align=False)
         self.check_pickling(dt)
+
+    def test_structured_padded(self):
         dt = np.dtype({
             'names': ['A', 'B'],
             'formats': ['f4', 'f4'],
             'offsets': [0, 8],
             'itemsize': 16})
         self.check_pickling(dt)
+
+    def test_structured_titles(self):
         dt = np.dtype({'names': ['r', 'b'],
                        'formats': ['u1', 'u1'],
                        'titles': ['Red pixel', 'Blue pixel']})
         self.check_pickling(dt)
 
-    def test_datetime(self):
-        for base in ['m8', 'M8']:
-            for unit in ['', 'Y', 'M', 'W', 'D', 'h', 'm', 's', 'ms',
-                         'us', 'ns', 'ps', 'fs', 'as']:
-                dt = np.dtype('%s[%s]' % (base, unit) if unit else base)
-                self.check_pickling(dt)
-                if unit:
-                    dt = np.dtype('%s[7%s]' % (base, unit))
-                    self.check_pickling(dt)
+    @pytest.mark.parametrize('base', ['m8', 'M8'])
+    @pytest.mark.parametrize('unit', ['', 'Y', 'M', 'W', 'D', 'h', 'm', 's',
+                                      'ms', 'us', 'ns', 'ps', 'fs', 'as'])
+    def test_datetime(self, base, unit):
+        dt = np.dtype('%s[%s]' % (base, unit) if unit else base)
+        self.check_pickling(dt)
+        if unit:
+            dt = np.dtype('%s[7%s]' % (base, unit))
+            self.check_pickling(dt)
 
     def test_metadata(self):
         dt = np.dtype(int, metadata={'datum': 1})