Merge pull request #252 from lvgig/feature/edit_mixin_tests

started reworking mixin tests

tests/base/test_DataFrameMethodTransformer.py

@@ -8,8 +8,8 @@
 import tests.test_data as d
 from tests.base_tests import (
     ColumnStrListInitTests,
-    DropOriginalInitTests,
-    DropOriginalTransformTests,
+    DropOriginalInitMixinTests,
+    DropOriginalTransformMixinTests,
     GenericFitTests,
     GenericTransformTests,
     OtherBaseBehaviourTests,
@@ -86,7 +86,7 @@ def test_exception_raised_non_pandas_method_passed(self):
             )
 
 
-class TestInit(DropOriginalInitTests, DataFrameMethodTransformerInitTests):
+class TestInit(DropOriginalInitMixinTests, DataFrameMethodTransformerInitTests):
     @classmethod
     def setup_class(cls):
         cls.transformer_name = "DataFrameMethodTransformer"
@@ -100,7 +100,7 @@ def setup_class(cls):
         cls.transformer_name = "DataFrameMethodTransformer"
 
 
-class TestTransform(DropOriginalTransformTests, GenericTransformTests):
+class TestTransform(DropOriginalTransformMixinTests, GenericTransformTests):
     """Tests for DataFrameMethodTransformer.transform()."""
 
     @classmethod

tests/base_tests.py

