demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix test failures in DiscoveryServiceRegistryOSGiTest (#5309)

Browse Source 
* Fix test failures in DiscoveryServiceRegistryOSGiTest

Follow-up to #5307. Apply the fix to more test cases.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2026-01-26 08:07:06 +01:00
committed by GitHub
parent c543c214ee
commit 33d0e2af63
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
+4
View File
@@ -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);