Responses test refactor

Kuadrant · Jul 21, 2023 · 5a39f66 · 5a39f66
1 parent c7b495b
commit 5a39f66
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/testsuite/tests/kuadrant/authorino/response/test_auth_json.py b/testsuite/tests/kuadrant/authorino/response/test_auth_json.py
@@ -3,6 +3,7 @@
 import json
 
 import pytest
+from testsuite.objects import ResponseProperties, JsonProperty
 
 
 @pytest.fixture(scope="module")
@@ -27,7 +28,7 @@ def path_and_value(request):
 def responses(path_and_value):
     """Returns response to be added to the AuthConfig"""
     path, _ = path_and_value
-    return [{"name": "header", "json": {"properties": [{"name": "anything", "valueFrom": {"authJSON": path}}]}}]
+    return [ResponseProperties(name="header", properties=[JsonProperty(name="anything", jsonPath=path)])]
 
 
 def test_auth_json_path(auth, client, path_and_value):

diff --git a/testsuite/tests/kuadrant/authorino/response/test_multiple_responses.py b/testsuite/tests/kuadrant/authorino/response/test_multiple_responses.py
@@ -2,14 +2,15 @@
 import json
 
 import pytest
+from testsuite.objects import ResponseProperties, JsonProperty
 
 
 @pytest.fixture(scope="module")
 def responses():
     """Returns response to be added to the AuthConfig"""
     return [
-        {"name": "Header", "json": {"properties": [{"name": "anything", "value": "one"}]}},
-        {"name": "X-Test", "json": {"properties": [{"name": "anything", "value": "two"}]}},
+        ResponseProperties(name="Header", properties=[JsonProperty(name="anything", value="one")]),
+        ResponseProperties(name="X-Test", properties=[JsonProperty(name="anything", value="two")]),
     ]
 
 

diff --git a/testsuite/tests/kuadrant/authorino/response/test_simple_response.py b/testsuite/tests/kuadrant/authorino/response/test_simple_response.py
@@ -2,12 +2,13 @@
 import json
 
 import pytest
+from testsuite.objects import ResponseProperties, JsonProperty
 
 
 @pytest.fixture(scope="module")
 def responses():
     """Returns response to be added to the AuthConfig"""
-    return [{"name": "header", "json": {"properties": [{"name": "anything", "value": "one"}]}}]
+    return [ResponseProperties(name="header", properties=[JsonProperty(name="anything", value="one")])]
 
 
 def test_simple_response_with(auth, client):

diff --git a/testsuite/tests/kuadrant/authorino/response/test_wrapper_key.py b/testsuite/tests/kuadrant/authorino/response/test_wrapper_key.py
@@ -2,6 +2,7 @@
 import json
 
 import pytest
+from testsuite.objects import ResponseProperties, JsonProperty
 
 
 @pytest.fixture(scope="module", params=["123456789", "standardCharacters", "specialcharacters+*-."])
@@ -14,7 +15,11 @@ def header_name(request):
 def responses(header_name):
     """Returns response to be added to the AuthConfig"""
     return [
-        {"name": "header", "wrapperKey": header_name, "json": {"properties": [{"name": "anything", "value": "one"}]}}
+        ResponseProperties(
+            name="header",
+            wrapperKey=header_name,
+            properties=[JsonProperty(name="anything", value="one")],
+        )
     ]