From 33d0e2af630e38c64e2b45fbc01b6a93e6b6a76b Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Mon, 26 Jan 2026 08:07:06 +0100 Subject: [PATCH] Fix test failures in DiscoveryServiceRegistryOSGiTest (#5309) * Fix test failures in DiscoveryServiceRegistryOSGiTest Follow-up to #5307. Apply the fix to more test cases. Signed-off-by: Holger Friedrich --- .../config/discovery/DiscoveryServiceRegistryOSGiTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java index a86737251..1a92e363a 100644 --- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java +++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java @@ -197,6 +197,7 @@ public class DiscoveryServiceRegistryOSGiTest extends JavaOSGiTest { ScanListener mockScanListener = mock(ScanListener.class); discoveryServiceRegistry.addDiscoveryListener(discoveryListenerMock); + reset(discoveryListenerMock); // Reset mock to ignore cached result replays discoveryServiceRegistry.startScan(new ThingTypeUID(ANY_BINDING_ID_1, ANY_THING_TYPE_1), null, mockScanListener); @@ -209,6 +210,7 @@ public class DiscoveryServiceRegistryOSGiTest extends JavaOSGiTest { @Test public void testRemoveOlderResults() { discoveryServiceRegistry.addDiscoveryListener(discoveryListenerMock); + reset(discoveryListenerMock); // Reset mock to ignore cached result replays discoveryServiceMockForBinding1.removeOlderResults(discoveryServiceMockForBinding1.getTimestampOfLastScan()); waitForAssert(() -> { @@ -224,6 +226,7 @@ public class DiscoveryServiceRegistryOSGiTest extends JavaOSGiTest { ScanListener mockScanListener2 = mock(ScanListener.class); discoveryServiceRegistry.addDiscoveryListener(discoveryListenerMock); + reset(discoveryListenerMock); // Reset mock to ignore cached result replays discoveryServiceRegistry.startScan(new ThingTypeUID(ANY_BINDING_ID_1, ANY_THING_TYPE_1), null, mockScanListener1); discoveryServiceRegistry.startScan(new ThingTypeUID(ANY_BINDING_ID_2, ANY_THING_TYPE_2), null, @@ -369,6 +372,7 @@ public class DiscoveryServiceRegistryOSGiTest extends JavaOSGiTest { serviceRegs.add( bundleContext.registerService(DiscoveryService.class.getName(), anotherDiscoveryServiceMock, null)); discoveryServiceRegistry.addDiscoveryListener(discoveryListenerMock); + reset(discoveryListenerMock); // Reset mock to ignore cached result replays discoveryServiceRegistry.startScan(new ThingTypeUID(ANY_BINDING_ID_1, ANY_THING_TYPE_1), null, mockScanListener1);