update tests for code evolution (config, logger)

tests/test_life_game.py

@@ -3,9 +3,11 @@ import collections
 from sandbox.life_game.simulation import Cell
 from sandbox.life_game.simulation import Empty
 from sandbox.life_game.utils import get_subjects_from_str_representation
+from synergine2.config import Config
 from synergine2.cycle import CycleManager
-from synergine2.simulation import Simulation
+from synergine2.log import SynergineLogger
 from synergine2.xyz import XYZSubjects
+from synergine2.xyz import XYZSimulation
 from synergine2.xyz_utils import get_str_representation_from_positions
 from tests import BaseTest
 from tests import str_kwargs
@@ -30,11 +32,13 @@ class LifeGameBaseTest(BaseTest):
 
 class TestSimpleSimulation(LifeGameBaseTest):
     def test_cycles_evolution(self):
-        simulation = Simulation()
+        simulation = XYZSimulation(Config())
         subjects = self._get_subjects(simulation)
         simulation.subjects = subjects
 
         cycle_manager = CycleManager(
+            Config(),
+            SynergineLogger('test'),
             simulation=simulation,
         )
 
@@ -70,7 +74,7 @@ class TestSimpleSimulation(LifeGameBaseTest):
             subjects,
         )
 
-    def _get_subjects(self, simulation: Simulation):
+    def _get_subjects(self, simulation: XYZSimulation):
         cells = XYZSubjects(simulation=simulation)
 
         for position in [
@@ -79,6 +83,7 @@ class TestSimpleSimulation(LifeGameBaseTest):
             (1, 0, 0),
         ]:
             cells.append(Cell(
+                Config(),
                 simulation=simulation,
                 position=position,
             ))
@@ -98,6 +103,7 @@ class TestSimpleSimulation(LifeGameBaseTest):
             (2, 1, 0),
         ]:
             cells.append(Empty(
+                Config(),
                 simulation=simulation,
                 position=position,
             ))
