refactor: fix test imports and includes for fetch module ns update

chkware · Nov 11, 2024 · c06db39 · c06db39
1 parent f0ebc47
commit c06db39
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 19 deletions.
diff --git a/tests/infrastructure/symbol_table_test.py b/tests/infrastructure/symbol_table_test.py
@@ -13,7 +13,7 @@
     Variables,
     replace_value,
 )
-from chk.modules.fetch import HttpDocument
+from chk.modules.fetch import HttpDocumentSupport
 
 
 class TestVariableTableManager:
@@ -39,7 +39,7 @@ def test_handle_pass():
             }
         )
 
-        http_doc = HttpDocument.from_file_context(file_ctx)
+        http_doc = HttpDocumentSupport.from_file_context(file_ctx)
 
         variable_doc = Variables()
         VariableTableManager.handle(variable_doc, http_doc, exc)
@@ -277,7 +277,7 @@ def test_get_exposed_replaced_data_pass_returns_empty_list():
 
         file_ctx = FileContext(filepath_hash="ab12", document=document)
 
-        http_doc = HttpDocument.from_file_context(file_ctx)
+        http_doc = HttpDocumentSupport.from_file_context(file_ctx)
 
         exposed_data = ExposeManager.get_exposed_replaced_data(
             http_doc, {"a": 1, "b": 2}
@@ -302,7 +302,7 @@ def test_get_exposed_replaced_data_pass_returns_nonempty_list():
             arguments={VariableConfigNode.VARIABLES: {"extension": ".org"}}
         )
 
-        http_doc = HttpDocument.from_file_context(file_ctx)
+        http_doc = HttpDocumentSupport.from_file_context(file_ctx)
 
         variable_doc = Variables()
         VariableTableManager.handle(variable_doc, http_doc, exec_ctx)

diff --git a/tests/infrastructure/third_party/http_fetcher_test.py b/tests/infrastructure/third_party/http_fetcher_test.py
@@ -6,7 +6,7 @@
 import requests
 from defusedxml.minidom import parseString
 
-from chk.modules.fetch import ApiResponseModel
+from chk.modules.fetch.entities import ApiResponseModel
 
 BODY_JSON = """[
     {

diff --git a/tests/modules/fetch/fetch_entities_test.py b/tests/modules/fetch/fetch_entities_test.py
@@ -1,17 +1,32 @@
 # type: ignore
-import json
 
 import pytest
 
 from chk.infrastructure.file_loader import FileContext
 from chk.infrastructure.symbol_table import Variables
-from chk.modules.fetch import (
-    HttpDocument,
-    HttpDocumentSupport,
-)
+from chk.modules.fetch import HttpDocumentSupport
+from chk.modules.fetch.entities import HttpDocument
 
 
 class TestHttpDocument:
+    @staticmethod
+    def test_bool_pass():
+        ctx = FileContext(
+            document={
+                "version": "default:http:0.7.2",
+                "request": {
+                    "url": "https://jsonplaceholder.typicode.com/albums/1",
+                    "method": "GET",
+                },
+            }
+        )
+
+        doc = HttpDocumentSupport.from_file_context(ctx)
+
+        assert doc
+
+
+class TestHttpDocumentSupport:
     @staticmethod
     def test_from_file_context_pass():
         ctx = FileContext(
@@ -24,7 +39,7 @@ def test_from_file_context_pass():
             }
         )
 
-        doc = HttpDocument.from_file_context(ctx)
+        doc = HttpDocumentSupport.from_file_context(ctx)
 
         assert isinstance(doc.context, tuple)
         assert isinstance(doc.version, str)
@@ -39,7 +54,7 @@ def test_from_file_context_fail_no_request():
         )
 
         with pytest.raises(RuntimeError):
-            HttpDocument.from_file_context(ctx)
+            HttpDocumentSupport.from_file_context(ctx)
 
     @staticmethod
     def test_from_file_context_fail_no_version():
@@ -53,10 +68,8 @@ def test_from_file_context_fail_no_version():
         )
 
         with pytest.raises(ValueError):
-            HttpDocument.from_file_context(ctx)
+            HttpDocumentSupport.from_file_context(ctx)
 
-
-class TestHttpDocumentSupport:
     @staticmethod
     def test_execute_request_pass():
         ctx = FileContext(
@@ -69,7 +82,7 @@ def test_execute_request_pass():
             }
         )
 
-        http_doc = HttpDocument.from_file_context(ctx)
+        http_doc = HttpDocumentSupport.from_file_context(ctx)
         resp = HttpDocumentSupport.execute_request(http_doc)
 
         assert "userId" in resp.body
@@ -86,7 +99,7 @@ def test_process_request_template_pass():
             }
         )
 
-        http_doc = HttpDocument.from_file_context(ctx)
+        http_doc = HttpDocumentSupport.from_file_context(ctx)
         variable_doc = Variables({"method": "GET"})
 
         HttpDocumentSupport.process_request_template(http_doc, variable_doc)

diff --git a/tests/modules/fetch/fetch_module_test.py b/tests/modules/fetch/fetch_module_test.py
@@ -3,7 +3,7 @@
 """
 Fetch module tests
 """
-from chk.infrastructure.file_loader import FileContext, ExecuteContext
+from chk.infrastructure.file_loader import ExecuteContext, FileContext
 from chk.modules.fetch import call
 
 

diff --git a/tests/modules/fetch/fetch_request_helper_test.py b/tests/modules/fetch/fetch_request_helper_test.py
@@ -2,7 +2,8 @@
 
 import pytest
 
-from chk.modules.fetch import BearerAuthentication, HttpRequestArgCompiler
+from chk.modules.fetch.entities import BearerAuthentication
+from chk.modules.fetch.services import HttpRequestArgCompiler
 
 
 class TestHttpRequestArgCompiler: