Fixes in test_application test

* #35

Author: Ezetowers

MLC/api/MLCLocal.py

@@ -88,7 +88,7 @@ def close_experiment(self, experiment_name):
     def new_experiment(self, experiment_name, experiment_configuration=None):
         self._create_experiment_dir(experiment_name)
 
-        config = None
+        config = experiment_configuration
         if experiment_configuration is None:
             config = MLCLocal.DEFAULT_EXPERIMENT_CONFIG
 

tests/mlc/test_application.py

@@ -1,7 +1,12 @@
+import shutil
+import os
 import unittest
 
 from tests.test_helpers import TestHelper
+from MLC.config import get_working_directory
+from MLC.config import get_test_path
 from MLC.mlc_parameters.mlc_parameters import saved, Config
+from MLC.api.MLCLocal import MLCLocal
 
 from MLC.Simulation import Simulation
 from MLC.Application import Application, MLC_CALLBACKS
@@ -15,10 +20,26 @@ class ApplicationTest(unittest.TestCase):
     on_evaluate = 0
     on_new_generation = []
     on_finish = 0
+    experiment_name = "test_application"
+    workspace_dir = os.path.join(get_working_directory(), "workspace")
+    test_conf_path = os.path.join(get_test_path(), TestHelper.DEFAULT_CONF_FILENAME)
+    experiment_dir = os.path.join(workspace_dir, experiment_name)
+    mlc_local = None
 
     @classmethod
     def setUpClass(cls):
         TestHelper.load_default_configuration()
+        # Create the MLC workspace dir of this tests
+        os.makedirs(ApplicationTest.workspace_dir)
+
+        # Create the MLCLocal and the workspace of MLC, and create
+        # a new experiment to be used to test the callbacks
+        ApplicationTest.mlc_local = MLCLocal(ApplicationTest.workspace_dir)
+
+    @classmethod
+    def tearDownClass(cls):
+        # Erase the MLC workspace dir of this tests
+        shutil.rmtree(ApplicationTest.workspace_dir)
 
     def test_callback_on_evaluate(self):
         with saved(Config.get_instance()) as config:
@@ -37,18 +58,24 @@ def test_on_new_generation_callback(generation_number):
             def test_on_finish_callback():
                 ApplicationTest.on_finish += 1
 
-            MLCRepository._instance = None
-            simulation = Simulation()
-
-            app = Application(simulation, callbacks={MLC_CALLBACKS.ON_START:          test_on_start_callback,
-                                                     MLC_CALLBACKS.ON_EVALUATE:       test_on_evaluate_callback,
-                                                     MLC_CALLBACKS.ON_NEW_GENERATION: test_on_new_generation_callback,
-                                                     MLC_CALLBACKS.ON_FINISH:         test_on_finish_callback})
-            app.go(to_generation=2, from_generation=0)
+            callbacks_dict = {MLC_CALLBACKS.ON_START:          test_on_start_callback,
+                              MLC_CALLBACKS.ON_EVALUATE:       test_on_evaluate_callback,
+                              MLC_CALLBACKS.ON_NEW_GENERATION: test_on_new_generation_callback,
+                              MLC_CALLBACKS.ON_FINISH:         test_on_finish_callback}
+
+            ApplicationTest.mlc_local.new_experiment(ApplicationTest.experiment_name,
+                                                     ApplicationTest.test_conf_path)
+            ApplicationTest.mlc_local.open_experiment(ApplicationTest.experiment_name)
+            ApplicationTest.mlc_local.go(experiment_name=ApplicationTest.experiment_name,
+                                         to_generation=2,
+                                         from_generation=0,
+                                         callbacks=callbacks_dict)
+            ApplicationTest.mlc_local.close_experiment(ApplicationTest.experiment_name)
+            ApplicationTest.mlc_local.delete_experiment(ApplicationTest.experiment_name)
 
             self.assertEqual(ApplicationTest.on_start,          1)
-            self.assertEqual(ApplicationTest.on_evaluate,       2*10)
-            self.assertEqual(ApplicationTest.on_new_generation, range(1, 2+1))
+            self.assertEqual(ApplicationTest.on_evaluate,       2 * 10)
+            self.assertEqual(ApplicationTest.on_new_generation, range(1, 2 + 1))
             self.assertEqual(ApplicationTest.on_finish,         1)
 
     def test_list_of_callbacks(self):
@@ -65,12 +92,17 @@ def test_on_start_callback():
             def test_on_start_callback_increment_2():
                 ApplicationTest.on_start_counter_2 += 1
 
-            MLCRepository._instance = None
-            simulation = Simulation()
             start_callbacks = [test_on_start_callback, test_on_start_callback_increment_2]
 
-            app = Application(simulation, callbacks={MLC_CALLBACKS.ON_START: start_callbacks})
-            app.go(to_generation=2, from_generation=0)
+            ApplicationTest.mlc_local.new_experiment(ApplicationTest.experiment_name,
+                                                     ApplicationTest.test_conf_path)
+            ApplicationTest.mlc_local.open_experiment(ApplicationTest.experiment_name)
+            ApplicationTest.mlc_local.go(experiment_name=ApplicationTest.experiment_name,
+                                         to_generation=2,
+                                         from_generation=0,
+                                         callbacks={MLC_CALLBACKS.ON_START: start_callbacks})
+            ApplicationTest.mlc_local.close_experiment(ApplicationTest.experiment_name)
+            ApplicationTest.mlc_local.delete_experiment(ApplicationTest.experiment_name)
 
             self.assertEqual(ApplicationTest.on_start, 1)
             self.assertEqual(ApplicationTest.on_start_counter_2, 1)