Update some new tests to use hypothesis

Author: marcharper

axelrod/tests/integration/test_filtering.py

@@ -1,21 +1,19 @@
-import random
 import unittest
 
-from axelrod import short_run_time_strategies, filtered_strategies, seed
-
+from axelrod import filtered_strategies, seed
+from axelrod.tests.property import strategy_lists
 from hypothesis import example, given, settings
 from hypothesis.strategies import integers
 
-strategies = random.sample(short_run_time_strategies, 20)
-
 
 class TestFiltersAgainstComprehensions(unittest.TestCase):
     """
     Test that the results of filtering strategies via a filterset dict
     match the results from using a list comprehension.
     """
 
-    def test_boolean_filtering(self):
+    @given(strategies=strategy_lists(min_size=20, max_size=20))
+    def test_boolean_filtering(self, strategies):
 
         classifiers = [
             "stochastic",
@@ -35,6 +33,7 @@ def test_boolean_filtering(self):
         min_memory_depth=integers(min_value=1, max_value=10),
         max_memory_depth=integers(min_value=1, max_value=10),
         memory_depth=integers(min_value=1, max_value=10),
+        strategies=strategy_lists(min_size=20, max_size=20),
     )
     @example(
         min_memory_depth=float("inf"),
@@ -43,7 +42,8 @@ def test_boolean_filtering(self):
     )
     @settings(max_examples=5)
     def test_memory_depth_filtering(
-        self, min_memory_depth, max_memory_depth, memory_depth
+        self, min_memory_depth, max_memory_depth, memory_depth,
+        strategies
     ):
 
         min_comprehension = set(
@@ -81,9 +81,11 @@ def test_memory_depth_filtering(
         filtered = set(filtered_strategies(filterset, strategies=strategies))
         self.assertEqual(comprehension, filtered)
 
-    @given(seed_=integers(min_value=0, max_value=4294967295))
+    @given(seed_=integers(min_value=0, max_value=4294967295),
+           strategies=strategy_lists(min_size=20, max_size=20),
+           )
     @settings(max_examples=5)
-    def test_makes_use_of_filtering(self, seed_):
+    def test_makes_use_of_filtering(self, seed_, strategies):
         """
         Test equivalent filtering using two approaches.
 

axelrod/tests/integration/test_tournament.py

@@ -37,7 +37,7 @@ def setUpClass(cls):
         min_size=10,
         max_size=30,
         min_turns=2,
-        max_turns=40,
+        max_turns=210,
         min_repetitions=1,
         max_repetitions=4,
     ))