adapt tests to updates

intelligine/tests/simulation/mode/TestChangeMode.py

@@ -126,7 +126,6 @@ class TestChangeMode(Base):
 
         self._run_and_get_core(4)
         self.assertEquals((0, 0, 0), self.ant.get_position())
-        # Ant has put his food piece
-        self.assertFalse(self.ant.is_carrying())
-        self.assertEquals(MOVE_MODE_EXPLO, self.ant.get_brain().get_movement_mode())
-        self.assertEquals(PHEROMON_DIR_NONE, self.ant.get_movement_molecule_gland().get_molecule_type())
+        # Ant has NOT put his food piece
+        self.assertTrue(self.ant.is_carrying())
+        # TODO: Le "poser" depend maintenant de matiere où poser. Tests à ecrires.

intelligine/tests/simulation/molecule/TestDirection.py

@@ -9,7 +9,7 @@ ppath.insert(1,getcwd()+'/modules')
 from intelligine.tests.simulation.molecule.Base import Base
 from intelligine.simulation.molecule.DirectionMolecule import DirectionMolecule
 from intelligine.core.Context import Context
-from intelligine.cst import MOLECULES_DIRECTION, PHEROMON_DIR_EXPLO
+from intelligine.cst import MOLECULES_DIRECTION, PHEROMON_DIR_EXPLO, PHEROMON_DIR_NONE
 from intelligine.synergy.event.move.direction import NORTH, NORTH_EST, EST, SOUTH_EST, SOUTH, SOUTH_WEST, WEST, \
     NORTH_WEST, CENTER
 from intelligine.synergy.event.move.direction import get_position_with_direction_decal as _p
@@ -126,7 +126,7 @@ class TestDirection(Base):
                 _p(CENTER): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (10, 1)}},
                 _p(NORTH_WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (9, 1)}},
                 _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (12, 1)}},
-                _p(SOUTH): {MOLECULES_DIRECTION: {PHEROMON_DIR_HOME: (8, 1)}}
+                _p(SOUTH): {MOLECULES_DIRECTION: {PHEROMON_DIR_NONE: (8, 1)}}
             },
         }
 
@@ -148,7 +148,7 @@ class TestDirection(Base):
                 _p(CENTER): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (10, 2)}},
                 _p(NORTH_WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (9, 2)}},
                 _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (8, 1)}},
-                _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_HOME: (5, 10)}}  # an other molecule type
+                _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_NONE: (5, 10)}}  # an other molecule type
             }
         }
 
@@ -162,7 +162,7 @@ class TestDirection(Base):
             },
             NORTH: {
                 _p(NORTH): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (9, 2)}},
-                _p(NORTH_WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_HOME: (9, 500)}}  # An other molecule type
+                _p(NORTH_WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_NONE: (9, 500)}}  # An other molecule type
             }
         }
 
@@ -178,7 +178,7 @@ class TestDirection(Base):
             },
             NORTH: {
                 _p(NORTH): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (9, 5)}},
-                _p(WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_HOME: (9, 500)}},  # An other molecule_type
+                _p(WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_NONE: (9, 500)}},  # An other molecule_type
                 _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (9, 4)}},
                 _p(NORTH_WEST): {MOLECULES_DIRECTION: {PHEROMON_DIR_EXPLO: (9, 4)}}
             }
@@ -197,7 +197,7 @@ class TestDirection(Base):
         # Wrong molecule type
         try:  # WTF ?
             self.assertRaises(NoMolecule, self._test_direction_for_points({
-                _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_HOME: (9, 5)}}
+                _p(SOUTH_EST): {MOLECULES_DIRECTION: {PHEROMON_DIR_NONE: (9, 5)}}
             }, -1))
         except NoMolecule:
             self.assertTrue(True)