Moved unit test files and profiling test decorator into test directory away from production code

monkey/monkey_island/cc/test_common/fixtures/__init__.py

@@ -1,4 +0,0 @@
-# Without these imports pytests can't use fixtures,
-# because they are not found
-from .fixture_enum import FixtureEnum  # noqa: F401
-from .mongomock_fixtures import *  # noqa: F401,F403

monkey/tests/monkey_island/cc/conftest.py

@@ -1,3 +1,3 @@
 # Without these imports pytests can't use fixtures,
 # because they are not found
-from monkey_island.cc.test_common.fixtures import *  # noqa: F401,F403
+from tests.monkey_island.cc.mongomock_fixtures import *  # noqa: F401,F403

monkey/tests/monkey_island/cc/models/test_monkey.py

@@ -3,10 +3,10 @@ import uuid
 from time import sleep
 
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from monkey_island.cc.models.monkey import Monkey, MonkeyNotFoundError
 from monkey_island.cc.models.monkey_ttl import MonkeyTtl
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 logger = logging.getLogger(__name__)
 

monkey/tests/monkey_island/cc/models/zero_trust/test_monkey_finding.py

@@ -1,12 +1,12 @@
 import pytest
 from mongoengine import ValidationError
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 import common.common_consts.zero_trust_consts as zero_trust_consts
 from monkey_island.cc.models.zero_trust.event import Event
 from monkey_island.cc.models.zero_trust.finding import Finding
 from monkey_island.cc.models.zero_trust.monkey_finding import MonkeyFinding
 from monkey_island.cc.models.zero_trust.monkey_finding_details import MonkeyFindingDetails
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 MONKEY_FINDING_DETAIL_MOCK = MonkeyFindingDetails()
 MONKEY_FINDING_DETAIL_MOCK.events = ["mock1", "mock2"]

monkey/tests/monkey_island/cc/models/zero_trust/test_scoutsuite_finding.py

@@ -1,5 +1,6 @@
 import pytest
 from mongoengine import ValidationError
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 import common.common_consts.zero_trust_consts as zero_trust_consts
 from monkey_island.cc.models.zero_trust.finding import Finding
@@ -7,7 +8,6 @@ from monkey_island.cc.models.zero_trust.monkey_finding_details import MonkeyFind
 from monkey_island.cc.models.zero_trust.scoutsuite_finding import ScoutSuiteFinding
 from monkey_island.cc.models.zero_trust.scoutsuite_finding_details import ScoutSuiteFindingDetails
 from monkey_island.cc.services.zero_trust.test_common.scoutsuite_finding_data import RULES
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 MONKEY_FINDING_DETAIL_MOCK = MonkeyFindingDetails()
 MONKEY_FINDING_DETAIL_MOCK.events = ["mock1", "mock2"]

monkey/tests/monkey_island/cc/services/edge/test_edge_service.py

@@ -2,10 +2,10 @@ import logging
 
 import pytest
 from mongomock import ObjectId
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from monkey_island.cc.models.edge import Edge
 from monkey_island.cc.services.edge.edge import EdgeService
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 logger = logging.getLogger(__name__)
 

monkey/tests/monkey_island/cc/services/zero_trust/monkey_findings/test_monkey_zt_finding_service.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from common.common_consts import zero_trust_consts
 from monkey_island.cc.models.zero_trust.event import Event
@@ -9,7 +10,6 @@ from monkey_island.cc.models.zero_trust.monkey_finding import MonkeyFinding
 from monkey_island.cc.services.zero_trust.monkey_findings.monkey_zt_finding_service import (
     MonkeyZTFindingService,
 )
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 EVENTS = [
     Event.create_event(

monkey/tests/monkey_island/cc/services/zero_trust/scoutsuite/test_scoutsuite_auth_service.py

@@ -2,6 +2,7 @@ from unittest.mock import MagicMock
 
 import dpath.util
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from common.config_value_paths import AWS_KEYS_PATH
 from monkey_island.cc.database import mongo
@@ -10,7 +11,6 @@ from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.services.zero_trust.scoutsuite.scoutsuite_auth_service import (
     is_aws_keys_setup,
 )
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 
 class MockObject:

monkey/tests/monkey_island/cc/services/zero_trust/scoutsuite/test_scoutsuite_zt_finding_service.py

@@ -1,4 +1,5 @@
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from monkey_island.cc.models.zero_trust.finding import Finding
 from monkey_island.cc.models.zero_trust.scoutsuite_finding import ScoutSuiteFinding
@@ -9,7 +10,6 @@ from monkey_island.cc.services.zero_trust.test_common.scoutsuite_finding_data im
     RULES,
     SCOUTSUITE_FINDINGS,
 )
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 
 class TestScoutSuiteZTFindingService:

monkey/tests/monkey_island/cc/services/zero_trust/zero_trust_report/test_finding_service.py

@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from common.common_consts.zero_trust_consts import (
     DEVICES,
@@ -22,7 +23,6 @@ from monkey_island.cc.services.zero_trust.zero_trust_report.finding_service impo
     EnrichedFinding,
     FindingService,
 )
-from monkey_island.cc.test_common.fixtures.fixture_enum import FixtureEnum
 
 
 @pytest.mark.usefixtures(FixtureEnum.USES_DATABASE)

monkey/tests/monkey_island/cc/services/zero_trust/zero_trust_report/test_pillar_service.py

@@ -1,6 +1,7 @@
 from typing import List
 
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from common.common_consts import zero_trust_consts
 from common.common_consts.zero_trust_consts import (
@@ -16,7 +17,6 @@ from monkey_island.cc.services.zero_trust.zero_trust_report.pillar_service impor
 from monkey_island.cc.services.zero_trust.zero_trust_report.test_common.example_finding_data import (  # noqa: E501
     save_example_findings,
 )
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 
 @pytest.mark.usefixtures(FixtureEnum.USES_DATABASE)

monkey/tests/monkey_island/cc/services/zero_trust/zero_trust_report/test_principle_service.py

@@ -1,4 +1,5 @@
 import pytest
+from tests.monkey_island.cc.fixture_enum import FixtureEnum
 
 from common.common_consts import zero_trust_consts
 from monkey_island.cc.services.zero_trust.test_common.finding_data import (
@@ -8,7 +9,6 @@ from monkey_island.cc.services.zero_trust.test_common.finding_data import (
 from monkey_island.cc.services.zero_trust.zero_trust_report.principle_service import (
     PrincipleService,
 )
-from monkey_island.cc.test_common.fixtures import FixtureEnum
 
 EXPECTED_DICT = {
     "test_pillar1": [

monkey/tests/profiling/README.md

@@ -1,9 +1,9 @@
 # Profiling island
 
-To profile specific methods on island a `@profile(sort_args=['cumulative'], print_args=[100])` 
+To profile specific methods on island a `@profile(sort_args=['cumulative'], print_args=[100])`
-decorator can be used. 
+decorator can be used.
 Use it as a parameterised decorator(`@profile()`). After decorated method is used, a file will appear in a
 directory provided in `profiler_decorator.py`. Filename describes the path of
 the method that was profiled. For example if method `monkey_island/cc/resources/netmap.get`
-was profiled, then the results of this profiling will appear in 
+was profiled, then the results of this profiling will appear in
 `monkey_island_cc_resources_netmap_get`.