diff --git a/taketwo-webapi/test/__init__.py b/taketwo-webapi/testing/__init__.py similarity index 100% rename from taketwo-webapi/test/__init__.py rename to taketwo-webapi/testing/__init__.py diff --git a/taketwo-webapi/testing/integration/__init__.py b/taketwo-webapi/testing/integration/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testing/integration/test.py b/taketwo-webapi/testing/integration/test_mark.py similarity index 90% rename from testing/integration/test.py rename to taketwo-webapi/testing/integration/test_mark.py index db0c155..72927f6 100644 --- a/testing/integration/test.py +++ b/taketwo-webapi/testing/integration/test_mark.py @@ -1,15 +1,11 @@ import requests -#example api test - import json import sys -sys.path.append('../../taketwo-webapi') -sys.path.append('../util') from main import app from main import validate from main import getDb from fastapi.testclient import TestClient -from util.assert_util import comparePayloads +from testing.integration.util.assert_util import comparePayloads def override_validate(): return {"sub": 'test'} diff --git a/taketwo-webapi/test/test_webui.py b/taketwo-webapi/testing/integration/test_webui.py similarity index 100% rename from taketwo-webapi/test/test_webui.py rename to taketwo-webapi/testing/integration/test_webui.py diff --git a/taketwo-webapi/testing/integration/util/__init__.py b/taketwo-webapi/testing/integration/util/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testing/integration/util/assert_util.py b/taketwo-webapi/testing/integration/util/assert_util.py similarity index 100% rename from testing/integration/util/assert_util.py rename to taketwo-webapi/testing/integration/util/assert_util.py diff --git a/taketwo-webapi/testing/unit/__init__.py b/taketwo-webapi/testing/unit/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testing/unit/test_analyse_text.py b/taketwo-webapi/testing/unit/test_analyse_text.py similarity index 95% rename from testing/unit/test_analyse_text.py rename to taketwo-webapi/testing/unit/test_analyse_text.py index 0836ebb..0a1c0e3 100644 --- a/testing/unit/test_analyse_text.py +++ b/taketwo-webapi/testing/unit/test_analyse_text.py @@ -8,8 +8,8 @@ from main import analyse_text from main import Text -from util.mock_db_util import getRow -from util.mock_db_util import setupMocks +from testing.unit.util.mock_db_util import getRow +from testing.unit.util.mock_db_util import setupMocks class TestAnalyseText(unittest.TestCase): diff --git a/testing/unit/test_check_words.py b/taketwo-webapi/testing/unit/test_check_words.py similarity index 96% rename from testing/unit/test_check_words.py rename to taketwo-webapi/testing/unit/test_check_words.py index c4afaf8..841f3dc 100644 --- a/testing/unit/test_check_words.py +++ b/taketwo-webapi/testing/unit/test_check_words.py @@ -8,8 +8,8 @@ from main import check_words from main import Text -from util.mock_db_util import getRow -from util.mock_db_util import setupMocks +from testing.unit.util.mock_db_util import getRow +from testing.unit.util.mock_db_util import setupMocks class TestCheckWords(unittest.TestCase): diff --git a/taketwo-webapi/testing/unit/util/__init__.py b/taketwo-webapi/testing/unit/util/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testing/unit/util/mock_db_util.py b/taketwo-webapi/testing/unit/util/mock_db_util.py similarity index 100% rename from testing/unit/util/mock_db_util.py rename to taketwo-webapi/testing/unit/util/mock_db_util.py diff --git a/testing/test.py b/testing/test.py deleted file mode 100644 index 15eb629..0000000 --- a/testing/test.py +++ /dev/null @@ -1,28 +0,0 @@ -import requests -# example api test - -import json - -apiurl = 'https://localhost:8000' - - -def test_post_headers_body_json(): - url = apiurl + '/mark' - - # Additional headers. - headers = {'Content-Type': 'application/json'} - - # Body - payload = {'user_id': "test", 'flagged_string': "test string", 'category': "stereotyping", 'info': "none", - 'url': "example.com"} - - # convert dict to json by json.dumps() for body data. - resp = requests.post(url, headers=headers, data=json.dumps(payload, indent=4)) - - # Validate response headers and body contents, e.g. status code. - assert resp.status_code == 200 - resp_body = resp.json() - assert resp_body['url'] == url - - # print response full body as text - print(resp.text) \ No newline at end of file