diff --git a/contentcuration/contentcuration/tests/appnexus/__init__.py b/contentcuration/automation/tests/appnexus/__init__.py similarity index 100% rename from contentcuration/contentcuration/tests/appnexus/__init__.py rename to contentcuration/automation/tests/appnexus/__init__.py diff --git a/contentcuration/contentcuration/tests/appnexus/test_base.py b/contentcuration/automation/tests/appnexus/test_base.py similarity index 90% rename from contentcuration/contentcuration/tests/appnexus/test_base.py rename to contentcuration/automation/tests/appnexus/test_base.py index e8dd657660..dec6104d9e 100644 --- a/contentcuration/contentcuration/tests/appnexus/test_base.py +++ b/contentcuration/automation/tests/appnexus/test_base.py @@ -1,4 +1,6 @@ -from contentcuration.utils.appnexus.base import Backend, Adapter +from automation.utils.appnexus.base import Adapter +from automation.utils.appnexus.base import Backend + class MockBackend(Backend): def connect(self) -> None: @@ -27,15 +29,18 @@ def test_backend_singleton(): b1, b2 = MockBackend.get_instance(), MockBackend.get_instance() assert id(b1) == id(b2) + def test_adapter_creation(): a = MockAdapter(backend=MockBackend) assert isinstance(a, Adapter) + def test_adapter_backend_default(): b = MockBackend() adapter = Adapter(backend=b) assert isinstance(adapter.backend, Backend) + def test_adapter_backend_custom(): b = MockBackend() a = Adapter(backend=b) diff --git a/contentcuration/contentcuration/utils/appnexus/APILayer.md b/contentcuration/automation/utils/appnexus/APILayer.md similarity index 99% rename from contentcuration/contentcuration/utils/appnexus/APILayer.md rename to contentcuration/automation/utils/appnexus/APILayer.md index d5e8e3fa45..a197fb13be 100644 --- a/contentcuration/contentcuration/utils/appnexus/APILayer.md +++ b/contentcuration/automation/utils/appnexus/APILayer.md @@ -33,7 +33,7 @@ ABSTRACT CLASS Backend: ABSTRACT METHOD request(params) # provide blue print for the request object pass - + ABSTRACT METHOD response(params) # provides blue print for the response object pass diff --git a/contentcuration/automation/utils/appnexus/__init__.py b/contentcuration/automation/utils/appnexus/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contentcuration/contentcuration/utils/appnexus/adapters.py b/contentcuration/automation/utils/appnexus/adapters.py similarity index 100% rename from contentcuration/contentcuration/utils/appnexus/adapters.py rename to contentcuration/automation/utils/appnexus/adapters.py diff --git a/contentcuration/automation/utils/appnexus/backends.py b/contentcuration/automation/utils/appnexus/backends.py new file mode 100644 index 0000000000..b4b1e77ab4 --- /dev/null +++ b/contentcuration/automation/utils/appnexus/backends.py @@ -0,0 +1 @@ +# Implementation of ML, GCS Backend etc. diff --git a/contentcuration/contentcuration/utils/appnexus/base.py b/contentcuration/automation/utils/appnexus/base.py similarity index 95% rename from contentcuration/contentcuration/utils/appnexus/base.py rename to contentcuration/automation/utils/appnexus/base.py index f997ed6df2..95ddef0b4f 100644 --- a/contentcuration/contentcuration/utils/appnexus/base.py +++ b/contentcuration/automation/utils/appnexus/base.py @@ -1,6 +1,8 @@ -from abc import ABC, abstractmethod +from abc import ABC +from abc import abstractmethod from builtins import NotImplementedError -from typing import Union, Dict +from typing import Dict +from typing import Union class Backend(ABC): diff --git a/contentcuration/contentcuration/utils/appnexus/__init__.py b/contentcuration/contentcuration/utils/appnexus/__init__.py deleted file mode 100644 index 09cf2db5d6..0000000000 --- a/contentcuration/contentcuration/utils/appnexus/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .adapters import * -from .backends import * \ No newline at end of file diff --git a/contentcuration/contentcuration/utils/appnexus/backends.py b/contentcuration/contentcuration/utils/appnexus/backends.py deleted file mode 100644 index fc9d771c82..0000000000 --- a/contentcuration/contentcuration/utils/appnexus/backends.py +++ /dev/null @@ -1 +0,0 @@ -# Implementation of ML, GCS Backend etc. \ No newline at end of file