Merge branch 'fix/setDataFilter_broken' into 'master'

Repair the setDataFilter method (with tests) by providing default values to the _giveMeSelector method.

See merge request !71

pyjapc/_japc.py

@@ -237,7 +237,11 @@ class PyJapc:
         """
         jp.attachThreadToJVM()
 
-    def _giveMeSelector(self, timingSelectorOverride, dataFilterOverride):
+    def _giveMeSelector(
+            self,
+            timingSelectorOverride=_INSTANCE_DEFAULT,
+            dataFilterOverride=_INSTANCE_DEFAULT,
+    ):
         """Produce and return a JAPC selector object with certain overrides.
 
         Args:

pyjapc/tests/test_pyjapc.py

@@ -383,6 +383,15 @@ def test_selector_business(jvm):
     assert japc_obj._selector.getDataFilter().toString() == "averaging (int:1) -> 1\n"
 
 
+def test_setDataFilter(jvm):
+    japc_obj = PyJapc(incaAcceleratorName=None)
+    assert japc_obj.getDataFilter() is None
+    japc_obj.setDataFilter({'averaging': 1})
+    assert japc_obj.getDataFilter() == {'averaging': 1}
+    japc_obj.setDataFilter(None)
+    assert japc_obj.getDataFilter() is None
+
+
 def test_get_value(japc, japc_mock):
     param = 'TEST/TestProperty'
     mock = japc_mock.mockParameter(param)