@@ -120,7 +120,7 @@ def test_columns_non_string_or_list_error(
             uninitialized_transformers[self.transformer_name](**args)
 
 
-class DropOriginalInitTests(GenericInitTests):
+class DropOriginalInitMixinTests:
     """
     Tests for BaseTransformer.init() behaviour specific to when a transformer accepts a "drop_original" column.
     Note this deliberately avoids starting with "Tests" so that the tests are not run on import.
@@ -144,7 +144,7 @@ def test_drop_column_arg_errors(
             uninitialized_transformers[self.transformer_name](**args)
 
 
-class WeightColumnInitTests(GenericInitTests):
+class WeightColumnInitMixinTests:
     """
     Tests for BaseTransformer.init() behaviour specific to when a transformer takes accepts a weight column.
     Note this deliberately avoids starting with "Tests" so that the tests are not run on import.
@@ -363,7 +363,7 @@ def test_unexpected_kwarg_error(
             )
 
 
-class WeightColumnFitTests(GenericFitTests):
+class WeightColumnFitMixinTests:
     def test_fit_returns_self_weighted(
         self,
         minimal_attribute_dict,
@@ -553,7 +553,7 @@ def test_original_df_not_updated(self, initialized_transformers):
         pd.testing.assert_frame_equal(df, d.create_df_3())
 
 
-class DropOriginalTransformTests(GenericTransformTests):
+class DropOriginalTransformMixinTests:
     """
     Transform tests for transformers that take a "drop_original" argument
     Note this deliberately avoids starting with "Tests" so that the tests are not run on import.

tests/capping/test_BaseCappingTransformer.py

@@ -10,13 +10,13 @@
     GenericFitTests,
     GenericInitTests,
     GenericTransformTests,
-    WeightColumnFitTests,
-    WeightColumnInitTests,
+    WeightColumnFitMixinTests,
+    WeightColumnInitMixinTests,
 )
 from tubular.capping import BaseCappingTransformer
 
 
-class GenericCappingInitTests(WeightColumnInitTests, GenericInitTests):
+class GenericCappingInitTests(WeightColumnInitMixinTests, GenericInitTests):
     """Tests for BaseCappingTransformer.init()."""
 
     @classmethod
@@ -229,7 +229,7 @@ def test_capping_value_nan_inf_error(
             uninitialized_transformers[self.transformer_name](**args)
 
 
-class GenericCappingFitTests(WeightColumnFitTests, GenericFitTests):
+class GenericCappingFitTests(WeightColumnFitMixinTests, GenericFitTests):
     """Tests for BaseCappingTransformer.fit()."""
 
     @classmethod

tests/comparison/test_EqualityChecker.py

@@ -3,7 +3,7 @@
 
 import tests.test_data as d
 from tests.base_tests import (
-    DropOriginalInitTests,
+    DropOriginalInitMixinTests,
     GenericFitTests,
     GenericTransformTests,
     OtherBaseBehaviourTests,
@@ -12,7 +12,7 @@
 from tubular.comparison import EqualityChecker
 
 
-class TestInit(DropOriginalInitTests, TwoColumnListInitTests):
+class TestInit(DropOriginalInitMixinTests, TwoColumnListInitTests):
     """Generic tests for transformer.init()."""
 
     @classmethod

tests/imputers/test_MeanImputer.py

@@ -7,8 +7,8 @@
     GenericFitTests,
     GenericTransformTests,
     OtherBaseBehaviourTests,
-    WeightColumnFitTests,
-    WeightColumnInitTests,
+    WeightColumnFitMixinTests,
+    WeightColumnInitMixinTests,
 )
 from tests.imputers.test_BaseImputer import (
     GenericImputerTransformTests,
@@ -17,15 +17,15 @@
 from tubular.imputers import MeanImputer
 
 
-class TestInit(WeightColumnInitTests, ColumnStrListInitTests):
+class TestInit(WeightColumnInitMixinTests, ColumnStrListInitTests):
     """Generic tests for transformer.init()."""
 
     @classmethod
     def setup_class(cls):
         cls.transformer_name = "MeanImputer"
 
 
-class TestFit(WeightColumnFitTests, GenericFitTests):
+class TestFit(WeightColumnFitMixinTests, GenericFitTests):
     """Generic tests for transformer.fit()"""
 
     @classmethod

tests/imputers/test_MedianImputer.py

@@ -8,8 +8,8 @@
     GenericFitTests,
     GenericTransformTests,
     OtherBaseBehaviourTests,
-    WeightColumnFitTests,
-    WeightColumnInitTests,
+    WeightColumnFitMixinTests,
+    WeightColumnInitMixinTests,
 )
 from tests.imputers.test_BaseImputer import (
     GenericImputerTransformTests,
@@ -18,15 +18,15 @@
 from tubular.imputers import MedianImputer
 
 
-class TestInit(ColumnStrListInitTests, WeightColumnInitTests):
+class TestInit(ColumnStrListInitTests, WeightColumnInitMixinTests):
     """Generic tests for transformer.init()."""
 
     @classmethod
     def setup_class(cls):
         cls.transformer_name = "MedianImputer"
 
 
-class TestFit(WeightColumnFitTests, GenericFitTests):
+class TestFit(WeightColumnFitMixinTests, GenericFitTests):
     """Generic tests for transformer.fit()"""
 
     @classmethod

tests/imputers/test_ModeImputer.py

@@ -9,8 +9,8 @@
     GenericFitTests,
     GenericTransformTests,
     OtherBaseBehaviourTests,
-    WeightColumnFitTests,
-    WeightColumnInitTests,
+    WeightColumnFitMixinTests,
+    WeightColumnInitMixinTests,
 )
 from tests.imputers.test_BaseImputer import (
     GenericImputerTransformTests,
@@ -19,15 +19,15 @@
 from tubular.imputers import ModeImputer
 
 
-class TestInit(ColumnStrListInitTests, WeightColumnInitTests):
+class TestInit(ColumnStrListInitTests, WeightColumnInitMixinTests):
     """Generic tests for transformer.init()."""
 
     @classmethod
     def setup_class(cls):
         cls.transformer_name = "ModeImputer"
 
 
-class TestFit(WeightColumnFitTests, GenericFitTests):
+class TestFit(WeightColumnFitMixinTests, GenericFitTests):
     """Generic tests for transformer.fit()"""
 
     @classmethod