Merge pull request #4900 from AndrewVolosytnykhThingsboard/lwm2m-tests-fix

Lwm2m tests fix

application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java

@@ -274,14 +274,18 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
             @Override
             public void onSuccess(@Nullable Void tmp) {
                 log.trace("[{}] Success save telemetry with target firmware for device!", deviceId);
+                updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
             }
 
             @Override
             public void onFailure(Throwable t) {
                 log.error("[{}] Failed to save telemetry with target firmware for device!", deviceId, t);
+                updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
             }
         });
+    }
 
+    private void updateAttributes(Device device, OtaPackageInfo otaPackage, long ts, TenantId tenantId, DeviceId deviceId, OtaPackageType otaPackageType) {
         List<AttributeKvEntry> attributes = new ArrayList<>();
         attributes.add(new BaseAttributeKvEntry(ts, new StringDataEntry(getAttributeKey(otaPackageType, TITLE), otaPackage.getTitle())));
         attributes.add(new BaseAttributeKvEntry(ts, new StringDataEntry(getAttributeKey(otaPackageType, VERSION), otaPackage.getVersion())));

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

@@ -372,6 +372,8 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
                                                     LwM2MClientCredentials credentials,
                                                     NetworkConfig coapConfig,
                                                     String endpoint) throws Exception {
+        LwM2MTestClient client = null;
+        try {
             createDeviceProfile(TRANSPORT_CONFIGURATION);
             Device device = createDevice(credentials);
 
@@ -390,7 +392,7 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
             wsClient.waitForReply();
 
             wsClient.registerWaitForUpdate();
-        LwM2MTestClient client = new LwM2MTestClient(executor, endpoint);
+            client = new LwM2MTestClient(executor, endpoint);
 
             client.init(security, coapConfig);
             String msg = wsClient.waitForUpdate();
@@ -404,6 +406,10 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
             Assert.assertNotNull(eData.get(0).getLatest().get(EntityKeyType.TIME_SERIES));
             var tsValue = eData.get(0).getLatest().get(EntityKeyType.TIME_SERIES).get("batteryLevel");
             Assert.assertEquals(42, Long.parseLong(tsValue.getValue()));
+        } finally {
+            if(client != null) {
                 client.destroy();
             }
+        }
+    }
 }

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

@@ -19,31 +19,24 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.Assert;
 import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.NoSecClientCredentials;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus;
-import org.thingsboard.server.common.data.query.EntityData;
-import org.thingsboard.server.common.data.query.EntityDataPageLink;
-import org.thingsboard.server.common.data.query.EntityDataQuery;
 import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
-import org.thingsboard.server.common.data.query.SingleEntityFilter;
-import org.thingsboard.server.service.telemetry.cmd.TelemetryPluginCmdsWrapper;
-import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataCmd;
-import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataUpdate;
-import org.thingsboard.server.service.telemetry.cmd.v2.LatestValueCmd;
 import org.thingsboard.server.transport.lwm2m.client.LwM2MTestClient;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.rest.client.utils.RestJsonConverter.toTimeseries;
 import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.DOWNLOADED;
 import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.DOWNLOADING;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.FAILED;
 import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.INITIATED;
 import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.QUEUED;
 import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATED;
