adapt tests for recent code changes

intelligine/tests/simulation/bypass/TestByPass.py

@@ -6,7 +6,7 @@ from intelligine.tests.src.simulation.SimpleTestWorld1Simulation import SimpleTe
 class TestByPass(SimpleTestWorld1Simulation):
 
     _ant_move_history = []
-    _assert_ant_move_history = [(0, 21, 20), (0, 21, 19), (0, 21, 18), (0, 21, 17), (0, 21, 16), (0, 21, 15), (0, 21, 14), (0, 21, 14), (0, 22, 13), (0, 23, 12), (0, 24, 11), (0, 24, 11), (0, 24, 11), (0, 24, 11), (0, 24, 11), (0, 23, 11), (0, 22, 11), (0, 21, 11), (0, 21, 11), (0, 21, 11), (0, 21, 11), (0, 21, 11), (0, 22, 12), (0, 23, 13), (0, 24, 14), (0, 24, 14), (0, 24, 14), (0, 24, 14), (0, 24, 14), (0, 23, 15), (0, 22, 16), (0, 21, 17), (0, 21, 17), (0, 21, 17), (0, 21, 17), (0, 21, 17), (0, 21, 16), (0, 21, 15), (0, 21, 14), (0, 21, 13), (0, 21, 12), (0, 21, 11), (0, 21, 10), (0, 21, 9), (0, 21, 8), (0, 21, 7), (0, 21, 6), (0, 21, 5), (0, 21, 4), (0, 21, 3), (0, 22, 2), (0, 23, 1), (0, 23, 1), (0, 23, 1), (0, 23, 1), (0, 23, 1), (0, 22, 1), (0, 21, 1), (0, 20, 1), (0, 19, 1), (0, 18, 1), (0, 17, 1), (0, 16, 1), (0, 15, 1), (0, 14, 1), (0, 13, 1), (0, 12, 1), (0, 11, 1), (0, 10, 1), (0, 9, 1), (0, 8, 2), (0, 7, 2), (0, 6, 3), (0, 5, 4), (0, 4, 5), (0, 3, 5), (0, 2, 5), (0, 1, 5), (0, 2, 6), (0, 3, 7), (0, 4, 8), (0, 5, 9), (0, 6, 10), (0, 7, 11), (0, 8, 12), (0, 9, 13), (0, 10, 14), (0, 11, 15), (0, 12, 16), (0, 13, 17), (0, 14, 17), (0, 15, 17), (0, 16, 17), (0, 17, 17), (0, 18, 17), (0, 19, 17), (0, 19, 16), (0, 19, 15), (0, 19, 14), (0, 19, 13), (0, 19, 12), (0, 19, 11), (0, 19, 10), (0, 19, 9), (0, 18, 9), (0, 17, 9), (0, 16, 9), (0, 15, 9), (0, 14, 9), (0, 13, 9), (0, 13, 10), (0, 13, 11), (0, 13, 12), (0, 13, 13), (0, 14, 13), (0, 15, 13), (0, 16, 13), (0, 17, 13), (0, 17, 14), (0, 16, 15), (0, 15, 15), (0, 14, 15), (0, 13, 15), (0, 12, 15), (0, 11, 14), (0, 11, 13), (0, 11, 12), (0, 11, 11), (0, 11, 10), (0, 11, 9), (0, 11, 8), (0, 11, 7), (0, 12, 7), (0, 13, 7), (0, 14, 7), (0, 15, 7), (0, 16, 7), (0, 17, 7), (0, 18, 7), (0, 19, 7), (0, 20, 7), (0, 21, 7), (0, 21, 8), (0, 21, 9), (0, 21, 10), (0, 21, 11), (0, 21, 12), (0, 21, 13), (0, 21, 14), (0, 21, 15), (0, 21, 16), (0, 21, 17), (0, 21, 18), (0, 21, 19), (0, 21, 20), (0, 21, 21), (0, 20, 22), (0, 19, 22), (0, 18, 23), (0, 18, 24), (0, 18, 23), (0, 19, 22), (0, 20, 22), (0, 21, 21), (0, 21, 20), (0, 21, 19), (0, 21, 18), (0, 21, 17), (0, 21, 16), (0, 21, 15), (0, 21, 14), (0, 21, 13), (0, 21, 12), (0, 21, 11), (0, 21, 10), (0, 21, 9), (0, 21, 8), (0, 20, 7), (0, 19, 7), (0, 18, 7), (0, 17, 7), (0, 16, 7), (0, 15, 7), (0, 14, 7), (0, 13, 7), (0, 12, 7), (0, 11, 8), (0, 11, 9), (0, 11, 10), (0, 11, 11), (0, 11, 12), (0, 11, 13), (0, 10, 14), (0, 9, 13), (0, 8, 12), (0, 7, 11), (0, 6, 10), (0, 5, 9), (0, 4, 8), (0, 3, 7), (0, 2, 6), (0, 2, 5), (0, 1, 4), (0, 2, 5), (0, 3, 6), (0, 4, 7), (0, 5, 8), (0, 6, 9), (0, 7, 10), (0, 8, 11), (0, 9, 12), (0, 10, 13), (0, 11, 14), (0, 12, 15), (0, 13, 16), (0, 14, 17), (0, 15, 17), (0, 16, 17), (0, 17, 17), (0, 18, 17), (0, 19, 17), (0, 19, 16), (0, 19, 15), (0, 19, 14), (0, 19, 13), (0, 19, 12), (0, 19, 11), (0, 19, 10), (0, 19, 9), (0, 18, 9), (0, 17, 9), (0, 16, 9), (0, 15, 9), (0, 14, 9), (0, 13, 9), (0, 13, 10), (0, 13, 11), (0, 13, 12), (0, 13, 13), (0, 14, 13), (0, 15, 13), (0, 16, 13), (0, 17, 13), (0, 17, 14), (0, 16, 15), (0, 15, 15), (0, 14, 15), (0, 13, 15), (0, 14, 15), (0, 15, 15), (0, 16, 15), (0, 17, 15), (0, 17, 14), (0, 16, 13), (0, 15, 13), (0, 14, 13), (0, 13, 13), (0, 13, 12), (0, 13, 11), (0, 13, 10), (0, 13, 9), (0, 14, 9), (0, 15, 9), (0, 16, 9), (0, 17, 9), (0, 18, 9), (0, 19, 9), (0, 19, 10), (0, 19, 11), (0, 19, 12), (0, 19, 13), (0, 19, 14), (0, 19, 15), (0, 19, 16), (0, 19, 17), (0, 18, 17), (0, 17, 17), (0, 16, 17), (0, 15, 17), (0, 14, 17), (0, 13, 17), (0, 12, 17), (0, 11, 17), (0, 10, 17), (0, 9, 17), (0, 8, 17), (0, 7, 17), (0, 6, 17), (0, 5, 17), (0, 4, 17), (0, 3, 17), (0, 2, 17), (0, 1, 17), (0, 1, 16), (0, 1, 15), (0, 1, 14), (0, 1, 13), (0, 1, 12), (0, 1, 11), (0, 1, 10), (0, 1, 9)]
+    _assert_ant_move_history = [(0, 21, 20), (0, 21, 19), (0, 21, 18), (0, 21, 17), (0, 21, 16), (0, 21, 15), (0, 21, 14), (0, 21, 14), (0, 22, 13), (0, 23, 12), (0, 24, 11), (0, 24, 11), (0, 24, 11), (0, 24, 11), (0, 24, 11), (0, 23, 11), (0, 22, 11), (0, 21, 11), (0, 21, 11), (0, 21, 11), (0, 21, 11), (0, 21, 11), (0, 22, 12), (0, 23, 13), (0, 24, 14), (0, 24, 14), (0, 24, 14), (0, 24, 14), (0, 24, 14), (0, 23, 15), (0, 22, 16), (0, 21, 17), (0, 21, 17), (0, 21, 17), (0, 21, 17), (0, 21, 17), (0, 21, 16), (0, 21, 15), (0, 21, 14), (0, 21, 13), (0, 21, 12), (0, 21, 11), (0, 21, 10), (0, 21, 9), (0, 21, 8), (0, 21, 7), (0, 21, 6), (0, 21, 5), (0, 21, 4), (0, 21, 3), (0, 22, 2), (0, 23, 1), (0, 23, 1), (0, 23, 1), (0, 23, 1), (0, 23, 1), (0, 22, 1), (0, 21, 1), (0, 20, 1), (0, 19, 1), (0, 18, 1), (0, 17, 1), (0, 16, 1), (0, 15, 1), (0, 14, 1), (0, 13, 1), (0, 12, 1), (0, 11, 1), (0, 10, 1), (0, 9, 1), (0, 8, 2), (0, 7, 2), (0, 6, 3), (0, 5, 4), (0, 4, 5), (0, 3, 5), (0, 4, 6), (0, 5, 7), (0, 6, 8), (0, 7, 9), (0, 8, 10), (0, 9, 11), (0, 10, 12), (0, 11, 13), (0, 11, 12), (0, 11, 11), (0, 11, 10), (0, 11, 9), (0, 11, 8), (0, 11, 7), (0, 12, 7), (0, 13, 7), (0, 14, 7), (0, 15, 7), (0, 16, 7), (0, 17, 7), (0, 18, 7), (0, 19, 7), (0, 20, 7), (0, 21, 7), (0, 21, 8), (0, 21, 9), (0, 21, 10), (0, 21, 11), (0, 21, 12), (0, 21, 13), (0, 21, 14), (0, 21, 15), (0, 21, 16), (0, 21, 17), (0, 21, 18), (0, 21, 19), (0, 21, 20), (0, 20, 21), (0, 19, 22), (0, 18, 23), (0, 17, 24), (0, 16, 25), (0, 16, 25), (0, 16, 25), (0, 16, 25), (0, 16, 25), (0, 16, 25), (0, 17, 25), (0, 18, 25), (0, 19, 25), (0, 19, 25), (0, 19, 25), (0, 19, 25), (0, 19, 25), (0, 19, 25), (0, 18, 25), (0, 17, 26), (0, 17, 26), (0, 17, 26), (0, 17, 26), (0, 17, 26), (0, 17, 26), (0, 18, 26), (0, 19, 26), (0, 19, 26), (0, 19, 26), (0, 19, 26), (0, 19, 26), (0, 18, 25), (0, 17, 24), (0, 17, 24), (0, 16, 24), (0, 16, 24), (0, 16, 24), (0, 16, 24), (0, 16, 24), (0, 16, 25), (0, 16, 26), (0, 16, 26), (0, 16, 26), (0, 16, 26), (0, 16, 26), (0, 16, 25), (0, 17, 24), (0, 18, 23), (0, 18, 23), (0, 19, 22), (0, 20, 21), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 20), (0, 21, 19), (0, 21, 18), (0, 21, 17), (0, 21, 16), (0, 21, 15), (0, 21, 14), (0, 21, 13), (0, 21, 12), (0, 21, 11), (0, 21, 10), (0, 21, 9), (0, 21, 8), (0, 20, 7), (0, 19, 7), (0, 18, 7), (0, 17, 7), (0, 16, 7), (0, 15, 7), (0, 14, 7), (0, 13, 7), (0, 12, 7), (0, 11, 8), (0, 11, 9), (0, 11, 10), (0, 11, 11), (0, 10, 12), (0, 9, 11), (0, 8, 10), (0, 7, 9), (0, 6, 9), (0, 5, 9), (0, 4, 10), (0, 3, 11), (0, 2, 12), (0, 1, 13), (0, 1, 13), (0, 1, 13), (0, 1, 13), (0, 1, 13), (0, 1, 13), (0, 1, 13), (0, 1, 13), (0, 1, 12), (0, 1, 11), (0, 1, 10), (0, 1, 9), (0, 2, 8), (0, 2, 7), (0, 2, 6), (0, 3, 7), (0, 4, 8), (0, 5, 9), (0, 6, 10), (0, 7, 11), (0, 8, 12), (0, 9, 13), (0, 10, 14), (0, 11, 15), (0, 12, 16), (0, 13, 17), (0, 14, 17), (0, 13, 17), (0, 12, 17), (0, 11, 17), (0, 10, 17), (0, 9, 17), (0, 8, 17), (0, 7, 17), (0, 6, 17), (0, 5, 17), (0, 4, 17), (0, 3, 17), (0, 2, 17), (0, 1, 17), (0, 1, 16), (0, 1, 15), (0, 1, 14), (0, 1, 13), (0, 1, 12), (0, 1, 11), (0, 1, 10), (0, 1, 9), (0, 1, 8), (0, 1, 7), (0, 1, 6), (0, 1, 5), (0, 1, 4), (0, 1, 3), (0, 1, 2), (0, 1, 1), (0, 2, 1), (0, 3, 1), (0, 4, 1), (0, 5, 1), (0, 6, 1), (0, 7, 1), (0, 8, 1), (0, 9, 1), (0, 10, 1), (0, 11, 1), (0, 12, 1), (0, 13, 1), (0, 14, 1), (0, 15, 1), (0, 16, 1), (0, 17, 1), (0, 18, 1), (0, 19, 1), (0, 20, 1), (0, 21, 1), (0, 22, 1), (0, 23, 1), (0, 24, 1), (0, 24, 2), (0, 24, 3), (0, 24, 4), (0, 24, 5), (0, 24, 6), (0, 24, 7), (0, 24, 8), (0, 24, 9), (0, 24, 10), (0, 24, 11), (0, 24, 12), (0, 24, 13), (0, 24, 14), (0, 23, 15), (0, 23, 16)]
 
     def setUp(self):
         super().setUp()

