Merge pull request #659 from adamtheturtle/test-all-fix

Use fixture to simplify tests

Author: adamtheturtle

tests/mock_vws/test_query.py

@@ -679,7 +679,37 @@ def test_invalid_type(
         )
 
 
-@pytest.mark.usefixtures('verify_mock_vuforia')
+@pytest.fixture()
+def add_targets(
+    high_quality_image: io.BytesIO,
+    vuforia_database_keys: VuforiaDatabaseKeys,
+) -> None:
+    """
+    Add two targets with the "high_quality_image" fixture contents.
+    """
+    image_content = high_quality_image.getvalue()
+    image_data_encoded = base64.b64encode(image_content).decode('ascii')
+    for name in ('example_1', 'example_2'):
+        add_target_data = {
+            'name': name,
+            'width': 1,
+            'image': image_data_encoded,
+        }
+
+        response = add_target_to_vws(
+            vuforia_database_keys=vuforia_database_keys,
+            data=add_target_data,
+        )
+
+        target_id = response.json()['target_id']
+
+        wait_for_target_processed(
+            target_id=target_id,
+            vuforia_database_keys=vuforia_database_keys,
+        )
+
+
+@pytest.mark.usefixtures('verify_mock_vuforia', 'add_targets')
 class TestIncludeTargetData:
     """
     Tests for the ``include_target_data`` parameter.
@@ -694,26 +724,6 @@ def test_default(
         The default ``include_target_data`` is 'top'.
         """
         image_content = high_quality_image.getvalue()
-        image_data_encoded = base64.b64encode(image_content).decode('ascii')
-        for name in ('example_1', 'example_2'):
-            add_target_data = {
-                'name': name,
-                'width': 1,
-                'image': image_data_encoded,
-            }
-
-            response = add_target_to_vws(
-                vuforia_database_keys=vuforia_database_keys,
-                data=add_target_data,
-            )
-
-            target_id = response.json()['target_id']
-
-            wait_for_target_processed(
-                target_id=target_id,
-                vuforia_database_keys=vuforia_database_keys,
-            )
-
         body = {
             'image': ('image.jpeg', image_content, 'image/jpeg'),
             'max_num_results': (None, 2, 'text/plain'),
@@ -741,26 +751,6 @@ def test_top(
         the first result includes target data.
         """
         image_content = high_quality_image.getvalue()
-        image_data_encoded = base64.b64encode(image_content).decode('ascii')
-        for name in ('example_1', 'example_2'):
-            add_target_data = {
-                'name': name,
-                'width': 1,
-                'image': image_data_encoded,
-            }
-
-            response = add_target_to_vws(
-                vuforia_database_keys=vuforia_database_keys,
-                data=add_target_data,
-            )
-
-            target_id = response.json()['target_id']
-
-            wait_for_target_processed(
-                target_id=target_id,
-                vuforia_database_keys=vuforia_database_keys,
-            )
-
         body = {
             'image': ('image.jpeg', image_content, 'image/jpeg'),
             'include_target_data': (None, include_target_data, 'text/plain'),
@@ -789,35 +779,21 @@ def test_none(
         results include target data.
         """
         image_content = high_quality_image.getvalue()
-        image_data_encoded = base64.b64encode(image_content).decode('ascii')
-        add_target_data = {
-            'name': 'example',
-            'width': 1,
-            'image': image_data_encoded,
-        }
-        response = add_target_to_vws(
-            vuforia_database_keys=vuforia_database_keys,
-            data=add_target_data,
-        )
-
-        target_id = response.json()['target_id']
-
-        wait_for_target_processed(
-            target_id=target_id,
-            vuforia_database_keys=vuforia_database_keys,
-        )
         body = {
             'image': ('image.jpeg', image_content, 'image/jpeg'),
             'include_target_data': (None, include_target_data, 'text/plain'),
+            'max_num_results': (None, 2, 'text/plain'),
         }
+
         response = query(
             vuforia_database_keys=vuforia_database_keys,
             body=body,
         )
 
         assert_query_success(response=response)
-        [result] = response.json()['results']
-        assert 'target_data' not in result
+        result_1, result_2 = response.json()['results']
+        assert 'target_data' not in result_1
+        assert 'target_data' not in result_2
 
     @pytest.mark.parametrize('include_target_data', ['all', 'ALL'])
     def test_all(
@@ -831,26 +807,6 @@ def test_all(
         results include target data.
         """
         image_content = high_quality_image.getvalue()
-        image_data_encoded = base64.b64encode(image_content).decode('ascii')
-        for name in ('example_1', 'example_2'):
-            add_target_data = {
-                'name': name,
-                'width': 1,
-                'image': image_data_encoded,
-            }
-
-            response = add_target_to_vws(
-                vuforia_database_keys=vuforia_database_keys,
-                data=add_target_data,
-            )
-
-            target_id = response.json()['target_id']
-
-            wait_for_target_processed(
-                target_id=target_id,
-                vuforia_database_keys=vuforia_database_keys,
-            )
-
         body = {
             'image': ('image.jpeg', image_content, 'image/jpeg'),
             'include_target_data': (None, include_target_data, 'text/plain'),