Fix TricklyLevelPunisher tests

Author: marcharper

axelrod/strategies/punisher.py

@@ -133,9 +133,7 @@ class LevelPunisher(Player):
     def strategy(self, opponent: Player) -> Action:
         if len(opponent.history) < 10:
             return C
-        elif (len(opponent.history) - opponent.cooperations) / len(
-            opponent.history
-        ) > 0.2:
+        elif opponent.defections / len(opponent.history) > 0.2:
             return D
         else:
             return C

axelrod/tests/strategies/test_player.py

@@ -59,7 +59,7 @@ class TestPlayerClass(unittest.TestCase):
 
     def test_seed_warning(self):
         """Test that the user is warned if a null seed is given."""
-        player = self.Player()
+        player = self.player()
         with warnings.catch_warnings():
             player._set_seed(seed=None)
 
@@ -646,10 +646,10 @@ def versus_test(
         match.play()
 
         # Test expected sequence of plays from the match is as expected.
-        for (play, expected_play) in zip(player1.history, expected_actions1):
-            self.assertEqual(play, expected_play)
-        for (play, expected_play) in zip(player2.history, expected_actions2):
-            self.assertEqual(play, expected_play)
+        for i, (play, expected_play) in enumerate(zip(player1.history, expected_actions1)):
+            self.assertEqual((i, play), (i, expected_play))
+        for i, (play, expected_play) in enumerate(zip(player2.history, expected_actions2)):
+            self.assertEqual((i, play), (i, expected_play))
 
         # Test final player attributes are as expected
         if attrs:

axelrod/tests/strategies/test_punisher.py

@@ -154,7 +154,7 @@ def test_strategy(self):
 
 class TestTrickyLevelPunisher(TestPlayer):
 
-    name = "Level Punisher"
+    name = "Tricky Level Punisher"
     player = axl.TrickyLevelPunisher
     expected_classifier = {
         "memory_depth": float("inf"),  # Long memory
@@ -171,25 +171,20 @@ def test_strategy(self):
         actions = [(C, C)] * 9
         self.versus_test(opponent=axl.Cooperator(), expected_actions=actions)
 
-        # After 10 rounds
         # Check if number of defections by opponent is greater than 20%
-        opponent = axl.MockPlayer([C] * 4 + [D] * 2 + [C] * 3 + [D])
-        actions = [(C, C)] * 4 + [(C, D)] * 2 + [(C, C)] * 3 + [(C, D), (D, C)]
+        op_actions = [C] * 6 + [D] * 4
+        opponent = axl.MockPlayer(op_actions)
+        actions = list(zip([C] * 7 + [D] * 3, op_actions))
         self.versus_test(opponent=opponent, expected_actions=actions)
 
         # Check if number of defections by opponent is greater than 10%
-        opponent = axl.MockPlayer([C] * 4 + [D] + [C] * 4 + [D])
-        actions = [(C, C)] * 4 + [(C, D)] + [(C, C)] * 4 + [(C, D), (C, C)]
+        op_actions = [C] * 8 + [D, C]
+        opponent = axl.MockPlayer(op_actions)
+        actions = list(zip([C] * 9 + [D], op_actions))
         self.versus_test(opponent=opponent, expected_actions=actions)
 
-        # After 10 rounds
         # Check if number of defections by opponent is greater than 5%
-        opponent = axl.MockPlayer([C] * 4 + [D] + [C] * 5)
-        actions = [(C, C)] * 4 + [(C, D)] + [(C, C)] * 5
+        op_actions = [C] * 18 + [D, C]
+        opponent = axl.MockPlayer(op_actions)
+        actions = list(zip([C] * 19 + [D], op_actions))
         self.versus_test(opponent=opponent, expected_actions=actions)
-
-        # Check if number of defections by opponent is less than 5%
-        opponent = axl.MockPlayer([C] * 10)
-        actions = [(C, C)] * 5
-        self.versus_test(opponent=opponent, expected_actions=actions)
-