Reset standard warning behavior at end of tests, and add tests

Author: gaffney2010

axelrod/tests/integration/test_filtering.py

@@ -18,6 +18,9 @@ def setUp(self) -> None:
         # Ignore warnings about classifiers running on instances
         warnings.simplefilter("ignore", category=UserWarning)
 
+    def tearDown(self) -> None:
+        warnings.simplefilter("default", category=UserWarning)
+
     @given(strategies=strategy_lists(min_size=20, max_size=20))
     def test_boolean_filtering(self, strategies):
 

axelrod/tests/unit/test_classification.py

@@ -46,6 +46,9 @@ def setUp(self) -> None:
         # Ignore warnings about classifiers running on instances
         warnings.simplefilter("ignore", category=UserWarning)
 
+    def tearDown(self) -> None:
+        warnings.simplefilter("default", category=UserWarning)
+
     def test_classifier_build(self):
         dirname = os.path.dirname(__file__)
         test_path = os.path.join(dirname, "../../../test_outputs/classifier_test.yaml")
@@ -75,8 +78,13 @@ def test_singletonity_of_classifiers_class(self):
 
     def test_get_name_from_classifier(self):
         # Should be able to take a string or a Classifier instance.
-        self.assertEqual(Classifiers["memory_depth"](axl.TitForTat), 1)
-        self.assertEqual(Classifiers[memory_depth](axl.TitForTat), 1)
+        self.assertEqual(Classifiers["memory_depth"](axl.TitForTat()), 1)
+        self.assertEqual(Classifiers[memory_depth](axl.TitForTat()), 1)
+
+    def test_classifier_works_on_non_instances(self):
+        with warnings.catch_warnings(record=True) as w:
+            self.assertEqual(Classifiers["memory_depth"](axl.TitForTat), 1)
+            self.assertEquals(len(w), 1)
 
     def test_key_error_on_uknown_classifier(self):
         with self.assertRaises(KeyError):
@@ -219,13 +227,13 @@ def test_is_basic(self):
         ]
 
         for strategy in known_cheaters:
-            self.assertFalse(axl.Classifiers.is_basic(strategy), msg=strategy)
+            self.assertFalse(axl.Classifiers.is_basic(strategy()), msg=strategy)
 
         for strategy in known_basic:
-            self.assertTrue(axl.Classifiers.is_basic(strategy), msg=strategy)
+            self.assertTrue(axl.Classifiers.is_basic(strategy()), msg=strategy)
 
         for strategy in known_ordinary:
-            self.assertFalse(axl.Classifiers.is_basic(strategy), msg=strategy)
+            self.assertFalse(axl.Classifiers.is_basic(strategy()), msg=strategy)
 
 
 def str_reps(xs):