dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lwm2m: refactoring test FW with objectId = 19

Browse Source
This commit is contained in:
nickAS21 2025-04-13 14:51:11 +03:00
parent ed25c79655
commit cf69df895f
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
View File

@ -95,8 +95,7 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
" \"/5_1.2/0/6\": \"pkgname\",\n" + " \"/5_1.2/0/6\": \"pkgname\",\n" +
" \"/5_1.2/0/7\": \"pkgversion\",\n" + " \"/5_1.2/0/7\": \"pkgversion\",\n" +
" \"/5_1.2/0/9\": \"firmwareUpdateDeliveryMethod\",\n" + " \"/5_1.2/0/9\": \"firmwareUpdateDeliveryMethod\",\n" +
" \"/19_1.1/0/0\": \"dataRead\",\n" + " \"/19_1.1/0/0\": \"dataRead\"\n" +
" \"/19_1.1/65534/0\": \"dataFotaAttr\"\n" +
" },\n" + " },\n" +
" \"observe\": [\n" + " \"observe\": [\n" +
" \"/5_1.2/0/3\",\n" + " \"/5_1.2/0/3\",\n" +
@ -104,8 +103,7 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
" \"/5_1.2/0/6\",\n" + " \"/5_1.2/0/6\",\n" +
" \"/5_1.2/0/7\",\n" + " \"/5_1.2/0/7\",\n" +
" \"/5_1.2/0/9\",\n" + " \"/5_1.2/0/9\",\n" +
" \"/19_1.1/0/0\",\n" + " \"/19_1.1/0/0\"\n" +
" \"/19_1.1/65534/0\"\n" +
" ],\n" + " ],\n" +
" \"attribute\": [],\n" + " \"attribute\": [],\n" +
" \"telemetry\": [\n" + " \"telemetry\": [\n" +
@ -114,8 +112,7 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
" \"/5_1.2/0/6\",\n" + " \"/5_1.2/0/6\",\n" +
" \"/5_1.2/0/7\",\n" + " \"/5_1.2/0/7\",\n" +
" \"/5_1.2/0/9\",\n" + " \"/5_1.2/0/9\",\n" +
" \"/19_1.1/0/0\",\n" + " \"/19_1.1/0/0\"\n" +
" \"/19_1.1/65534/0\"\n" +
" ],\n" + " ],\n" +
" \"attributeLwm2m\": {}\n" + " \"attributeLwm2m\": {}\n" +
" }"; " }";
@ -215,13 +212,6 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
log.warn("Fetched telemetry by API for deviceId {}, list size {}, tsKvEntries {}", deviceId, tsKvEntries.size(), tsKvEntries); log.warn("Fetched telemetry by API for deviceId {}, list size {}, tsKvEntries {}", deviceId, tsKvEntries.size(), tsKvEntries);
return tsKvEntries; return tsKvEntries;
} }
protected List<TsKvEntry> getFwSwParamsObject19TelemetryFromAPI(UUID deviceId) throws Exception {
String type_state = "dataFotaAttr";
final List<TsKvEntry> tsKvEntries = toTimeseries(doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + deviceId + "/values/timeseries?orderBy=ASC&keys=" + type_state + "&startTs=0&endTs=" + System.currentTimeMillis(), new TypeReference<>() {
}));
log.warn("Fetched telemetry by API for deviceId {}, list size {}, tsKvEntries {}", deviceId, tsKvEntries.size(), tsKvEntries);
return tsKvEntries;
}
protected boolean predicateForStatuses(List<TsKvEntry> ts) { protected boolean predicateForStatuses(List<TsKvEntry> ts) {
List<OtaPackageUpdateStatus> statuses = ts.stream() List<OtaPackageUpdateStatus> statuses = ts.stream()