intelligine/tests/simulation/mode/TestChangeMode.py

@@ -114,35 +114,35 @@ class TestChangeMode(Base):
 
         # Ant has take Food piece
         self._run_and_get_core(20)
-        self.assertEquals((0, 0, -20), self.ant.get_position())
+        self.assertEquals((0, 0, -18), self.ant.get_position())
         self.assertTrue(self.ant.is_carrying())
         self.assertIsNotNone(self.ant.get_carried())
         self.assertEquals(self.food.__class__, self.ant.get_carried().__class__)
         molecule = self.ant.get_movement_molecule_gland().get_molecule()
         # Now it appose exploration molecule
-        self.assertEquals((PHEROMON_DIR_EXPLO, 0), (molecule.get_type(), molecule.get_distance()))
+        self.assertEquals((PHEROMON_DIR_EXPLO, 1), (molecule.get_type(), molecule.get_distance()))
         self.assertEquals(MODE_GOHOME, self.ant.get_brain().get_movement_mode())
         self.assertEquals(PHEROMON_DIR_EXPLO, self.ant.get_movement_molecule_gland().get_molecule_type())
 
         self._run_and_get_core(34)
-        self.assertEquals((0, 0, -6), self.ant.get_position())
+        self.assertEquals((0, 0, -4), self.ant.get_position())
         self.assertTrue(self.ant.is_carrying())
         self.assertEquals(MODE_HOME, self.ant.get_brain().get_movement_mode())
 
         self._run_and_get_core(35)
