Refactor memory two test.

Addresses #884.

Author: drvinceknight

axelrod/tests/strategies/test_memorytwo.py

@@ -22,22 +22,27 @@ class TestMEM2(TestPlayer):
     }
 
     def test_strategy(self):
+        self.first_play_test(C)
         # Start with TFT
-        self.responses_test([C])
-        self.responses_test([C], [C], [C])
-        self.responses_test([D], [C], [D])
-        # TFT if mutual cooperation on first two rounds
-        self.responses_test([C], [C, C], [C, C])
-        self.responses_test([D], [C, D], [D, D])
+        actions = [(C, C), (C, C)]
+        self.versus_test(opponent=axelrod.Cooperator(),
+                         expected_actions=actions,
+                         attrs={"play_as": "TFT", "shift_counter": 1,
+                                "alld_counter": 0})
+        actions = [(C, D), (D, D)]
+        self.versus_test(opponent=axelrod.Defector(), expected_actions=actions,
+                         attrs={"play_as": "TFT", "shift_counter": 1,
+                                "alld_counter": 0})
         # TFTT if C, D and D, C
-        self.responses_test([C], [C, C, C, D], [C, C, D, C])
-        self.responses_test([D], [C, C, C, D, C, D], [C, C, D, C, D, D])
-        # TFTT if D, C and C, D
-        self.responses_test([C], [C, C, D, C], [C, D, C, D])
-        self.responses_test([D], [C, C, D, C, C, D], [C, C, D, C, D, D])
-        # ALLD Otherwise
-        self.responses_test([D], [C, D], [D, D])
-        self.responses_test([D], [C, D, D], [D, D, D])
-        # ALLD forever if all D twice
-        self.responses_test([D] * 10, [C, D, D, D, D, D], [D, D, D, D, D, D])
-        self.responses_test([D] * 9, [C] + [D] * 5 + [C] * 4, [D] * 6 + [C] * 4)
+        opponent = axelrod.MockPlayer([D, C, D, D])
+        actions = [(C, D), (D, C), (C, D), (C, D)]
+        self.versus_test(opponent=opponent, expected_actions=actions,
+                         attrs={"play_as": "TFTT", "shift_counter": 1,
+                                "alld_counter": 0})
+
+        opponent = axelrod.MockPlayer([D, C, D, D])
+        actions = [(C, D), (D, C), (C, D), (C, D), (D, D),
+                   (D, C), (D, D), (D, D), (D, D), (D, C)]
+        self.versus_test(opponent=opponent, expected_actions=actions,
+                         attrs={"play_as": "ALLD", "shift_counter": -1,
+                                "alld_counter": 2})