Merge branch 'feature/mockito-5-workaround' into 'master'

mockito 5 workaround

See merge request !112

pyjapc/tests/conftest.py

@@ -118,3 +118,14 @@ def japc_mock(jvm) -> typing.Generator[typing.Type["cern.japc.ext.mockito.JapcMo
     yield mock
     mock.resetToDefault()
     mock.mockNoService()
+
+@pytest.fixture
+def japc_set(jvm):
+    cern = jp.JPackage('cern')
+    JapcUtils = cern.japc.core.util.JapcUtils
+    def setter(param, selector, value):
+        result = JapcUtils.setValuesAsync({param: value}, selector)
+        exception = result.values().iterator().next().getException()
+        if exception is not None:
+            raise RuntimeError(exception.getMessage())
+    return setter

pyjapc/tests/test_getNextParamValue.py

@@ -3,12 +3,10 @@ import time
 
 import pytest
 
-
 WAIT_TIME = 0.05
 
 
-@pytest.mark.skip(reason="Unhandled problem with mockito 5")
-def test_simple_case(japc, japc_mock):
+def test_simple_case(japc, japc_mock, japc_set):
     param_name = 'TEST/TestProperty'
     param = japc_mock.mockParameter(param_name)
     japc_mock.whenGetValueThen(
@@ -18,7 +16,7 @@ def test_simple_case(japc, japc_mock):
         japc.getNextParamValue(param_name, timeout=0.25)
 
     def set_value():
-        param.setValue(japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(112))
+        japc_set(param, japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(112))
 
     threading.Timer(WAIT_TIME, set_value).start()
     result = japc.getNextParamValue(param_name, timeout=1, timingSelectorOverride="LHC.USER.TEST")
@@ -30,19 +28,18 @@ def test_simple_case(japc, japc_mock):
     assert 'isFirstUpdate' in result[1]
 
 
-@pytest.mark.skip(reason="Unhandled problem with mockito 5")
-def test_n_values(japc, japc_mock):
+def test_n_values(japc, japc_mock, japc_set):
     param_name = 'TEST/TestProperty'
     param = japc_mock.mockParameter(param_name)
     japc_mock.whenGetValueThen(
         param, japc_mock.sel('LHC.USER.TEST'), japc_mock.acqVal(param_name, 42, 0))
 
     def set_several_values():
-        param.setValue(japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(112))
+        japc_set(param, japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(112))
         time.sleep(WAIT_TIME)
-        param.setValue(japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(113))
+        japc_set(param, japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(113))
         time.sleep(WAIT_TIME)
-        param.setValue(japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(-1))
+        japc_set(param, japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(-1))
 
     threading.Timer(WAIT_TIME, set_several_values).start()
     result = japc.getNextParamValue(param_name, timeout=1, timingSelectorOverride="LHC.USER.TEST", n_values=3)

pyjapc/tests/test_subscribeParam.py

@@ -2,13 +2,10 @@ import logging
 import time
 from unittest import mock
 
-import pytest
-
 SMALL_WAIT = 0.1
 
 
-@pytest.mark.xfail(reason="Unhandled problem with mockito 5")
-def test_subscription_integration(japc, japc_mock):
+def test_subscription_integration(japc, japc_mock, japc_set):
     param_name = "TEST/TestProperty"
     param = japc_mock.mockParameter(param_name)
     japc_mock.whenGetValueThen(
@@ -36,7 +33,7 @@ def test_subscription_integration(japc, japc_mock):
     callback.reset_mock()
 
     # Check that a new value is sent.
-    param.setValue(japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(112))
+    japc_set(param, japc_mock.sel("LHC.USER.TEST"), japc_mock.spv(112))
     time.sleep(SMALL_WAIT)
     assert callback.call_args[0][:2] == (param_name, 112)
     assert callback.call_args[0][2]['isFirstUpdate'] is False