[sensibo] Fix initialization for half-included devices (#20169)

* Fix #18018

Signed-off-by: Arne Seime <arne.seime@gmail.com>

Author: seime

bundles/org.openhab.binding.sensibo/pom.xml

@@ -21,6 +21,18 @@
       <version>2.27.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.13</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>4.2.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

bundles/org.openhab.binding.sensibo/src/main/java/org/openhab/binding/sensibo/internal/dto/poddetails/PodDetailsDTO.java

@@ -41,7 +41,7 @@ public class PodDetailsDTO {
     private ModeCapabilityWrapperDTO remoteCapabilities;
 
     public Map<String, ModeCapabilityDTO> getRemoteCapabilities() {
-        return remoteCapabilities.modes;
+        return remoteCapabilities != null ? remoteCapabilities.modes : null;
     }
 
     public boolean isAlive() {

bundles/org.openhab.binding.sensibo/src/test/java/org/openhab/binding/sensibo/internal/handler/SensiboAccountHandlerTest.java

@@ -13,13 +13,12 @@
 package org.openhab.binding.sensibo.internal.handler;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.awaitility.Awaitility.await;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.Map;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.junit.jupiter.api.AfterEach;
@@ -28,8 +27,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.openhab.binding.sensibo.internal.config.SensiboAccountConfiguration;
-import org.openhab.binding.sensibo.internal.model.SensiboSky;
 import org.openhab.core.config.core.Configuration;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ThingUID;
@@ -48,7 +45,7 @@ public class SensiboAccountHandlerTest {
     private HttpClient httpClient;
 
     private @Mock Configuration configuration;
-    private @Mock Bridge sensiboAccountMock;
+    private @Mock Bridge bridgeMock;
 
     @BeforeEach
     public void setUp() throws Exception {
@@ -70,21 +67,27 @@ public void shutdown() throws Exception {
     }
 
     @Test
-    public void testInitialize1() throws InterruptedException, IOException {
-        testInitialize("/get_pods_response.json", "/get_pod_details_response.json");
+    public void testInitialize1() throws IOException {
+        testInitialize("/get_pods_response.json", 1);
     }
 
     @Test
-    public void testInitializeMarco() throws InterruptedException, IOException {
-        testInitialize("/get_pods_response.json", "/get_pod_details_response_marco.json");
+    public void testInitializeMarco() throws IOException {
+        testInitialize("/get_pods_response.json", 1);
     }
 
-    private void testInitialize(String podsResponse, String podDetailsResponse)
-            throws InterruptedException, IOException {
-        // Setup account
-        final SensiboAccountConfiguration accountConfig = new SensiboAccountConfiguration();
-        accountConfig.apiKey = "APIKEY";
-        when(configuration.as(eq(SensiboAccountConfiguration.class))).thenReturn(accountConfig);
+    /**
+     * See github issue #18018 - test that initialization can handle a response where some pods are not fully setup and
+     * thus missing some fields
+     * 
+     * @throws IOException if the mocked response file cannot be read
+     */
+    @Test
+    public void testInitialize_Issue18018_Partial_Setup() throws IOException {
+        testInitialize("/get_pods_response_partial_setup.json", 4);
+    }
+
+    private void testInitialize(String podsResponse, int numExpectedPods) throws IOException {
 
         // Setup initial response
         final String getPodsResponse = new String(getClass().getResourceAsStream(podsResponse).readAllBytes(),
@@ -93,26 +96,15 @@ private void testInitialize(String podsResponse, String podDetailsResponse)
                 .withHeader("Accept-Encoding", equalTo("gzip"))
                 .willReturn(aResponse().withStatus(200).withBody(getPodsResponse)));
 
-        when(sensiboAccountMock.getConfiguration()).thenReturn(configuration);
-        when(sensiboAccountMock.getUID()).thenReturn(new ThingUID("sensibo:account:thinguid"));
+        // Setup account
+        when(configuration.getProperties()).thenReturn(Map.of("apiKey", "APIKEY"));
+        when(bridgeMock.getConfiguration()).thenReturn(configuration);
+        when(bridgeMock.getUID()).thenReturn(new ThingUID("sensibo:account:thinguid"));
+
+        final SensiboAccountHandler handler = new SensiboAccountHandler(bridgeMock, httpClient);
+        handler.initialize();
 
-        final SensiboAccountHandler subject = new SensiboAccountHandler(sensiboAccountMock, httpClient);
         // Async, poll for status
-        subject.initialize();
-
-        // Verify num things found == 1
-        int numPods = 0;
-        for (int i = 0; i < 20; i++) {
-            final List<SensiboSky> things = subject.getModel().getPods();
-            numPods = things.size();
-            if (numPods == 1) {
-                break;
-            } else {
-                // Wait some more
-                Thread.sleep(200);
-            }
-        }
-
-        assertEquals(1, numPods);
+        await().until(() -> handler.getModel().getPods().size() == numExpectedPods);
     }
 }