-        self.assertEquals((0, 0, -5), self.ant.get_position())
+        self.assertEquals((0, 0, -3), self.ant.get_position())
         self.assertTrue(self.ant.is_carrying())
         self.assertEquals(MODE_HOME, self.ant.get_brain().get_movement_mode())
 
         self._run_and_get_core(36)
-        self.assertEquals((0, 0, -4), self.ant.get_position())
+        self.assertEquals((0, 0, -2), self.ant.get_position())
         self.assertEquals(MODE_HOME, self.ant.get_brain().get_movement_mode())
 
         self._run_and_get_core(39)
-        self.assertEquals((0, 0, -1), self.ant.get_position())
+        self.assertEquals((0, 0, -3), self.ant.get_position())
         # Ant has NOT put his food piece
         self.assertFalse(self.ant.is_carrying())
 
         self._run_and_get_core(40)
-        self.assertEquals((0, 0, -2), self.ant.get_position())
+        self.assertEquals((0, 0, -4), self.ant.get_position())
         self.assertFalse(self.ant.is_carrying())

intelligine/tests/src/simulation/SimpleTestWorld1.tmx

@@ -180,36 +180,36 @@
   </tile>
   <tile id="2">
    <properties>
-    <property name="object" value="stocked_food"/>
     <property name="callbacks" value="stocked_food"/>