@@ -138,116 +131,102 @@ public class NoSecLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
 
     @Test
     public void testFirmwareUpdateWithClientWithoutFirmwareInfo() throws Exception {
+        LwM2MTestClient client = null;
+        try {
             createDeviceProfile(TRANSPORT_CONFIGURATION);
             NoSecClientCredentials clientCredentials = new NoSecClientCredentials();
             clientCredentials.setEndpoint(ENDPOINT);
             Device device = createDevice(clientCredentials);
 
-        OtaPackageInfo firmware = createFirmware();
+            client = new LwM2MTestClient(executor, ENDPOINT);
-
-        LwM2MTestClient client = new LwM2MTestClient(executor, ENDPOINT);
             client.init(SECURITY, COAP_CONFIG);
 
             Thread.sleep(1000);
 
-        device.setFirmwareId(firmware.getId());
+            device.setFirmwareId(createFirmware().getId());
-
             device = doPost("/api/device", device, Device.class);
 
-        Thread.sleep(1000);
+            Thread.sleep(5000);
 
-        SingleEntityFilter sef = new SingleEntityFilter();
+            List<TsKvEntry> ts = toTimeseries(doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + device.getId().getId() + "/values/timeseries?keys=fw_state", new TypeReference<>() {
-        sef.setSingleEntity(device.getId());
+            }));
-        LatestValueCmd latestCmd = new LatestValueCmd();
-        latestCmd.setKeys(Collections.singletonList(new EntityKey(EntityKeyType.TIME_SERIES, "fw_state")));
-        EntityDataQuery edq = new EntityDataQuery(sef, new EntityDataPageLink(1, 0, null, null),
-                Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
 
-        EntityDataCmd cmd = new EntityDataCmd(1, edq, null, latestCmd, null);
+            List<OtaPackageUpdateStatus> statuses = ts.stream().map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
-        TelemetryPluginCmdsWrapper wrapper = new TelemetryPluginCmdsWrapper();
-        wrapper.setEntityDataCmds(Collections.singletonList(cmd));
 
-        wsClient.send(mapper.writeValueAsString(wrapper));
+            List<OtaPackageUpdateStatus> expectedStatuses = Collections.singletonList(FAILED);
-        wsClient.waitForReply();
 
-        wsClient.registerWaitForUpdate();
+            Assert.assertEquals(expectedStatuses, statuses);
-
+        } finally {
-        String msg = wsClient.waitForUpdate();
+            if(client != null) {
-
-        EntityDataUpdate update = mapper.readValue(msg, EntityDataUpdate.class);
-        Assert.assertEquals(1, update.getCmdId());
-        List<EntityData> eData = update.getUpdate();
-        Assert.assertNotNull(eData);
-        Assert.assertEquals(1, eData.size());
-        Assert.assertEquals(device.getId(), eData.get(0).getEntityId());
-        Assert.assertNotNull(eData.get(0).getLatest().get(EntityKeyType.TIME_SERIES));
-        var tsValue = eData.get(0).getLatest().get(EntityKeyType.TIME_SERIES).get("fw_state");
-        Assert.assertEquals("FAILED", tsValue.getValue());
                 client.destroy();
             }
+        }
+    }
 
     @Test
     public void testFirmwareUpdateByObject5() throws Exception {
+        LwM2MTestClient client = null;
+        try {
             createDeviceProfile(OTA_TRANSPORT_CONFIGURATION);
             NoSecClientCredentials clientCredentials = new NoSecClientCredentials();
             clientCredentials.setEndpoint("OTA_" + ENDPOINT);
             Device device = createDevice(clientCredentials);
 
-        OtaPackageInfo firmware = createFirmware();
+            device.setFirmwareId(createFirmware().getId());
-
+            device = doPost("/api/device", device, Device.class);
-        LwM2MTestClient client = new LwM2MTestClient(executor, "OTA_" + ENDPOINT);
-        client.init(SECURITY, COAP_CONFIG);
-
             Thread.sleep(1000);
 
-        device.setFirmwareId(firmware.getId());
+            client = new LwM2MTestClient(executor, "OTA_" + ENDPOINT);
+            client.init(SECURITY, COAP_CONFIG);
 
-        device = doPost("/api/device", device, Device.class);
+            Thread.sleep(3000);
-
-        Thread.sleep(4000);
 
             List<TsKvEntry> ts = toTimeseries(doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + device.getId().getId() + "/values/timeseries?orderBy=ASC&keys=fw_state&startTs=0&endTs=" + System.currentTimeMillis(), new TypeReference<>() {
             }));
 
-        List<OtaPackageUpdateStatus> statuses = ts.stream().map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
+            List<OtaPackageUpdateStatus> statuses = ts.stream().sorted(Comparator.comparingLong(TsKvEntry::getTs)).map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
 
             List<OtaPackageUpdateStatus> expectedStatuses = Arrays.asList(QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, UPDATING, UPDATED);
 
             Assert.assertEquals(expectedStatuses, statuses);
-
+        } finally {
+            if (client != null) {
                 client.destroy();
             }
+        }
+    }
 
     @Test
     public void testSoftwareUpdateByObject9() throws Exception {
+        LwM2MTestClient client = null;
+        try {
             createDeviceProfile(OTA_TRANSPORT_CONFIGURATION);
             NoSecClientCredentials clientCredentials = new NoSecClientCredentials();
             clientCredentials.setEndpoint("OTA_" + ENDPOINT);
             Device device = createDevice(clientCredentials);
 
-        OtaPackageInfo software = createSoftware();
+            device.setSoftwareId(createSoftware().getId());
-
+            device = doPost("/api/device", device, Device.class);
-        LwM2MTestClient client = new LwM2MTestClient(executor, "OTA_" + ENDPOINT);
-        client.init(SECURITY, COAP_CONFIG);
 
             Thread.sleep(1000);
 
-        device.setSoftwareId(software.getId());
+            client = new LwM2MTestClient(executor, "OTA_" + ENDPOINT);
+            client.init(SECURITY, COAP_CONFIG);
 
-        device = doPost("/api/device", device, Device.class);
+            Thread.sleep(3000);
-
-        Thread.sleep(4000);
 
             List<TsKvEntry> ts = toTimeseries(doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + device.getId().getId() + "/values/timeseries?orderBy=ASC&keys=sw_state&startTs=0&endTs=" + System.currentTimeMillis(), new TypeReference<>() {
             }));
 
-        List<OtaPackageUpdateStatus> statuses = ts.stream().map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
+            List<OtaPackageUpdateStatus> statuses = ts.stream().sorted(Comparator.comparingLong(TsKvEntry::getTs)).map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
 
             List<OtaPackageUpdateStatus> expectedStatuses = Arrays.asList(QUEUED, INITIATED, DOWNLOADING, DOWNLOADING, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATED);
 
             Assert.assertEquals(expectedStatuses, statuses);
-
+        } finally {
+            if (client != null) {
                 client.destroy();
             }
-
+        }
+    }
 }

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

@@ -128,10 +128,14 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
 
     private void startDownloading() {
         scheduler.schedule(() -> {
+            try {
                 state.set(1);
                 fireResourcesChange(3);
+                Thread.sleep(100);
                 state.set(2);
                 fireResourcesChange(3);
+            } catch (Exception e) {
+            }
         }, 100, TimeUnit.MILLISECONDS);
     }
 
@@ -144,7 +148,6 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
                 updateResult.set(1);
                 fireResourcesChange(5);
             } catch (Exception e) {
-
             }
         }, 100, TimeUnit.MILLISECONDS);
     }