closer to original TestForgetfulGrudger

Author: eric-s-s

axelrod/tests/strategies/test_grudger.py

@@ -58,16 +58,17 @@ def test_strategy(self):
         attrs = {'grudged': False, 'mem_length': 10, 'grudge_memory': 0}
         self.versus_test(opponent, expected_actions=actions, attrs=attrs)
 
-        # grudge_memory goes to ten, resets and climbs back to five.
-        opponent = axl.Defector()
-        actions = [(C, D)] + [(D, D)] * 15
-        attrs = {'grudged': True, 'mem_length': 10, 'grudge_memory': 5}
-        self.versus_test(opponent, expected_actions=actions, attrs=attrs)
+        for i in range(1, 15):
+            opponent = axl.Defector()
+            actions = [(C, D)] + [(D, D)] * i
+            memory = i if i <= 10 else i - 10
+            attrs = {'grudged': True, 'mem_length': 10, 'grudge_memory': memory}
+            self.versus_test(opponent, expected_actions=actions, attrs=attrs)
 
         opponent_actions = [C] * 2 + [D] + [C] * 10
         opponent = axl.MockPlayer(actions=opponent_actions)
-        actions = ([(C, C)] * 2 + [(C, D)] + [(D, C)] * 10) * 3
-        attrs = {'grudged': True, 'mem_length': 10, 'grudge_memory': 10}
+        actions = ([(C, C)] * 2 + [(C, D)] + [(D, C)] * 10) * 3 + [(C, C)]
+        attrs = {'grudged': False, 'mem_length': 10, 'grudge_memory': 0}
         self.versus_test(opponent, expected_actions=actions, attrs=attrs)
 
     def test_reset_method(self):