Moved test_vector_from_numpy to end of vector tests

Author: caseyclements

test/test_bson.py

@@ -743,60 +743,6 @@ def test_uuid_legacy(self):
         transformed = bin.as_uuid(UuidRepresentation.PYTHON_LEGACY)
         self.assertEqual(id, transformed)
 
-    @unittest.skipIf(not _NUMPY_AVAILABLE, "numpy optional-dependency not installed.")
-    def test_vector_from_numpy(self):
-        """Follows test_vector except for input type numpy.ndarray"""
-        # Simple data values could be treated as any of our BinaryVectorDtypes
-        arr = np.array([2, 3])
-        # INT8
-        binary_vector_int8 = Binary.from_vector(arr, BinaryVectorDtype.INT8)
-        # as_vector
-        vector = binary_vector_int8.as_vector()
-        assert isinstance(vector, BinaryVector)
-        assert vector.data == arr.tolist()
-        # as_numpy_vector
-        vector_np = binary_vector_int8.as_numpy_vector()
-        assert isinstance(vector_np, BinaryVector)
-        assert np.all(vector.data == arr)
-        # PACKED_BIT
-        binary_vector_uint8 = Binary.from_vector(arr, BinaryVectorDtype.PACKED_BIT)
-        # as_vector
-        vector = binary_vector_uint8.as_vector()
-        assert isinstance(vector, BinaryVector)
-        assert vector.data == arr.tolist()
-        # as_numpy_vector
-        vector_np = binary_vector_uint8.as_numpy_vector()
-        assert isinstance(vector_np, BinaryVector)
-        assert np.all(vector_np.data == arr)
-        # FLOAT32
-        binary_vector_float32 = Binary.from_vector(arr, BinaryVectorDtype.FLOAT32)
-        # as_vector
-        vector = binary_vector_float32.as_vector()
-        assert isinstance(vector, BinaryVector)
-        assert vector.data == arr.tolist()
-        # as_numpy_vector
-        vector_np = binary_vector_float32.as_numpy_vector()
-        assert isinstance(vector_np, BinaryVector)
-        assert np.all(vector_np.data == arr)
-
-        # Invalid cases
-        with self.assertRaises(ValueError):
-            Binary.from_vector(np.array([-1]), BinaryVectorDtype.PACKED_BIT)
-        with self.assertRaises(ValueError):
-            Binary.from_vector(np.array([128]), BinaryVectorDtype.PACKED_BIT)
-        with self.assertRaises(ValueError):
-            Binary.from_vector(np.array([-198]), BinaryVectorDtype.INT8)
-
-        # Unexpected cases
-        # Creating a vector of INT8 from a list of doubles will be caught by struct.pack
-        # Numpy's default behavior is to cast to the type requested.
-        list_floats = [-1.1, 1.1]
-        cast_bin = Binary.from_vector(np.array(list_floats), BinaryVectorDtype.INT8)
-        vector = cast_bin.as_vector()
-        vector_np = cast_bin.as_numpy_vector()
-        assert vector.data != list_floats
-        assert vector.data == vector_np.data.tolist() == [-1, 1]
-
     def test_vector(self):
         """Tests of subtype 9"""
         # We start with valid cases, across the 3 dtypes implemented.
@@ -933,6 +879,60 @@ def test_binaryvector_equality(self):
             BinaryVector([1], BinaryVectorDtype.INT8), BinaryVector([2], BinaryVectorDtype.INT8)
         )
 
+    @unittest.skipIf(not _NUMPY_AVAILABLE, "numpy optional-dependency not installed.")
+    def test_vector_from_numpy(self):
+        """Follows test_vector except for input type numpy.ndarray"""
+        # Simple data values could be treated as any of our BinaryVectorDtypes
+        arr = np.array([2, 3])
+        # INT8
+        binary_vector_int8 = Binary.from_vector(arr, BinaryVectorDtype.INT8)
+        # as_vector
+        vector = binary_vector_int8.as_vector()
+        assert isinstance(vector, BinaryVector)
+        assert vector.data == arr.tolist()
+        # as_numpy_vector
+        vector_np = binary_vector_int8.as_numpy_vector()
+        assert isinstance(vector_np, BinaryVector)
+        assert np.all(vector.data == arr)
+        # PACKED_BIT
+        binary_vector_uint8 = Binary.from_vector(arr, BinaryVectorDtype.PACKED_BIT)
+        # as_vector
+        vector = binary_vector_uint8.as_vector()
+        assert isinstance(vector, BinaryVector)
+        assert vector.data == arr.tolist()
+        # as_numpy_vector
+        vector_np = binary_vector_uint8.as_numpy_vector()
+        assert isinstance(vector_np, BinaryVector)
+        assert np.all(vector_np.data == arr)
+        # FLOAT32
+        binary_vector_float32 = Binary.from_vector(arr, BinaryVectorDtype.FLOAT32)
+        # as_vector
+        vector = binary_vector_float32.as_vector()
+        assert isinstance(vector, BinaryVector)
+        assert vector.data == arr.tolist()
+        # as_numpy_vector
+        vector_np = binary_vector_float32.as_numpy_vector()
+        assert isinstance(vector_np, BinaryVector)
+        assert np.all(vector_np.data == arr)
+
+        # Invalid cases
+        with self.assertRaises(ValueError):
+            Binary.from_vector(np.array([-1]), BinaryVectorDtype.PACKED_BIT)
+        with self.assertRaises(ValueError):
+            Binary.from_vector(np.array([128]), BinaryVectorDtype.PACKED_BIT)
+        with self.assertRaises(ValueError):
+            Binary.from_vector(np.array([-198]), BinaryVectorDtype.INT8)
+
+        # Unexpected cases
+        # Creating a vector of INT8 from a list of doubles will be caught by struct.pack
+        # Numpy's default behavior is to cast to the type requested.
+        list_floats = [-1.1, 1.1]
+        cast_bin = Binary.from_vector(np.array(list_floats), BinaryVectorDtype.INT8)
+        vector = cast_bin.as_vector()
+        vector_np = cast_bin.as_numpy_vector()
+        assert vector.data != list_floats
+        assert vector.data == vector_np.data.tolist() == [-1, 1]
+
     def test_unicode_regex(self):
         """Tests we do not get a segfault for C extension on unicode RegExs.
         This had been happening.