Update some more tests

Author: marcharper

axelrod/tests/strategies/test_evolvable_player.py

@@ -41,6 +41,8 @@ def mutate(self):
         return EvolvableTestOpponent(value)
 
     def crossover(self, other):
+        if other.__class__ != self.__class__:
+            raise TypeError("Crossover must be between the same player classes.")
         value = self.value + other.value
         return EvolvableTestOpponent(value)
 
@@ -56,8 +58,9 @@ def player(self):
 
     def test_repr(self):
         """Test that the representation is correct."""
-        if not self.__class__ != EvolvablePlayer:
-            self.assertEqual(str(self.player()), self.name)
+        if self.__class__ != TestEvolvablePlayer:
+            self.assertIn(self.name, str(self.player()))
+        pass
 
     def test_initialisation(self):
         """Test that the player initiates correctly."""
@@ -123,7 +126,9 @@ def test_crossover(self):
 
     def test_crossover_mismatch(self):
         other = axl.Cooperator()
-        self.assertRaises(TypeError, self.player_class.crossover, other=other)
+        player = self.player()
+        with self.assertRaises(TypeError):
+            player.crossover(other)
 
     def test_serialization(self):
         """Serializing and deserializing should return the original player."""

axelrod/tests/strategies/test_gambler.py

@@ -529,6 +529,10 @@ def test_create_vector_bounds(self):
         self.assertEqual(len(lb), 8)
         self.assertEqual(len(ub), 8)
 
+    def test_mutate_value_bounds(self):
+        self.assertEqual(axelrod.EvolvableGambler.mutate_value(2), 1)
+        self.assertEqual(axelrod.EvolvableGambler.mutate_value(-2), 0)
+
 
 class TestEvolvableGambler2(TestEvolvablePlayer):
     name = "EvolvableGambler"
@@ -563,7 +567,7 @@ class TestEvolvableGambler4(TestEvolvablePlayer):
     axelrod.EvolvableGambler,
     pattern=tables[("PSO Gambler 2_2_2", 2, 2, 2)],
     parameters=(2, 2, 2),
-    initial_actions=(C,C,)
+    initial_actions=(C, C,)
 )
 
 

axelrod/tests/unit/test_moran.py

@@ -402,14 +402,23 @@ def test_atomic_mutation_cycler(self):
         self.assertEqual(len(mp.populations), 19)
         self.assertTrue(mp.fixated)
 
-    def test_mutation_method_exception(self):
+    def test_mutation_method_exceptions(self):
         axelrod.seed(10)
         cycle_length = 5
         players = [axelrod.EvolvableCycler(cycle_length=cycle_length)
                    for _ in range(5)]
         with self.assertRaises(ValueError):
             MoranProcess(players, turns=10, mutation_method="random")
 
+        axelrod.seed(0)
+        players = [axelrod.Cycler(cycle="CD" * random.randint(2, 10))
+                   for _ in range(10)]
+
+        mp = MoranProcess(players, turns=10, mutation_method="atomic")
+        with self.assertRaises(TypeError):
+            for _ in range(10):
+                next(mp)
+
 
 class GraphMoranProcess(unittest.TestCase):
     def test_complete(self):