fix_bug: lwm2m basicTestConnection

application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java

@@ -172,7 +172,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractControllerTes
 
     protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesBsSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_BOOTSTRAP_STARTED, ON_BOOTSTRAP_SUCCESS));
     protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesRegistrationLwm2mSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
-    protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesRegistrationBsSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_BOOTSTRAP_STARTED, ON_BOOTSTRAP_SUCCESS, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
+    protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesRegistrationBsSuccess = new HashSet<>(Arrays.asList(ON_BOOTSTRAP_STARTED, ON_BOOTSTRAP_SUCCESS, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
     protected DeviceProfile deviceProfile;
     protected ScheduledExecutorService executor;
     protected LwM2MTestClient lwM2MTestClient;

application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java

@@ -108,7 +108,6 @@ public class LwM2MTestClient {
     private LwM2mBinaryAppDataContainer lwM2MBinaryAppDataContainer;
     private LwM2MLocationParams locationParams;
     private LwM2mTemperatureSensor lwM2MTemperatureSensor;
-    private LwM2MClientState clientState;
     private Set<LwM2MClientState> clientStates;
     private DefaultLwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
     private LwM2mClientContext clientContext;
@@ -178,112 +177,94 @@ public class LwM2MTestClient {
         builder.setDecoder(new DefaultLwM2mDecoder(false));
 
         builder.setEncoder(new DefaultLwM2mEncoder(new LwM2mValueConverterImpl(), false));
-        clientState = ON_INIT;
         clientStates = new HashSet<>();
-        clientStates.add(clientState);
+        clientStates.add(ON_INIT);
         leshanClient = builder.build();
 
         LwM2mClientObserver observer = new LwM2mClientObserver() {
             @Override
             public void onBootstrapStarted(ServerIdentity bsserver, BootstrapRequest request) {
-                clientState = ON_BOOTSTRAP_STARTED;
+                clientStates.add(ON_BOOTSTRAP_STARTED);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onBootstrapSuccess(ServerIdentity bsserver, BootstrapRequest request) {
-                clientState = ON_BOOTSTRAP_SUCCESS;
+                clientStates.add(ON_BOOTSTRAP_SUCCESS);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onBootstrapFailure(ServerIdentity bsserver, BootstrapRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
-                clientState = ON_BOOTSTRAP_FAILURE;
+                clientStates.add(ON_BOOTSTRAP_FAILURE);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onBootstrapTimeout(ServerIdentity bsserver, BootstrapRequest request) {
-                clientState = ON_BOOTSTRAP_TIMEOUT;
+                clientStates.add(ON_BOOTSTRAP_TIMEOUT);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onRegistrationStarted(ServerIdentity server, RegisterRequest request) {
-                clientState = ON_REGISTRATION_STARTED;
+                clientStates.add(ON_REGISTRATION_STARTED);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onRegistrationSuccess(ServerIdentity server, RegisterRequest request, String registrationID) {
-                clientState = ON_REGISTRATION_SUCCESS;
+                clientStates.add(ON_REGISTRATION_SUCCESS);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onRegistrationFailure(ServerIdentity server, RegisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
-                clientState = ON_REGISTRATION_FAILURE;
+                clientStates.add(ON_REGISTRATION_FAILURE);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onRegistrationTimeout(ServerIdentity server, RegisterRequest request) {
-                clientState = ON_REGISTRATION_TIMEOUT;
+                clientStates.add(ON_REGISTRATION_TIMEOUT);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onUpdateStarted(ServerIdentity server, UpdateRequest request) {
-                clientState = ON_UPDATE_STARTED;
+                clientStates.add(ON_UPDATE_STARTED);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onUpdateSuccess(ServerIdentity server, UpdateRequest request) {
-                clientState = ON_UPDATE_SUCCESS;
+                clientStates.add(ON_UPDATE_SUCCESS);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onUpdateFailure(ServerIdentity server, UpdateRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
-                clientState = ON_UPDATE_FAILURE;
+                clientStates.add(ON_UPDATE_FAILURE);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onUpdateTimeout(ServerIdentity server, UpdateRequest request) {
-                clientState = ON_UPDATE_TIMEOUT;
+                clientStates.add(ON_UPDATE_TIMEOUT);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onDeregistrationStarted(ServerIdentity server, DeregisterRequest request) {
-                clientState = ON_DEREGISTRATION_STARTED;
+                clientStates.add(ON_DEREGISTRATION_STARTED);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onDeregistrationSuccess(ServerIdentity server, DeregisterRequest request) {
-                clientState = ON_DEREGISTRATION_SUCCESS;
+                clientStates.add(ON_DEREGISTRATION_SUCCESS);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onDeregistrationFailure(ServerIdentity server, DeregisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
-                clientState = ON_DEREGISTRATION_FAILURE;
+                clientStates.add(ON_DEREGISTRATION_FAILURE);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onDeregistrationTimeout(ServerIdentity server, DeregisterRequest request) {
-                clientState = ON_DEREGISTRATION_TIMEOUT;
+                clientStates.add(ON_DEREGISTRATION_TIMEOUT);
-                clientStates.add(clientState);
             }
 
             @Override
             public void onUnexpectedError(Throwable unexpectedError) {
-                clientState = ON_EXPECTED_ERROR;
+                clientStates.add(ON_EXPECTED_ERROR);
-                clientStates.add(clientState);
             }
         };
         this.leshanClient.addObserver(observer);

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java

@@ -57,6 +57,7 @@ import java.security.PublicKey;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -196,8 +197,11 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         device.getId().getId().toString();
         lwM2MTestClient.start(isStartLw);
         await(awaitAlias)
-                .atMost(20, TimeUnit.SECONDS)
+                .atMost(40, TimeUnit.SECONDS)
-                .until(() -> lwM2MTestClient.getClientStates().contains(finishState));
+                .until(() -> {
+                    log.warn("basicTestConnection -> finishState: [{}] states: {}", finishState, lwM2MTestClient.getClientStates());
+                    return lwM2MTestClient.getClientStates().contains(finishState);
+                });
         Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatuses));
     }
 
@@ -234,12 +238,16 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         String deviceId = device.getId().getId().toString();
         lwM2MTestClient.start(true);
         await(awaitAlias)
-                .atMost(20, TimeUnit.SECONDS)
+                .atMost(40, TimeUnit.SECONDS)
-                .until(() -> ON_REGISTRATION_SUCCESS.equals(lwM2MTestClient.getClientState()));
+                .until(() -> {
-        Assert.assertEquals(expectedStatusesLwm2m, lwM2MTestClient.getClientStates());
+                    log.warn("basicTestConnection -> finishState: [{}] states: {}", ON_REGISTRATION_SUCCESS, lwM2MTestClient.getClientStates());
+                    return lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_SUCCESS);
+                });
+        Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesLwm2m));
 
         String executedPath = "/" + OBJECT_ID_1 + "_" +  lwM2MTestClient.getLeshanClient().getObjectTree().getModel().getObjectModel(OBJECT_ID_1).version
                 + "/0/" + RESOURCE_ID_9;
+        lwM2MTestClient.setClientStates(new HashSet<>());
         String actualResult = sendRPCSecurityExecuteById(executedPath, deviceId, endpoint);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         if (!(rpcActualResult.get("result").asText().equals(ResponseCode.CHANGED.getName()))) {
@@ -250,8 +258,11 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         expectedStatusesBs.add(ON_DEREGISTRATION_STARTED);
         expectedStatusesBs.add(ON_DEREGISTRATION_SUCCESS);
         await(awaitAlias)
-                .atMost(20, TimeUnit.SECONDS)
+                .atMost(40, TimeUnit.SECONDS)
-                .until(() -> lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_SUCCESS));
+                .until(() -> {
+                    log.warn("basicTestConnection -> finishState: [{}] states: {}", ON_REGISTRATION_SUCCESS, lwM2MTestClient.getClientStates());
+                    return lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_SUCCESS);
+                });
         Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesBs));
     }