Removed base class that used to be shared by the KPI and data source probe

force_bdss/tests/probe_classes/data_source.py

@@ -6,8 +6,6 @@ from force_bdss.api import (
     Slot
 )
 
-from .evaluator_factory import ProbeEvaluatorFactory
-
 
 def run_func(*args, **kwargs):
     return []
@@ -47,8 +45,16 @@ class ProbeDataSourceModel(BaseDataSourceModel):
         self.changes_slots = True
 
 
-class ProbeDataSourceFactory(BaseDataSourceFactory,
-                             ProbeEvaluatorFactory):
+class ProbeDataSourceFactory(BaseDataSourceFactory):
+
+    run_function = Function(default_value=run_func)
+
+    input_slots_type = Str('PRESSURE')
+    output_slots_type = Str('PRESSURE')
+
+    input_slots_size = Int(0)
+    output_slots_size = Int(0)
+
     def get_identifier(self):
         return "test_ds"
 

force_bdss/tests/probe_classes/evaluator_factory.py

-try:
-    import mock
-except ImportError:
-    from unittest import mock
-
-from envisage.plugin import Plugin
-
-from traits.api import HasStrictTraits, Function, Str, Int
-
-
-def run_func(*args, **kwargs):
-    return []
-
-
-class ProbeEvaluatorFactory(HasStrictTraits):
-    def __init__(self, plugin=None, *args, **kwargs):
-        if plugin is None:
-            plugin = mock.Mock(Plugin)
-        super(ProbeEvaluatorFactory, self).__init__(
-            plugin=plugin, *args, **kwargs)
-
-    run_function = Function(default_value=run_func)
-
-    input_slots_type = Str('PRESSURE')
-    output_slots_type = Str('PRESSURE')
-
-    input_slots_size = Int(0)
-    output_slots_size = Int(0)