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

Added check for keys

Browse Source
This commit is contained in:
Volodymyr Babak 2018-09-19 10:44:29 +03:00
parent b40b8c8e9f
commit 8d7a27c49c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
private Tenant savedTenant; private Tenant savedTenant;
private User tenantAdmin; private User tenantAdmin;
private Device testDevice; private Device testDevice;
private TelemetryEntityView keys;
@Before @Before
public void beforeTest() throws Exception { public void beforeTest() throws Exception {
@ -73,6 +74,13 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
device.setName("Test device"); device.setName("Test device");
device.setType("default"); device.setType("default");
testDevice = doPost("/api/device", device, Device.class); testDevice = doPost("/api/device", device, Device.class);
keys = new TelemetryEntityView(
Arrays.asList("109L", "209L"),
new AttributesEntityView(
Arrays.asList("caKey1", "caKey2"),
Arrays.asList("saKey1", "saKey2", "saKey3"),
Arrays.asList("shKey1", "shKey2", "shKey3", "shKey4")));
} }
@After @After
@ -108,6 +116,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
EntityView foundEntityView = doGet("/api/entityView/" + savedView.getId().getId().toString(), EntityView.class); EntityView foundEntityView = doGet("/api/entityView/" + savedView.getId().getId().toString(), EntityView.class);
Assert.assertEquals(foundEntityView.getName(), savedView.getName()); Assert.assertEquals(foundEntityView.getName(), savedView.getName());
Assert.assertEquals(foundEntityView.getKeys(), keys);
} }
@Test @Test
@ -308,12 +317,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
view.setTenantId(savedTenant.getId()); view.setTenantId(savedTenant.getId());
view.setName(name); view.setName(name);
view.setKeys(new TelemetryEntityView( view.setKeys(keys);
Arrays.asList("109L", "209L"),
new AttributesEntityView(
Arrays.asList("caKey1", "caKey2"),
Arrays.asList("saKey1", "saKey2", "saKey3"),
Arrays.asList("shKey1", "shKey2", "shKey3", "shKey4"))));
return doPost("/api/entityView", view, EntityView.class); return doPost("/api/entityView", view, EntityView.class);
} }