Skip to content

Commit 85fb3b4

Browse files
committed
Refactor test folder structure
* Fix imports in init file of package * Move tests to separate folder in project root
1 parent 7b42e2f commit 85fb3b4

File tree

7 files changed

+26
-23
lines changed

7 files changed

+26
-23
lines changed

aries_cloudcontroller/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
from aries_cloudcontroller.aries_controller import AriesAgentController
1+
from aries_cloudcontroller.aries_controller import AriesAgentController
2+
from aries_cloudcontroller.aries_controller_base import AriesAgentControllerBase
3+
from aries_cloudcontroller.aries_tenant_controller import AriesTenantController
4+
from aries_cloudcontroller.aries_webhook_server import AriesWebhookServer

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ termcolor
88
pillow
99
qrcode
1010
beautifulsoup4
11-
pytest~=6.2.3
11+
pytest~=6.2.3
12+
pytest_asyncio
File renamed without changes.

aries_cloudcontroller/tests/test_aries_controller.py renamed to tests/test_aries_controller.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import logging
22
import pytest
33

4-
from ..aries_webhook_server import AriesWebhookServer
5-
from ..controllers.multitenant import MultitenancyController
6-
7-
from ..aries_controller import AriesAgentController
4+
from aries_cloudcontroller import AriesAgentController
5+
from aries_cloudcontroller import AriesWebhookServer
6+
from aries_cloudcontroller.controllers.multitenant import MultitenancyController
87

98
LOGGER = logging.getLogger(__name__)
109

aries_cloudcontroller/tests/test_aries_controller_base.py renamed to tests/test_aries_controller_base.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
ClientSession,
55
)
66

7-
from ..aries_controller_base import AriesAgentControllerBase
8-
from ..controllers.connections import ConnectionsController
9-
from ..controllers.messaging import MessagingController
10-
from ..controllers.mediation import MediationController
11-
from ..controllers.schema import SchemaController
12-
from ..controllers.wallet import WalletController
13-
from ..controllers.definitions import DefinitionsController
14-
from ..controllers.issuer import IssuerController
15-
from ..controllers.proof import ProofController
16-
from ..controllers.ledger import LedgerController
17-
from ..controllers.credential import CredentialController
18-
from ..controllers.server import ServerController
19-
from ..controllers.oob import OOBController
20-
from ..controllers.action_menu import ActionMenuController
21-
from ..controllers.revocation import RevocationController
7+
from aries_cloudcontroller import AriesAgentControllerBase
8+
from aries_cloudcontroller.controllers.connections import ConnectionsController
9+
from aries_cloudcontroller.controllers.messaging import MessagingController
10+
from aries_cloudcontroller.controllers.mediation import MediationController
11+
from aries_cloudcontroller.controllers.schema import SchemaController
12+
from aries_cloudcontroller.controllers.wallet import WalletController
13+
from aries_cloudcontroller.controllers.definitions import DefinitionsController
14+
from aries_cloudcontroller.controllers.issuer import IssuerController
15+
from aries_cloudcontroller.controllers.proof import ProofController
16+
from aries_cloudcontroller.controllers.ledger import LedgerController
17+
from aries_cloudcontroller.controllers.credential import CredentialController
18+
from aries_cloudcontroller.controllers.server import ServerController
19+
from aries_cloudcontroller.controllers.oob import OOBController
20+
from aries_cloudcontroller.controllers.action_menu import ActionMenuController
21+
from aries_cloudcontroller.controllers.revocation import RevocationController
2222

2323
LOGGER = logging.getLogger(__name__)
2424

aries_cloudcontroller/tests/test_aries_tenant_controller.py renamed to tests/test_aries_tenant_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import re
33
import pytest
44

5-
from ..aries_tenant_controller import AriesTenantController
5+
from aries_cloudcontroller import AriesTenantController
66

77
LOGGER = logging.getLogger(__name__)
88

aries_cloudcontroller/tests/test_aries_webhook_server.py renamed to tests/test_aries_webhook_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import re
33
import pytest
44

5-
from ..aries_webhook_server import AriesWebhookServer
5+
from aries_cloudcontroller import AriesWebhookServer
66

77
LOGGER = logging.getLogger(__name__)
88

0 commit comments

Comments
 (0)