+    <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="3">
    <properties>
     <property name="actions" value="clone(),"/>
-    <property name="object" value="stocked_food"/>
     <property name="callbacks" value="stocked_food"/>
+    <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="4">
    <properties>
     <property name="actions" value="clone(2),"/>
-    <property name="object" value="stocked_food"/>
     <property name="callbacks" value="stocked_food"/>
+    <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="5">
    <properties>
     <property name="actions" value="clone(3),"/>
-    <property name="object" value="stocked_food"/>
     <property name="callbacks" value="stocked_food"/>
+    <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="6">
    <properties>
     <property name="actions" value="clone(4),"/>
-    <property name="object" value="stocked_food"/>
     <property name="callbacks" value="stocked_food"/>
+    <property name="object" value="stocked_food"/>
    </properties>
   </tile>
  </tileset>
@@ -2135,7 +2135,7 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="241"/>
+   <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="241"/>
@@ -2234,8 +2234,8 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="241"/>
-   <tile gid="241"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
    <tile gid="1"/>
    <tile gid="241"/>
    <tile gid="241"/>
@@ -2333,9 +2333,9 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="241"/>
-   <tile gid="241"/>
-   <tile gid="241"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="241"/>
@@ -2631,7 +2631,7 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="241"/>
+   <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="0"/>
@@ -2731,7 +2731,7 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="241"/>
+   <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="244"/>
    <tile gid="0"/>
@@ -2831,7 +2831,7 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="241"/>
+   <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="0"/>
    <tile gid="0"/>