lwm2m: bootstrap new: update tests-4

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

@@ -124,8 +124,8 @@ import static org.thingsboard.server.transport.lwm2m.ota.AbstractOtaLwM2MIntegra
 
 @Slf4j
 @DaoSqlTest
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+//@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 @TestPropertySource(properties = {
         "transport.lwm2m.enabled=true"
 })
@@ -324,13 +324,13 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
 
         if (executor != null && !executor.isShutdown()) {
             executor.shutdownNow();
-            if (!executor.awaitTermination(2, TimeUnit.SECONDS)) {
+//            if (!executor.awaitTermination(2, TimeUnit.SECONDS)) {
-                log.warn("⚠️ Executor did not terminate cleanly, forcing GC");
+//                log.warn("⚠️ Executor did not terminate cleanly, forcing GC");
-            }
+//            }
         }
-        Thread.sleep(300);
+//        Thread.sleep(300);
-        System.gc();
+//        System.gc();
-        log.info("✅ Test teardown completed: {}", this.getClass().getSimpleName());
+//        log.info("✅ Test teardown completed: {}", this.getClass().getSimpleName());
     }
 
     private void init() throws Exception {

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

@@ -154,28 +154,30 @@ public class LwM2MTestClient {
 
         if (securityBs != null && security != null) {
             // SECURITIES
-            forceNullSecurityId(securityBs);
+            securityBs.setId(0);
-            forceNullSecurityId(security);
+            security.setId(1);
             LwM2mInstanceEnabler[] instances = new LwM2mInstanceEnabler[]{securityBs, security};
             initializer.setInstancesForObject(SECURITY, instances);
             log.warn("Security BS section: securityBsId [{}] Security Lwm2m section: securityLwm2mId [{}] ",  securityBs.getId(),  security.getId());
             // SERVER
             Server lwm2mServer = new Server(shortServerId, TimeUnit.MINUTES.toSeconds(60));
+            lwm2mServer.setId(0);
             instances = new LwM2mInstanceEnabler[]{lwm2mServer};
             initializer.setInstancesForObject(SERVER, instances);
         } else if (securityBs != null) {
             // SECURITY
-;           forceNullSecurityId(securityBs);
+;           securityBs.setId(0);;
             initializer.setInstancesForObject(SECURITY, securityBs);
             // SERVER
             initializer.setClassForObject(SERVER, Server.class);
             log.warn("Security BS section: securityBsId [{}] ",  securityBs.getId());
         } else {
             // SECURITY
-            forceNullSecurityId(security);
+            security.setId(0);
             initializer.setInstancesForObject(SECURITY, security);
             // SERVER
             Server lwm2mServer = new Server(shortServerId, TimeUnit.MINUTES.toSeconds(60));
+            lwm2mServer.setId(0);
             initializer.setInstancesForObject(SERVER, lwm2mServer);
             log.warn("Security Lwm2m section: securityLwm2mId [{}] Server Lwm2m section: securityLwm2mId [{}] ",  security.getId(),  lwm2mServer.getId());
         }