Clean up a few tests

Author: adamtheturtle

src/vws/exceptions/vws_exceptions.py

@@ -1,3 +1,9 @@
+"""
+Exception raised when Vuforia returns a response with a result code matching
+one of those documented at
+https://library.vuforia.com/articles/Solution/How-To-Use-the-Vuforia-Web-Services-API#How-To-Interperete-VWS-API-Result-Codes.
+"""
+
 import json
 from urllib.parse import urlparse
 

tests/test_exceptions.py

@@ -4,10 +4,8 @@
 
 import io
 from http import HTTPStatus
-from typing import List, Type, Union
 
 import pytest
-import requests
 from freezegun import freeze_time
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
@@ -19,11 +17,7 @@
     MatchProcessing,
     MaxNumResultsOutOfRange,
 )
-from vws.exceptions.custom_exceptions import (
-    ConnectionErrorPossiblyImageTooLarge,
-    TargetProcessingTimeout,
-    UnknownVWSErrorPossiblyBadName,
-)
+from vws.exceptions.custom_exceptions import UnknownVWSErrorPossiblyBadName
 from vws.exceptions.vws_exceptions import (
     AuthenticationFailure,
     BadImage,
@@ -389,29 +383,32 @@ def test_cloudrecoexception_inheritance() -> None:
         assert issubclass(subclass, CloudRecoException)
 
 
-def test_others_inheritance() -> None:
+def test_base_exceptions_properties(
+    vws_client: VWS,
+    cloud_reco_client: CloudRecoService,
+    high_quality_image: io.BytesIO,
+) -> None:
     """
-    Make sure other exceptions are inherited from their expected super-classes.
+    ``VWSException``s and ``CloudRecoException```s each have a response
+    property.
     """
-    assert issubclass(
-        ConnectionErrorPossiblyImageTooLarge,
-        requests.ConnectionError,
+    with pytest.raises(VWSException) as exc:
+        vws_client.get_target_record(target_id='a')
+
+    assert exc.value.response.status_code == HTTPStatus.NOT_FOUND
+
+    vws_client.add_target(
+        name='x',
+        width=1,
+        image=high_quality_image,
+        active_flag=True,
+        application_metadata=None,
     )
-    assert issubclass(TargetProcessingTimeout, Exception)
 
+    with pytest.raises(CloudRecoException) as cloud_reco_exc:
+        cloud_reco_client.query(image=high_quality_image)
 
-def test_base_exceptions_have_response_property_and_text_str() -> None:
-    """
-    A VWSException or CloudRecoException should have a response property
-    and string representation with the text property of the response.
-    """
-    base_classes: List[Union[Type[CloudRecoException], Type[VWSException]]] = [
-        CloudRecoException,
-        VWSException,
-    ]
-    for base in base_classes:
-        response = requests.Response()
-        setattr(response, '._content', bytes(f'Test{base.__name__}', 'ascii'))
-        exception = base(response=response)
-        assert exception.response == response
-        assert str(exception) == response.text
+    assert (
+        cloud_reco_exc.value.response.status_code
+        == HTTPStatus.INTERNAL_SERVER_ERROR
+    )

tests/test_query.py

@@ -6,6 +6,7 @@
 import uuid
 
 import pytest
+import requests
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
 
@@ -62,9 +63,11 @@ def test_too_large(
         A ``ConnectionErrorPossiblyImageTooLarge`` exception is raised if an
         image which is too large is given.
         """
-        with pytest.raises(ConnectionErrorPossiblyImageTooLarge):
+        with pytest.raises(ConnectionErrorPossiblyImageTooLarge) as exc:
             cloud_reco_client.query(image=png_too_large)
 
+        assert isinstance(exc.value, requests.ConnectionError)
+
 
 class TestCustomBaseVWQURL:
     """