added tests for counter complete

missionpinball · Oct 7, 2016 · b7475ee · b7475ee
1 parent 71f9c19
commit b7475ee
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/mpf/tests/test_LogicBlocks.py b/mpf/tests/test_LogicBlocks.py
@@ -56,7 +56,6 @@ def test_counter_with_lights(self):
         self.assertLedColor("led2", "black")
         self.assertLedColor("led3", "white")
 
-
     def test_accruals_simple(self):
         self.start_game()
         self.mock_event("accrual1_complete1")
@@ -139,6 +138,8 @@ def test_counter_simple_down(self):
         self.post_event("counter1_enable")
         for i in range(4):
             self.post_event("counter1_count")
+            self.assertEqual(4-i, self._last_event_kwargs["logicblock_counter1_hit"]["count"])
+            self.assertEqual(4-i, self._last_event_kwargs["logicblock_counter1_hit"]["remaining"])
             self.assertEqual(0, self._events["logicblock_counter1_complete"])
 
         # nothing should happen when disabled
@@ -151,11 +152,15 @@ def test_counter_simple_down(self):
         self.post_event("counter1_count")
         self.assertEqual(1, self._events["logicblock_counter1_complete"])
         self.assertEqual(5, self._events["logicblock_counter1_hit"])
+        self.assertEqual(0, self._last_event_kwargs["logicblock_counter1_hit"]["count"])
+        self.assertEqual(0, self._last_event_kwargs["logicblock_counter1_hit"]["remaining"])
 
         # it should disable
         self.post_event("counter1_count")
         self.assertEqual(1, self._events["logicblock_counter1_complete"])
         self.assertEqual(5, self._events["logicblock_counter1_hit"])
+        self.assertEqual(0, self._last_event_kwargs["logicblock_counter1_hit"]["count"])
+        self.assertEqual(0, self._last_event_kwargs["logicblock_counter1_hit"]["remaining"])
 
         self.post_event("counter1_restart")
 
@@ -165,6 +170,8 @@ def test_counter_simple_down(self):
         # 4 more hits but not completed
         self.assertEqual(1, self._events["logicblock_counter1_complete"])
         self.assertEqual(9, self._events["logicblock_counter1_hit"])
+        self.assertEqual(1, self._last_event_kwargs["logicblock_counter1_hit"]["count"])
+        self.assertEqual(1, self._last_event_kwargs["logicblock_counter1_hit"]["remaining"])
 
         # reset
         self.post_event("counter1_reset")
@@ -174,11 +181,15 @@ def test_counter_simple_down(self):
         # another 4 hits still not complete
         self.assertEqual(1, self._events["logicblock_counter1_complete"])
         self.assertEqual(13, self._events["logicblock_counter1_hit"])
+        self.assertEqual(1, self._last_event_kwargs["logicblock_counter1_hit"]["count"])
+        self.assertEqual(1, self._last_event_kwargs["logicblock_counter1_hit"]["remaining"])
 
         # and complete again
         self.post_event("counter1_count")
         self.assertEqual(2, self._events["logicblock_counter1_complete"])
         self.assertEqual(14, self._events["logicblock_counter1_hit"])
+        self.assertEqual(0, self._last_event_kwargs["logicblock_counter1_hit"]["count"])
+        self.assertEqual(0, self._last_event_kwargs["logicblock_counter1_hit"]["remaining"])
 
     def test_sequence_simple(self):
         self.start_game()
@@ -430,7 +441,6 @@ def test_counter_hit_window(self):
             self.assertEqual(2+i, self._events["counter_counter3_hit"])
             self.advance_time_and_run(1)
 
-
         # it should complete
         self.post_event("counter3_count")
         self.assertEqual(1, self._events["logicblock_counter3_complete"])