Update test_stalker.py (#943)

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

* Update test_stalker.py

unittest on my machine is giving me different results from the results here.

* Update test_stalker.py

* Update test_stalker.py

change the results back to the way Appveyor test results show

* Update test_stalker.py

* Update test_stalker.py

line 34 test, the test error is showing that stalker will cooperate until the last round, the Mock Player cooperates. I am changing it to the way tests outcomes show. But as previous builds, the current average score > very good score tests does not get tested.

* Add a test for average_score > good score.

This requires tricking the player to defect before the end of the game.

* Fix the broken import.

Author: alajara

axelrod/tests/strategies/test_stalker.py

@@ -1,15 +1,15 @@
 """Tests for the Stalker strategy."""
 
-import axelrod
+import axelrod as axl
 import random
 from .test_player import TestPlayer
 
-C, D = axelrod.Actions.C, axelrod.Actions.D
+C, D = axl.Actions.C, axl.Actions.D
 
 class TestStalker(TestPlayer):
 
     name = "Stalker: D"
-    player = axelrod.Stalker
+    player = axl.Stalker
     expected_classifier = {
         'memory_depth': float('inf'),
         'stochastic': True,
@@ -21,26 +21,53 @@ class TestStalker(TestPlayer):
     }
 
     def test_strategy(self):
+
         # Start with cooperation
         self.first_play_test(C)
 
-        # current_average_score > very_good_score
-        self.responses_test([D], [C] * 2 + [D] * 4, [D] * 2 + [C] * 4)
-        self.responses_test([D], [D] * 2 + [C] * 4, [C] * 6)
+
+        actions = [(C, D)] * 2 + [(C, C), (D, C), (C, C), (C, C), (D, D)]
+        self.versus_test(opponent=axl.MockPlayer([D] * 2 + [C] * 4),
+                         expected_actions=actions)
+
+        actions = [(C, C)] * 3 + [(D, C)]
+        self.versus_test(opponent=axl.Cooperator(), expected_actions=actions)
 
         # wish_score < current_average_score < very_good_score
-        self.responses_test([C], [C] * 7 + [D] * 2, [C] * 7 + [D] * 2)
-        self.responses_test([C], [C] * 7 + [C], [C] * 7 + [D])
+        actions = [(C, C)] * 7 + [(C, D), (C, D), (C, C), (C, C), (D, C)]
+        self.versus_test(opponent=axl.MockPlayer(actions=[C] * 7 + [D] * 2),
+                         expected_actions=actions)
+
+        actions = [(C, C)] * 7 + [(C, D), (C, C), (D, C)]
+        self.versus_test(opponent=axl.MockPlayer(actions=[C] * 7 + [D]),
+                         expected_actions=actions)
 
         # current_average_score > 2
-        self.responses_test([C], [C] * 10, [C] * 10)
+        actions = [(C, C)] * 9 + [(D, C)]
+        self.versus_test(axl.Cooperator(), expected_actions=actions)
 
         # 1 < current_average_score < 2
-        self.responses_test([D], [C] * 7 + [C] * 5, [C] * 7 + [D] * 5)
+        actions = [(C, C)] * 7 + [(C, D)] * 4 + [(D, D)]
+        self.versus_test(opponent=axl.MockPlayer(actions=[C] * 7 + [D] * 5),
+                         expected_actions=actions)
 
         # current_average_score < 1
-        self.responses_test([D], [D] * 7 + [C] * 5, [D] * 7 + [D] * 5, seed = 6)
-        self.responses_test([C], [D] * 7 + [C] * 5, [D] * 7 + [D] * 5, seed = 7)
+        actions = [(C, D)] + [(D, D)] * 2 + [(C, D)] * 3 + [(D, D),
+                   (C, D), (D, D), (C, D), (D, D), (C, D), (D, D)]
+        self.versus_test(axl.Defector(), expected_actions=actions, seed=6)
+
+        actions = [(C, D)] * 3 + [(D, D), (C, D), (D, D), (C, D),
+                   (C, D), (D, D), (C, D), (C, D), (C, D), (D, D)]
+        self.versus_test(axl.Defector(), expected_actions=actions, seed=7)
 
         # defect in last round
-        self.responses_test([C, D], [C] * 198, [C] * 198, length=200)
+        actions = [(C, C)] * 199 + [(D, C)]
+        self.versus_test(axl.Cooperator(), expected_actions=actions,
+                         match_attributes={"length": 200})
+
+        # Force a defection before the end of the actual match which ensures
+        # that current_average_score > very_good_score
+        actions = [(C, C)] * 3 + [(D, C)] * 3
+        self.versus_test(opponent=axl.Cooperator(),
+                         expected_actions=actions,
+                         match_attributes={"length": 4})