Showing
1 changed file
with
13 additions
and
23 deletions
@@ -50,6 +50,7 @@ import java.util.Set; | @@ -50,6 +50,7 @@ import java.util.Set; | ||
50 | import static org.hamcrest.Matchers.containsString; | 50 | import static org.hamcrest.Matchers.containsString; |
51 | import static org.junit.Assert.assertEquals; | 51 | import static org.junit.Assert.assertEquals; |
52 | import static org.junit.Assert.assertNotNull; | 52 | import static org.junit.Assert.assertNotNull; |
53 | +import static org.junit.Assert.assertNull; | ||
53 | import static org.junit.Assert.assertTrue; | 54 | import static org.junit.Assert.assertTrue; |
54 | import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | 55 | import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; |
55 | import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; | 56 | import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; |
@@ -329,9 +330,8 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | @@ -329,9 +330,8 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | ||
329 | Thread.sleep(1000); | 330 | Thread.sleep(1000); |
330 | 331 | ||
331 | EntityView savedView = getNewSavedEntityView("Test entity view"); | 332 | EntityView savedView = getNewSavedEntityView("Test entity view"); |
332 | - String urlOfTelemetryValues = "/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() + | ||
333 | - "/values/attributes?keys=" + String.join(",", actualAttributesSet); | ||
334 | - List<Map<String, Object>> values = doGetAsync(urlOfTelemetryValues, List.class); | 333 | + List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() + |
334 | + "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class); | ||
335 | 335 | ||
336 | assertEquals("value1", getValue(values, "caValue1")); | 336 | assertEquals("value1", getValue(values, "caValue1")); |
337 | assertEquals(true, getValue(values, "caValue2")); | 337 | assertEquals(true, getValue(values, "caValue2")); |
@@ -348,7 +348,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | @@ -348,7 +348,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | ||
348 | assertTrue(actualAttributesSet.containsAll(expectedActualAttributesSet)); | 348 | assertTrue(actualAttributesSet.containsAll(expectedActualAttributesSet)); |
349 | Thread.sleep(1000); | 349 | Thread.sleep(1000); |
350 | 350 | ||
351 | - List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/DEVICE/" + testDevice.getId().getId().toString() + | 351 | + List<Map<String, Object>> valueTelemetryOfDevices = doGetAsync("/api/plugins/telemetry/DEVICE/" + testDevice.getId().getId().toString() + |
352 | "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class); | 352 | "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class); |
353 | 353 | ||
354 | EntityView view = new EntityView(); | 354 | EntityView view = new EntityView(); |
@@ -356,19 +356,13 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | @@ -356,19 +356,13 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | ||
356 | view.setTenantId(savedTenant.getId()); | 356 | view.setTenantId(savedTenant.getId()); |
357 | view.setName("Test entity view"); | 357 | view.setName("Test entity view"); |
358 | view.setKeys(telemetry); | 358 | view.setKeys(telemetry); |
359 | - view.setStartTimeMs((long) getValue(values, "lastUpdateTs") * 10); | ||
360 | - view.setEndTimeMs((long) getValue(values, "lastUpdateTs") / 10); | 359 | + view.setStartTimeMs((long) getValue(valueTelemetryOfDevices, "lastActivityTime") * 10); |
360 | + view.setEndTimeMs((long) getValue(valueTelemetryOfDevices, "lastActivityTime") / 10); | ||
361 | EntityView savedView = doPost("/api/entityView", view, EntityView.class); | 361 | EntityView savedView = doPost("/api/entityView", view, EntityView.class); |
362 | 362 | ||
363 | - String urlOfTelemetryValues = "/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() + | ||
364 | - "/values/attributes?keys=" + String.join(",", actualAttributesSet); | ||
365 | - values = doGetAsync(urlOfTelemetryValues, List.class); | ||
366 | - | ||
367 | - | ||
368 | - assertEquals("value1", getValue(values, "caValue1")); | ||
369 | - assertEquals(true, getValue(values, "caValue2")); | ||
370 | - assertEquals(42.0, getValue(values, "caValue3")); | ||
371 | - assertEquals(73, getValue(values, "caValue4")); | 363 | + List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() + |
364 | + "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class); | ||
365 | + assertEquals(0, values.size()); | ||
372 | } | 366 | } |
373 | 367 | ||
374 | private Set<String> getAttributesByKeys(String stringKV) throws Exception { | 368 | private Set<String> getAttributesByKeys(String stringKV) throws Exception { |
@@ -396,15 +390,11 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | @@ -396,15 +390,11 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes | ||
396 | return new HashSet<>(doGetAsync("/api/plugins/telemetry/DEVICE/" + viewDeviceId + "/keys/attributes", List.class)); | 390 | return new HashSet<>(doGetAsync("/api/plugins/telemetry/DEVICE/" + viewDeviceId + "/keys/attributes", List.class)); |
397 | } | 391 | } |
398 | 392 | ||
399 | - /*private Object getLastTs(List<Map<String, Object>> values) { | ||
400 | - return values.stream() | ||
401 | - .filter(value -> value.get("key"); | ||
402 | - } | ||
403 | -*/ | ||
404 | private Object getValue(List<Map<String, Object>> values, String stringValue) { | 393 | private Object getValue(List<Map<String, Object>> values, String stringValue) { |
405 | - return values.stream() | ||
406 | - .filter(value -> value.get("key").equals(stringValue)) | ||
407 | - .findFirst().get().get("value"); | 394 | + return values.size() == 0 ? null : |
395 | + values.stream() | ||
396 | + .filter(value -> value.get("key").equals(stringValue)) | ||
397 | + .findFirst().get().get("value"); | ||
408 | } | 398 | } |
409 | 399 | ||
410 | private EntityView getNewSavedEntityView(String name) throws Exception { | 400 | private EntityView getNewSavedEntityView(String name) throws Exception { |