Updated unittest procedure: All tests can now run with autodetect

Problem was: In all tests we are importung modules that have the same name (but are in a different path).

.travis.yml

@@ -7,10 +7,4 @@ install:
 # command to run tests
 script:
   - cd testing
-  - python test_batch_reactor.py
-  - python test_CSTR.py
-  - python test_oscillating_masses_discrete.py
-  - python test_rotating_oscillating_masses_mhe_mpc.py
-  - python test_oscillating_masses_discrete_dae.py
-  - python test_industrial_poly.py
-  - python test_DIP.py
+  - python -m unittest

testing/test_CSTR.py

@@ -28,18 +28,34 @@
 import sys
 import unittest
 
-sys.path.append('../')
+from importlib import reload
+import copy
+
+do_mpc_path = '../'
+if not do_mpc_path in sys.path:
+    sys.path.append('../')
+
 import do_mpc
-sys.path.pop(-1)
 
-sys.path.append('../examples/CSTR/')
-from template_model import template_model
-from template_mpc import template_mpc
-from template_simulator import template_simulator
-sys.path.pop(-1)
+
 
 
 class TestCSTR(unittest.TestCase):
+    def setUp(self):
+        """Add path of test case and import the modules.
+        If this test isn't the first to run, the modules need to be reloaded.
+        Reset path afterwards.
+        """
+        default_path = copy.deepcopy(sys.path)
+        sys.path.append('../examples/CSTR/')
+        import template_model
+        import template_mpc
+        import template_simulator
+
+        self.template_model = reload(template_model)
+        self.template_mpc = reload(template_mpc)
+        self.template_simulator = reload(template_simulator)
+        sys.path = default_path
 
     def test_SX(self):
         print('Testing SX implementation')
@@ -54,9 +70,9 @@ def CSTR(self, symvar_type):
         Get configured do-mpc modules:
         """
 
-        model = template_model(symvar_type)
-        mpc = template_mpc(model)
-        simulator = template_simulator(model)
+        model = self.template_model.template_model(symvar_type)
+        mpc = self.template_mpc.template_mpc(model)
+        simulator = self.template_simulator.template_simulator(model)
         estimator = do_mpc.estimator.StateFeedback(model)
 
         """

testing/test_DIP.py

@@ -28,18 +28,32 @@
 import sys
 import unittest
 
-sys.path.append('../')
-import do_mpc
-sys.path.pop(-1)
+from importlib import reload
+import copy
+
+do_mpc_path = '../'
+if not do_mpc_path in sys.path:
+    sys.path.append('../')
 
-sys.path.append('../examples/DIP/')
-from template_model import template_model
-from template_mpc import template_mpc
-from template_simulator import template_simulator
-sys.path.pop(-1)
+import do_mpc
 
 
 class TestDIP(unittest.TestCase):
+    def setUp(self):
+        """Add path of test case and import the modules.
+        If this test isn't the first to run, the modules need to be reloaded.
+        Reset path afterwards.
+        """
+        default_path = copy.deepcopy(sys.path)
+        sys.path.append('../examples/DIP/')
+        import template_model
+        import template_mpc
+        import template_simulator
+
+        self.template_model = reload(template_model)
+        self.template_mpc = reload(template_mpc)
+        self.template_simulator = reload(template_simulator)
+        sys.path = default_path
 
     def test_SX(self):
         print('Testing SX implementation')
@@ -58,9 +72,9 @@ def dip(self, symvar_type):
             {'x': 0., 'y': 0.6, 'r': 0.3},
         ]
 
-        model = template_model(obstacles, symvar_type)
-        mpc = template_mpc(model)
-        simulator = template_simulator(model)
+        model = self.template_model.template_model(obstacles, symvar_type)
+        mpc = self.template_mpc.template_mpc(model)
+        simulator = self.template_simulator.template_simulator(model)
         estimator = do_mpc.estimator.StateFeedback(model)
 
         """

testing/test_batch_reactor.py

@@ -28,20 +28,33 @@
 import sys
 import unittest
 
+from importlib import reload
+import copy
+
+do_mpc_path = '../'
+if not do_mpc_path in sys.path:
+    sys.path.append('../')
 
-sys.path.append('../')
 import do_mpc
-sys.path.pop(-1)
 
 
-sys.path.append('../examples/batch_reactor')
-from template_model import template_model
-from template_mpc import template_mpc
-from template_simulator import template_simulator
-sys.path.pop(-1)
+class TestBatchReactor(unittest.TestCase):
+    def setUp(self):
+        """Add path of test case and import the modules.
+        If this test isn't the first to run, the modules need to be reloaded.
+        Reset path afterwards.
+        """
+        default_path = copy.deepcopy(sys.path)
+        sys.path.append('../examples/batch_reactor/')
+        import template_model
+        import template_mpc
+        import template_simulator
 
+        self.template_model = reload(template_model)
+        self.template_mpc = reload(template_mpc)
+        self.template_simulator = reload(template_simulator)
+        sys.path = default_path
 
-class TestBatchReactor(unittest.TestCase):
 
     def test_SX(self):
         self.batch_reactor('SX')
@@ -54,11 +67,10 @@ def batch_reactor(self, symvar_type):
         Get configured do-mpc modules:
         """
 
