Merge pull request #465 from adamtheturtle/better-matching

Better matching

Author: adamtheturtle

src/mock_vws/_mock_web_services_api.py

@@ -72,6 +72,7 @@
 )
 from .target import Target
 
+_TARGET_ID_PATTERN = '[A-Za-z0-9]+'
 
 @wrapt.decorator
 def update_request_count(
@@ -327,7 +328,10 @@ def add_target(
         }
         return json_dump(body)
 
-    @route(path_pattern='/targets/.+', http_methods=[DELETE])
+    @route(
+        path_pattern=f'/targets/{_TARGET_ID_PATTERN}',
+        http_methods=[DELETE],
+    )
     def delete_target(
         self,
         request: _RequestObjectProxy,  # pylint: disable=unused-argument
@@ -462,7 +466,7 @@ def target_list(
         }
         return json_dump(body)
 
-    @route(path_pattern='/targets/.+', http_methods=[GET])
+    @route(path_pattern=f'/targets/{_TARGET_ID_PATTERN}', http_methods=[GET])
     def get_target(
         self,
         request: _RequestObjectProxy,  # pylint: disable=unused-argument
@@ -492,7 +496,10 @@ def get_target(
         }
         return json_dump(body)
 
-    @route(path_pattern='/duplicates/.+', http_methods=[GET])
+    @route(
+        path_pattern=f'/duplicates/{_TARGET_ID_PATTERN}',
+        http_methods=[GET],
+    )
     def get_duplicates(
         self,
         request: _RequestObjectProxy,
@@ -530,7 +537,7 @@ def get_duplicates(
         return json_dump(body)
 
     @route(
-        path_pattern='/targets/.+',
+        path_pattern=f'/targets/{_TARGET_ID_PATTERN}',
         http_methods=[PUT],
         optional_keys={
             'active_flag',
@@ -630,7 +637,7 @@ def update_target(
         }
         return json_dump(body)
 
-    @route(path_pattern='/summary/.+', http_methods=[GET])
+    @route(path_pattern=f'/summary/{_TARGET_ID_PATTERN}', http_methods=[GET])
     def target_summary(
         self,
         request: _RequestObjectProxy,

tests/mock_vws/test_delete_target.py

@@ -98,7 +98,7 @@ def test_inactive_project(
         """
         If the project is inactive, a FORBIDDEN response is returned.
         """
-        target_id = 'does_not_exist'
+        target_id = 'abc12345a'
         response = delete_target(
             vuforia_database=inactive_database,
             target_id=target_id,

tests/mock_vws/test_get_target.py

@@ -99,6 +99,20 @@ def test_get_vws_target(
         assert target_record['tracking_rating'] in range(-1, 6)
         assert target_record['reco_rating'] == ''
 
+    def test_get_vws_target_with_slash(
+        self,
+        vuforia_database: VuforiaDatabase,
+        image_file_failed_state: io.BytesIO,
+    ) -> None:
+        """
+        Details of a target are returned.
+        """
+        # response = get_vws_target(
+        #     target_id='x/1',
+        #     vuforia_database=vuforia_database,
+        # )
+        # import pdb; pdb.set_trace()
+        #
     def test_active_flag_not_set(
         self,
         vuforia_database: VuforiaDatabase,

tests/mock_vws/test_usage.py

@@ -412,7 +412,7 @@ def test_default(
             )
 
         expected = 0.2
-        assert abs(expected - recognize_deletion_seconds) < 0.1
+        assert abs(expected - recognize_deletion_seconds) < 0.15
 
     def test_with_no_processing_time(
         self,
@@ -430,7 +430,7 @@ def test_with_no_processing_time(
             )
 
         expected = 0.2
-        assert abs(expected - recognize_deletion_seconds) < 0.1
+        assert abs(expected - recognize_deletion_seconds) < 0.15
 
     def test_custom(
         self,
@@ -453,7 +453,7 @@ def test_custom(
             )
 
         expected = query_recognizes_deletion
-        assert abs(expected - recognize_deletion_seconds) < 0.1
+        assert abs(expected - recognize_deletion_seconds) < 0.15
 
 
 class TestCustomQueryProcessDeletionSeconds: