diff --git a/force_bdss/mco/tests/test_base_mco.py b/force_bdss/mco/tests/test_base_mco.py index 3762519369d38b5bb33848559bae0b047613db74..da95c5500cbf3b45247804065bfb2bbb8a4edaad 100644 --- a/force_bdss/mco/tests/test_base_mco.py +++ b/force_bdss/mco/tests/test_base_mco.py @@ -1,7 +1,7 @@ import unittest -from force_bdss.mco.base_mco import BaseMCO from force_bdss.mco.i_mco_factory import IMCOFactory +from force_bdss.tests.dummy_classes.mco import DummyMCO try: import mock @@ -9,11 +9,6 @@ except ImportError: from unittest import mock -class DummyMCO(BaseMCO): - def run(self, model, *args, **kwargs): - pass - - class TestBaseMultiCriteriaOptimizer(unittest.TestCase): def test_initialization(self): factory = mock.Mock(spec=IMCOFactory) diff --git a/force_bdss/mco/tests/test_base_mco_communicator.py b/force_bdss/mco/tests/test_base_mco_communicator.py index 02387b7049a9ba6d8f32e63827d640887801a989..74451a98f4b7d026dfb6254ebdccdd9ab568cb76 100644 --- a/force_bdss/mco/tests/test_base_mco_communicator.py +++ b/force_bdss/mco/tests/test_base_mco_communicator.py @@ -1,7 +1,7 @@ import unittest -from force_bdss.mco.base_mco_communicator import BaseMCOCommunicator from force_bdss.mco.i_mco_factory import IMCOFactory +from force_bdss.tests.dummy_classes.mco import DummyMCOCommunicator try: import mock @@ -9,14 +9,6 @@ except ImportError: from unittest import mock -class DummyMCOCommunicator(BaseMCOCommunicator): - def receive_from_mco(self, model): - pass - - def send_to_mco(self, model, kpi_results): - pass - - class TestBaseMCOCommunicator(unittest.TestCase): def test_initialization(self): factory = mock.Mock(spec=IMCOFactory) diff --git a/force_bdss/mco/tests/test_base_mco_factory.py b/force_bdss/mco/tests/test_base_mco_factory.py index 91a7160a958fa6024373d51561d61ae5a652aee9..1aa971a92a2b002e06497c7dd7822c758142393c 100644 --- a/force_bdss/mco/tests/test_base_mco_factory.py +++ b/force_bdss/mco/tests/test_base_mco_factory.py @@ -2,10 +2,10 @@ import unittest from traits.trait_errors import TraitError -from force_bdss.mco.base_mco_model import BaseMCOModel from force_bdss.mco.tests.test_base_mco import DummyMCO from force_bdss.mco.tests.test_base_mco_communicator import \ DummyMCOCommunicator +from force_bdss.tests.dummy_classes.mco import DummyMCOFactory, DummyMCOModel try: import mock @@ -14,32 +14,6 @@ except ImportError: from envisage.plugin import Plugin -from force_bdss.mco.base_mco_factory import BaseMCOFactory - - -class DummyMCOFactory(BaseMCOFactory): - def get_identifier(self): - return "foo" - - def get_name(self): - return "bar" - - def get_model_class(self): - return DummyMCOModel - - def get_communicator_class(self): - return DummyMCOCommunicator - - def get_optimizer_class(self): - return DummyMCO - - def parameter_factories(self): - return [] - - -class DummyMCOModel(BaseMCOModel): - pass - class TestBaseMCOFactory(unittest.TestCase): def setUp(self): diff --git a/force_bdss/tests/dummy_classes/mco.py b/force_bdss/tests/dummy_classes/mco.py new file mode 100644 index 0000000000000000000000000000000000000000..af09ae190446717abc902f71b3d20e848f81eee7 --- /dev/null +++ b/force_bdss/tests/dummy_classes/mco.py @@ -0,0 +1,41 @@ +from force_bdss.mco.base_mco import BaseMCO +from force_bdss.mco.base_mco_communicator import BaseMCOCommunicator +from force_bdss.mco.base_mco_factory import BaseMCOFactory +from force_bdss.mco.base_mco_model import BaseMCOModel + + +class DummyMCO(BaseMCO): + def run(self, model, *args, **kwargs): + pass + + +class DummyMCOCommunicator(BaseMCOCommunicator): + def receive_from_mco(self, model): + pass + + def send_to_mco(self, model, kpi_results): + pass + + +class DummyMCOModel(BaseMCOModel): + pass + + +class DummyMCOFactory(BaseMCOFactory): + def get_identifier(self): + return "foo" + + def get_name(self): + return "bar" + + def get_model_class(self): + return DummyMCOModel + + def get_communicator_class(self): + return DummyMCOCommunicator + + def get_optimizer_class(self): + return DummyMCO + + def parameter_factories(self): + return []