-        model = template_model(symvar_type)
-        mpc = template_mpc(model)
-        simulator = template_simulator(model)
+        model = self.template_model.template_model(symvar_type)
+        mpc = self.template_mpc.template_mpc(model)
+        simulator = self.template_simulator.template_simulator(model)
         estimator = do_mpc.estimator.StateFeedback(model)
-
         """
         Set initial state
         """

testing/test_industrial_poly.py

@@ -28,18 +28,31 @@
 import sys
 import unittest
 
-sys.path.append('../')
-import do_mpc
-sys.path.pop(-1)
+from importlib import reload
+import copy
 
-sys.path.append('../examples/industrial_poly/')
-from template_model import template_model
-from template_mpc import template_mpc
-from template_simulator import template_simulator
-sys.path.pop(-1)
+do_mpc_path = '../'
+if not do_mpc_path in sys.path:
+    sys.path.append('../')
 
+import do_mpc
 
 class TestIndustrialPoly(unittest.TestCase):
+    def setUp(self):
+        """Add path of test case and import the modules.
+        If this test isn't the first to run, the modules need to be reloaded.
+        Reset path afterwards.
+        """
+        default_path = copy.deepcopy(sys.path)
+        sys.path.append('../examples/industrial_poly/')
+        import template_model
+        import template_mpc
+        import template_simulator
+
+        self.template_model = reload(template_model)
+        self.template_mpc = reload(template_mpc)
+        self.template_simulator = reload(template_simulator)
+        sys.path = default_path
 
     def test_SX(self):
         print('Testing SX implementation')
@@ -54,9 +67,9 @@ def industrialpoly(self, symvar_type):
         Get configured do-mpc modules:
         """
 
-        model = template_model(symvar_type)
-        mpc = template_mpc(model)
-        simulator = template_simulator(model)
+        model = self.template_model.template_model(symvar_type)
+        mpc = self.template_mpc.template_mpc(model)
+        simulator = self.template_simulator.template_simulator(model)
         estimator = do_mpc.estimator.StateFeedback(model)
 
         """

testing/test_oscillating_masses_discrete.py

@@ -28,18 +28,34 @@
 import sys
 import unittest
 
-sys.path.append('../')
+from importlib import reload
+import copy
+
+do_mpc_path = '../'
+if not do_mpc_path in sys.path:
+    sys.path.append('../')
+
 import do_mpc
-sys.path.pop(-1)
 
-sys.path.append('../examples/oscillating_masses_discrete/')
-from template_model import template_model
-from template_mpc import template_mpc
-from template_simulator import template_simulator
-sys.path.pop(-1)
+
 
 
 class TestOscillatingMassesDiscrete(unittest.TestCase):
+    def setUp(self):
+        default_path = copy.deepcopy(sys.path)
+
+        sys.path.append('../examples/oscillating_masses_discrete/')
+        import template_model
+        import template_mpc
+        import template_simulator
+
+
+        self.template_model = reload(template_model)
+        self.template_mpc = reload(template_mpc)
+        self.template_simulator = reload(template_simulator)
+
+        sys.path = default_path
+
 
     def test_SX(self):
         print('Testing SX implementation')
@@ -54,9 +70,9 @@ def oscillating_masses_discrete(self, symvar_type):
         Get configured do-mpc modules:
         """
 
-        model = template_model(symvar_type)
-        mpc = template_mpc(model)
-        simulator = template_simulator(model)
+        model = self.template_model.template_model(symvar_type)
+        mpc = self.template_mpc.template_mpc(model)
+        simulator = self.template_simulator.template_simulator(model)
         estimator = do_mpc.estimator.StateFeedback(model)
 
         """

testing/test_oscillating_masses_discrete_dae.py

@@ -28,18 +28,33 @@
 import sys
 import unittest
 
-sys.path.append('../')
-import do_mpc
-sys.path.pop(-1)
+from importlib import reload
+import copy
+
+do_mpc_path = '../'
+if not do_mpc_path in sys.path:
+    sys.path.append('../')
 
-sys.path.append('../examples/oscillating_masses_discrete_dae/')
-from template_model import template_model
-from template_mpc import template_mpc
-from template_simulator import template_simulator
-sys.path.pop(-1)
+import do_mpc
 
 
 class TestOscillatingMassesDiscrete(unittest.TestCase):
+    def setUp(self):
+        """Add path of test case and import the modules.
+        If this test isn't the first to run, the modules need to be reloaded.
+        Reset path afterwards.
+        """
+        default_path = copy.deepcopy(sys.path)
+        sys.path.append('../examples/oscillating_masses_discrete_dae/')
+        import template_model
+        import template_mpc
+        import template_simulator
+
+        self.template_model = reload(template_model)
+        self.template_mpc = reload(template_mpc)
+        self.template_simulator = reload(template_simulator)
+        sys.path = default_path
+
     def test_SX(self):
         print('Testing SX implementation')
         self.oscillating_masses_discrete('SX')
@@ -53,11 +68,10 @@ def oscillating_masses_discrete(self, symvar_type):
         Get configured do-mpc modules:
         """
 
-        model = template_model(symvar_type)
-        mpc = template_mpc(model)
-        simulator = template_simulator(model)
+        model = self.template_model.template_model(symvar_type)
+        mpc = self.template_mpc.template_mpc(model)
+        simulator = self.template_simulator.template_simulator(model)
         estimator = do_mpc.estimator.StateFeedback(model)
-
         """
         Set initial state
         """