Merge pull request #837 from adamtheturtle/move-tests

Move a few tests around

Author: adamtheturtle

tests/test_add_target.py

@@ -49,37 +49,6 @@ def test_add_two_targets(
         client.add_target(name='x', width=1, image=high_quality_image)
         client.add_target(name='a', width=1, image=high_quality_image)
 
-
-class TestCustomBaseVWSURL:
-    """
-    Tests for using a custom base VWS URL.
-    """
-
-    def test_custom_base_url(self, high_quality_image: io.BytesIO) -> None:
-        """
-        It is possible to use add a target to a database under a custom VWS
-        URL.
-        """
-        base_vws_url = 'http://example.com'
-        with MockVWS(base_vws_url=base_vws_url) as mock:
-            client = VWS(
-                server_access_key=mock.server_access_key,
-                server_secret_key=mock.server_secret_key,
-                base_vws_url=base_vws_url,
-            )
-
-            client.add_target(
-                name='x',
-                width=1,
-                image=high_quality_image,
-            )
-
-
-class TestApplicationMetadata:
-    """
-    Tests for the ``application_metadata`` parameter to ``add_target``.
-    """
-
     @pytest.mark.parametrize('application_metadata', [None, b'a'])
     def test_valid_metadata(
         self,
@@ -97,12 +66,6 @@ def test_valid_metadata(
             application_metadata=application_metadata,
         )
 
-
-class TestActiveFlag:
-    """
-    Tests for the ``active_flag`` parameter to ``add_target``.
-    """
-
     @pytest.mark.parametrize('active_flag', [True, False])
     def test_active_flag_given(
         self,
@@ -121,3 +84,28 @@ def test_active_flag_given(
         )
         target_record = client.get_target_record(target_id=target_id)
         assert target_record['active_flag'] is active_flag
+
+
+class TestCustomBaseVWSURL:
+    """
+    Tests for using a custom base VWS URL.
+    """
+
+    def test_custom_base_url(self, high_quality_image: io.BytesIO) -> None:
+        """
+        It is possible to use add a target to a database under a custom VWS
+        URL.
+        """
+        base_vws_url = 'http://example.com'
+        with MockVWS(base_vws_url=base_vws_url) as mock:
+            client = VWS(
+                server_access_key=mock.server_access_key,
+                server_secret_key=mock.server_secret_key,
+                base_vws_url=base_vws_url,
+            )
+
+            client.add_target(
+                name='x',
+                width=1,
+                image=high_quality_image,
+            )