Adjust tests to accommodate openhab/openhab-core#5032

openhab/openhab-core#5032 made discovery result registration asynchronous, which led to some tests failing because the discovery results aren't immediately available one the call to thingDiscovered() returns - because the registration itself is done in a different thread. This has been addressed by pausing slightly before testing the results.

Signed-off-by: Ravi Nadahar <[email protected]>

Author: Ravi Nadahar

bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/discovery/ThingDiscoveryServiceTest.java

@@ -20,6 +20,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -159,7 +160,7 @@ void testAddDevices() {
         fixture.addDevices(devices, emptyRooms);
 
         // two calls for the two devices expected
-        verify(discoveryListener, times(2)).thingDiscovered(any(), any());
+        verify(discoveryListener, timeout(1000L).times(2)).thingDiscovered(any(), any());
     }
 
     @Test
@@ -185,7 +186,8 @@ void testAddDevice() {
         device.name = "Test Name";
         fixture.addDevice(device, "TestRoom");
 
-        verify(discoveryListener).thingDiscovered(discoveryServiceCaptor.capture(), discoveryResultCaptor.capture());
+        verify(discoveryListener, timeout(1000L)).thingDiscovered(discoveryServiceCaptor.capture(),
+                discoveryResultCaptor.capture());
 
         assertThat(discoveryServiceCaptor.getValue().getClass(), is(ThingDiscoveryService.class));
         DiscoveryResult result = discoveryResultCaptor.getValue();
@@ -226,7 +228,8 @@ private void assertDeviceNiceName(String deviceName, String roomName, String exp
         device.id = "testDevice:ID";
         device.name = deviceName;
         fixture.addDevice(device, roomName);
-        verify(discoveryListener).thingDiscovered(discoveryServiceCaptor.capture(), discoveryResultCaptor.capture());
+        verify(discoveryListener, timeout(1000L)).thingDiscovered(discoveryServiceCaptor.capture(),
+                discoveryResultCaptor.capture());
         assertThat(discoveryServiceCaptor.getValue().getClass(), is(ThingDiscoveryService.class));
         DiscoveryResult result = discoveryResultCaptor.getValue();
         assertThat(result.getLabel(), is(expectedNiceName));

bundles/org.openhab.binding.mspa/src/test/java/org/openhab/binding/mspa/TestMessages.java

@@ -87,7 +87,7 @@ void testToken() {
     }
 
     @Test
-    void testDiscovery() {
+    void testDiscovery() throws InterruptedException {
         Bridge thing = new BridgeImpl(THING_TYPE_OWNER_ACCOUNT, new ThingUID("mspa", "account"));
         Map<String, Object> configMap = new HashMap<>();
         MSpaDiscoveryService discovery = new MSpaDiscoveryService();
@@ -102,6 +102,7 @@ void testDiscovery() {
         try {
             String content = new String(Files.readAllBytes(Paths.get(fileName)));
             account.decodeDevices(content);
+            Thread.sleep(500L);
             List<DiscoveryResult> results = discoveryListener.getResults();
             assertEquals(1, results.size(), "Number of discovery results");
             DiscoveryResult result = results.get(0);

bundles/org.openhab.binding.tradfri/src/test/java/org/openhab/binding/tradfri/internal/discovery/TradfriDiscoveryServiceTest.java

@@ -108,12 +108,13 @@ public void correctSupportedTypes() {
     }
 
     @Test
-    public void validDiscoveryResultWhiteLightW() {
+    public void validDiscoveryResultWhiteLightW() throws InterruptedException {
         String json = "{\"9001\":\"TRADFRI bulb E27 W opal 1000lm\",\"9002\":1492856270,\"9020\":1507194357,\"9003\":65537,\"3311\":[{\"5850\":1,\"5851\":254,\"9003\":0}],\"9054\":0,\"5750\":2,\"9019\":1,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI bulb E27 W opal 1000lm\",\"2\":\"\",\"3\":\"1.2.214\",\"6\":1}}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65537", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0100:1:65537")));
@@ -124,12 +125,13 @@ public void validDiscoveryResultWhiteLightW() {
     }
 
     @Test
-    public void validDiscoveryResultWhiteLightWS() {
+    public void validDiscoveryResultWhiteLightWS() throws InterruptedException {
         String json = "{\"9001\":\"TRADFRI bulb E27 WS opal 980lm\",\"9002\":1492955148,\"9020\":1507200447,\"9003\":65537,\"3311\":[{\"5710\":26909,\"5850\":1,\"5851\":203,\"5707\":0,\"5708\":0,\"5709\":30140,\"5711\":370,\"5706\":\"f1e0b5\",\"9003\":0}],\"9054\":0,\"5750\":2,\"9019\":1,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI bulb E27 WS opal 980lm\",\"2\":\"\",\"3\":\"1.2.217\",\"6\":1}}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65537", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0220:1:65537")));
@@ -140,14 +142,15 @@ public void validDiscoveryResultWhiteLightWS() {
     }
 
     @Test
-    public void validDiscoveryResultWhiteLightWSWithIncompleteJson() {
+    public void validDiscoveryResultWhiteLightWSWithIncompleteJson() throws InterruptedException {
         // We do not always receive a COLOR = "5706" attribute, even the light supports it - but the gateway does not
         // seem to have this information, if the bulb is unreachable.
         String json = "{\"9001\":\"TRADFRI bulb E27 WS opal 980lm\",\"9002\":1492955148,\"9020\":1506968670,\"9003\":65537,\"3311\":[{\"9003\":0}],\"9054\":0,\"5750\":2,\"9019\":0,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI bulb E27 WS opal 980lm\",\"2\":\"\",\"3\":\"1.2.217\",\"6\":1}}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65537", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0220:1:65537")));
@@ -158,12 +161,13 @@ public void validDiscoveryResultWhiteLightWSWithIncompleteJson() {
     }
 
     @Test
-    public void validDiscoveryResultColorLightCWS() {
+    public void validDiscoveryResultColorLightCWS() throws InterruptedException {
         String json = "{\"9001\":\"TRADFRI bulb E27 CWS opal 600lm\",\"9002\":1505151864,\"9020\":1505433527,\"9003\":65550,\"9019\":1,\"9054\":0,\"5750\":2,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI bulb E27 CWS opal 600lm\",\"2\":\"\",\"3\":\"1.3.002\",\"6\":1},\"3311\":[{\"5850\":1,\"5708\":0,\"5851\":254,\"5707\":0,\"5709\":33137,\"5710\":27211,\"5711\":0,\"5706\":\"efd275\",\"9003\":0}]}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65550", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0210:1:65550")));
@@ -174,12 +178,13 @@ public void validDiscoveryResultColorLightCWS() {
     }
 
     @Test
-    public void validDiscoveryResultAlternativeColorLightCWS() {
+    public void validDiscoveryResultAlternativeColorLightCWS() throws InterruptedException {
         String json = "{\"3311\":[{\"5850\":1,\"5709\":32886,\"5851\":216,\"5707\":5309,\"5708\":52400,\"5710\":27217,\"5706\":\"efd275\",\"9003\":0}],\"9001\":\"Mushroom lamp\",\"9002\":1571036916,\"9020\":1571588312,\"9003\":65539,\"9054\":0,\"9019\":1,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI bulb E27 C\\/WS opal 600\",\"2\":\"\",\"3\":\"1.3.009\",\"6\":1},\"5750\":2}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65539", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0210:1:65539")));
@@ -190,12 +195,13 @@ public void validDiscoveryResultAlternativeColorLightCWS() {
     }
 
     @Test
-    public void validDiscoveryResultRemoteControl() {
+    public void validDiscoveryResultRemoteControl() throws InterruptedException {
         String json = "{\"9001\":\"TRADFRI remote control\",\"9002\":1492843083,\"9020\":1506977986,\"9003\":65536,\"9054\":0,\"5750\":0,\"9019\":1,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI remote control\",\"2\":\"\",\"3\":\"1.2.214\",\"6\":3,\"9\":47},\"15009\":[{\"9003\":0}]}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65536", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0830:1:65536")));
@@ -206,12 +212,13 @@ public void validDiscoveryResultRemoteControl() {
     }
 
     @Test
-    public void validDiscoveryResultWirelessDimmer() {
+    public void validDiscoveryResultWirelessDimmer() throws InterruptedException {
         String json = "{\"9001\":\"TRADFRI wireless dimmer\",\"9002\":1492843083,\"9020\":1506977986,\"9003\":65536,\"9054\":0,\"5750\":0,\"9019\":1,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI wireless dimmer\",\"2\":\"\",\"3\":\"1.2.214\",\"6\":3,\"9\":47},\"15009\":[{\"9003\":0}]}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65536", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0820:1:65536")));
@@ -222,12 +229,13 @@ public void validDiscoveryResultWirelessDimmer() {
     }
 
     @Test
-    public void validDiscoveryResultMotionSensor() {
+    public void validDiscoveryResultMotionSensor() throws InterruptedException {
         String json = "{\"9001\":\"TRADFRI motion sensor\",\"9002\":1492955083,\"9020\":1507120083,\"9003\":65538,\"9054\":0,\"5750\":4,\"9019\":1,\"3\":{\"0\":\"IKEA of Sweden\",\"1\":\"TRADFRI motion sensor\",\"2\":\"\",\"3\":\"1.2.214\",\"6\":3,\"9\":60},\"3300\":[{\"9003\":0}]}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65538", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0107:1:65538")));
@@ -238,12 +246,13 @@ public void validDiscoveryResultMotionSensor() {
     }
 
     @Test
-    public void validDiscoveryResultAirPurifier() {
+    public void validDiscoveryResultAirPurifier() throws InterruptedException {
         String json = "{\"3\":{\"0\":\"IKEAofSweden\",\"1\":\"STARKVINDAirpurifier\",\"2\":\"\",\"3\":\"1.0.033\",\"6\":1,\"7\":4364},\"5750\":10,\"9001\":\"Luftreiniger\",\"9002\":1633096623,\"9003\":65548,\"9019\":1,\"9020\":1633096633,\"9054\":0,\"15025\":[{\"5900\":1,\"5902\":2,\"5903\":0,\"5904\":259200,\"5905\":0,\"5906\":0,\"5907\":5,\"5908\":10,\"5909\":2,\"5910\":259198,\"9003\":0}]}";
         JsonObject data = JsonParser.parseString(json).getAsJsonObject();
 
         discovery.onUpdate("65548", data);
 
+        Thread.sleep(500L);
         assertNotNull(discoveryResult);
         assertThat(discoveryResult.getFlag(), is(DiscoveryResultFlag.NEW));
         assertThat(discoveryResult.getThingUID(), is(new ThingUID("tradfri:0007:1:65548")));