tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

added test

pull/1102/head
viktorbasanets 8 years ago
parent
49a9867352
commit
d32a36c312
1 changed files with 13 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java

36
application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
View File

@ -50,6 +50,7 @@ import java.util.Set;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
@ -329,9 +330,8 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
Thread.sleep(1000); Thread.sleep(1000);
EntityView savedView = getNewSavedEntityView("Test entity view"); EntityView savedView = getNewSavedEntityView("Test entity view");
String urlOfTelemetryValues = "/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() + List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() +
"/values/attributes?keys=" + String.join(",", actualAttributesSet); "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class);
List<Map<String, Object>> values = doGetAsync(urlOfTelemetryValues, List.class);
assertEquals("value1", getValue(values, "caValue1")); assertEquals("value1", getValue(values, "caValue1"));
assertEquals(true, getValue(values, "caValue2")); assertEquals(true, getValue(values, "caValue2"));
@ -348,7 +348,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
assertTrue(actualAttributesSet.containsAll(expectedActualAttributesSet)); assertTrue(actualAttributesSet.containsAll(expectedActualAttributesSet));
Thread.sleep(1000); Thread.sleep(1000);
List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/DEVICE/" + testDevice.getId().getId().toString() + List<Map<String, Object>> valueTelemetryOfDevices = doGetAsync("/api/plugins/telemetry/DEVICE/" + testDevice.getId().getId().toString() +
"/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class); "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class);
EntityView view = new EntityView(); EntityView view = new EntityView();
@ -356,19 +356,13 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
view.setTenantId(savedTenant.getId()); view.setTenantId(savedTenant.getId());
view.setName("Test entity view"); view.setName("Test entity view");
view.setKeys(telemetry); view.setKeys(telemetry);
view.setStartTimeMs((long) getValue(values, "lastUpdateTs") * 10); view.setStartTimeMs((long) getValue(valueTelemetryOfDevices, "lastActivityTime") * 10);
view.setEndTimeMs((long) getValue(values, "lastUpdateTs") / 10); view.setEndTimeMs((long) getValue(valueTelemetryOfDevices, "lastActivityTime") / 10);
EntityView savedView = doPost("/api/entityView", view, EntityView.class); EntityView savedView = doPost("/api/entityView", view, EntityView.class);
String urlOfTelemetryValues = "/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() + List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() +
"/values/attributes?keys=" + String.join(",", actualAttributesSet); "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class);
values = doGetAsync(urlOfTelemetryValues, List.class); assertEquals(0, values.size());
assertEquals("value1", getValue(values, "caValue1"));
assertEquals(true, getValue(values, "caValue2"));
assertEquals(42.0, getValue(values, "caValue3"));
assertEquals(73, getValue(values, "caValue4"));
} }
private Set<String> getAttributesByKeys(String stringKV) throws Exception { private Set<String> getAttributesByKeys(String stringKV) throws Exception {
@ -396,15 +390,11 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
return new HashSet<>(doGetAsync("/api/plugins/telemetry/DEVICE/" + viewDeviceId + "/keys/attributes", List.class)); return new HashSet<>(doGetAsync("/api/plugins/telemetry/DEVICE/" + viewDeviceId + "/keys/attributes", List.class));
} }
/*private Object getLastTs(List<Map<String, Object>> values) {
return values.stream()
.filter(value -> value.get("key");
}
*/
private Object getValue(List<Map<String, Object>> values, String stringValue) { private Object getValue(List<Map<String, Object>> values, String stringValue) {
return values.stream() return values.size() == 0 ? null :
.filter(value -> value.get("key").equals(stringValue)) values.stream()
.findFirst().get().get("value"); .filter(value -> value.get("key").equals(stringValue))
.findFirst().get().get("value");
} }
private EntityView getNewSavedEntityView(String name) throws Exception { private EntityView getNewSavedEntityView(String name) throws Exception {

Write Preview
Loading…
Cancel
Save