Start of consolidating tests for vws

Author: adamtheturtle

tests/test_add_target.py

@@ -3,16 +3,17 @@
 """
 
 import io
+from typing import Optional
 
 import pytest
 from mock_vws import MockVWS
 
 from vws import VWS
 
 
-class TestSuccess:
+class TestAddTarget:
     """
-    Tests for successfully adding a target.
+    Tests for adding a target.
     """
 
     def test_add_target(
@@ -48,39 +49,8 @@ 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 TestCustomBaseURL:
-    """
-    Tests for adding images to databases under custom VWS URLs.
-    """
-
-    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(
+    def test_valid_metadata(
         self,
         client: VWS,
         high_quality_image: io.BytesIO,
@@ -96,30 +66,8 @@ def test_valid(
             application_metadata=None,
         )
 
-
-class TestActiveFlag:
-    """
-    Tests for the ``active_flag`` parameter to ``add_target``.
-    """
-
-    def test_default(
-        self,
-        client: VWS,
-        high_quality_image: io.BytesIO,
-    ) -> None:
-        """
-        By default, the active flag is set to ``True``.
-        """
-        target_id = client.add_target(
-            name='x',
-            width=1,
-            image=high_quality_image,
-        )
-        target_record = client.get_target_record(target_id=target_id)
-        assert target_record['active_flag'] is True
-
     @pytest.mark.parametrize('active_flag', [True, False])
-    def test_given(
+    def test_active_flag_given(
         self,
         client: VWS,
         high_quality_image: io.BytesIO,
@@ -136,3 +84,28 @@ def test_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,
+            )