@@ -164,7 +170,7 @@ class TestMultipleSimulations(LifeGameBaseTest):
         """,
         ]
 
-        simulation = Simulation()
+        simulation = XYZSimulation(Config())
         subjects = get_subjects_from_str_representation(
             str_representations[0],
             simulation,
@@ -172,6 +178,8 @@ class TestMultipleSimulations(LifeGameBaseTest):
         simulation.subjects = subjects
 
         cycle_manager = CycleManager(
+            config=Config(),
+            logger=SynergineLogger('test'),
             simulation=simulation,
         )
 

tests/test_terminals.py

@@ -1,6 +1,8 @@
 # coding: utf-8
 import time
 
+from synergine2.config import Config
+from synergine2.log import SynergineLogger
 from synergine2.simulation import Event
 from synergine2.terminals import Terminal
 from synergine2.terminals import TerminalPackage
@@ -42,8 +44,10 @@ class SendBackTerminal(Terminal):
 class TestTerminals(BaseTest):
     def test_terminal_communications(self):
         terminals_manager = TerminalManager(
+            Config(),
+            SynergineLogger('test'),
             terminals=[
-                MultiplyTerminal(),
+                MultiplyTerminal(Config(), SynergineLogger('test')),
             ]
         )
         terminals_manager.start()
@@ -67,9 +71,11 @@ class TestTerminals(BaseTest):
 
     def test_terminals_communications(self):
         terminals_manager = TerminalManager(
+            Config(),
+            SynergineLogger('test'),
             terminals=[
-                MultiplyTerminal(),
-                DivideTerminal(),
+                MultiplyTerminal(Config(), SynergineLogger('test')),
+                DivideTerminal(Config(), SynergineLogger('test')),
             ]
         )
         terminals_manager.start()
@@ -98,7 +104,9 @@ class TestTerminals(BaseTest):
             pass
 
         terminals_manager = TerminalManager(
-            terminals=[ListenEverythingTerminal()]
+            Config(),
+            SynergineLogger('test'),
+            terminals=[ListenEverythingTerminal(Config(), SynergineLogger('test'))]
         )
         terminals_manager.start()
         terminals_manager.send(ValueTerminalPackage(value=42))
@@ -125,7 +133,9 @@ class TestTerminals(BaseTest):
             subscribed_events = [AnOtherEvent]
 
         terminals_manager = TerminalManager(
-            terminals=[ListenAnEventTerminal()]
+            Config(),
+            SynergineLogger('test'),
+            terminals=[ListenAnEventTerminal(Config(), SynergineLogger('test'))]
         )
         terminals_manager.start()
         terminals_manager.send(ValueTerminalPackage(value=42))

tests/test_xyz.py

@@ -1,9 +1,10 @@
 # coding: utf-8
 # -*- coding: utf-8 -*-
+from synergine2.config import Config
 from synergine2.simulation import Subject
-from synergine2.simulation import Subjects
-from synergine2.simulation import Simulation
 from synergine2.xyz import ProximitySubjectMechanism
+from synergine2.xyz import XYZSubjects
+from synergine2.xyz import XYZSimulation
 from synergine2.xyz import XYZSubjectMixin
 from synergine2.xyz_utils import get_positions_from_str_representation
 from synergine2.xyz_utils import get_str_representation_from_positions
@@ -21,16 +22,17 @@ class MyProximityMechanism(ProximitySubjectMechanism):
 
 class TestXYZ(BaseTest):
     def test_proximity_mechanism_with_one(self):
-        simulation = Simulation()
-        subject = MySubject(simulation, position=(0, 0, 0))
-        other_subject = MySubject(simulation, position=(5, 0, 0))
+        simulation = XYZSimulation(Config())
+        subject = MySubject(Config(), simulation, position=(0, 0, 0))
+        other_subject = MySubject(Config(), simulation, position=(5, 0, 0))
 
-        simulation.subjects = Subjects(
+        simulation.subjects = XYZSubjects(
             [subject, other_subject],
             simulation=simulation,
         )
 
         proximity_mechanism = MyProximityMechanism(
+            config=Config(),
             simulation=simulation,
             subject=subject,
         )
@@ -46,16 +48,17 @@ class TestXYZ(BaseTest):
         }] == proximity_mechanism.run()
 
     def test_proximity_mechanism_excluding(self):
-        simulation = Simulation()
-        subject = MySubject(simulation, position=(0, 0, 0))
-        other_subject = MySubject(simulation, position=(11, 0, 0))
+        simulation = XYZSimulation(Config())
+        subject = MySubject(Config(), simulation, position=(0, 0, 0))
+        other_subject = MySubject(Config(), simulation, position=(11, 0, 0))
 
-        simulation.subjects = Subjects(
+        simulation.subjects = XYZSubjects(
             [subject, other_subject],
             simulation=simulation,
         )
 
         proximity_mechanism = MyProximityMechanism(
+            config=Config(),
             simulation=simulation,
             subject=subject,
         )
@@ -68,17 +71,18 @@ class TestXYZ(BaseTest):
         assert [] == proximity_mechanism.run()
 
     def test_proximity_mechanism_with_multiple(self):
-        simulation = Simulation()
-        subject = MySubject(simulation, position=(0, 0, 0))
+        simulation = XYZSimulation(Config())
+        subject = MySubject(Config(), simulation, position=(0, 0, 0))
         other_subjects = []
 
         for i in range(3):
-            other_subjects.append(MySubject(simulation, position=(i, i, 0)))
+            other_subjects.append(MySubject(Config(), simulation, position=(i, i, 0)))
 
-        simulation.subjects = Subjects([subject], simulation=simulation)
+        simulation.subjects = XYZSubjects([subject], simulation=simulation)
         simulation.subjects.extend(other_subjects)
 
         proximity_mechanism = MyProximityMechanism(
+            config=Config(),
             simulation=simulation,
             subject=subject,
         )