简柏林 / thingskit · Commits

Commit 481d2f4770d376ae9363fe3c560d02e12549501a

Authored by viktorbasanets
1 parent 48ff2b27

commit

Inline Side-by-side
Showing 4 changed files with 21 additions and 25 deletions
@@ -23,6 +23,8 @@ import org.thingsboard.server.common.data.Device; @@ -23,6 +23,8 @@ import org.thingsboard.server.common.data.Device;
23 import org.thingsboard.server.common.data.EntityView; 23 import org.thingsboard.server.common.data.EntityView;
24 import org.thingsboard.server.common.data.Tenant; 24 import org.thingsboard.server.common.data.Tenant;
25 import org.thingsboard.server.common.data.User; 25 import org.thingsboard.server.common.data.User;
  26 +import org.thingsboard.server.common.data.objects.AttributesEntityView;
  27 +import org.thingsboard.server.common.data.objects.TelemetryEntityView;
26 import org.thingsboard.server.common.data.security.Authority; 28 import org.thingsboard.server.common.data.security.Authority;
27 29
28 import java.util.Arrays; 30 import java.util.Arrays;
@@ -35,16 +37,12 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes @@ -35,16 +37,12 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
35 private Tenant savedTenant; 37 private Tenant savedTenant;
36 private User tenantAdmin; 38 private User tenantAdmin;
37 private Device testDevice; 39 private Device testDevice;
  40 + private TelemetryEntityView obj;
38 41
39 @Before 42 @Before
40 public void beforeTest() throws Exception { 43 public void beforeTest() throws Exception {
41 loginSysAdmin(); 44 loginSysAdmin();
42 45
43 - Device device = new Device();  
44 - device.setName("Test device");  
45 - device.setType("default");  
46 - testDevice = doPost("/api/device", device, Device.class);  
47 -  
48 Tenant tenant = new Tenant(); 46 Tenant tenant = new Tenant();
49 tenant.setTitle("My tenant"); 47 tenant.setTitle("My tenant");
50 savedTenant = doPost("/api/tenant", tenant, Tenant.class); 48 savedTenant = doPost("/api/tenant", tenant, Tenant.class);
@@ -59,6 +57,18 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes @@ -59,6 +57,18 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
59 tenantAdmin.setLastName("Downs"); 57 tenantAdmin.setLastName("Downs");
60 58
61 tenantAdmin = createUserAndLogin(tenantAdmin, "testPassword1"); 59 tenantAdmin = createUserAndLogin(tenantAdmin, "testPassword1");
  60 +
  61 + Device device = new Device();
  62 + device.setName("Test device");
  63 + device.setType("default");
  64 + testDevice = doPost("/api/device", device, Device.class);
  65 +
  66 + obj = new TelemetryEntityView(
  67 + Arrays.asList("109L", "209L"),
  68 + new AttributesEntityView(
  69 + Arrays.asList("caKey1", "caKey2", "caKey3"),
  70 + Arrays.asList("saKey1", "saKey2", "saKey3", "saKey4"),
  71 + Arrays.asList("shKey1", "shKey2", "shKey3", "shKey4", "shKey5")));
62 } 72 }
63 73
64 @After 74 @After
@@ -74,7 +84,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes @@ -74,7 +84,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
74 EntityView view = new EntityView(); 84 EntityView view = new EntityView();
75 view.setName("Test entity view"); 85 view.setName("Test entity view");
76 view.setEntityId(testDevice.getId()); 86 view.setEntityId(testDevice.getId());
77 - view.setKeys(Arrays.asList("key1", "key2", "key3")); 87 + view.setKeys(new TelemetryEntityView(obj));
78 EntityView savedView = doPost("/api/entity-view", view, EntityView.class); 88 EntityView savedView = doPost("/api/entity-view", view, EntityView.class);
79 EntityView foundView = doGet("/api/entity-view/" + savedView.getId().getId().toString(), EntityView.class); 89 EntityView foundView = doGet("/api/entity-view/" + savedView.getId().getId().toString(), EntityView.class);
80 Assert.assertNotNull(foundView); 90 Assert.assertNotNull(foundView);
@@ -87,7 +97,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes @@ -87,7 +97,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
87 view.setEntityId(testDevice.getId()); 97 view.setEntityId(testDevice.getId());
88 view.setName("Test entity view"); 98 view.setName("Test entity view");
89 view.setTenantId(savedTenant.getId()); 99 view.setTenantId(savedTenant.getId());
90 - view.setKeys(Arrays.asList("key1", "key2", "key3")); 100 + view.setKeys(new TelemetryEntityView(obj));
91 EntityView savedView = doPost("/api/entity-view", view, EntityView.class); 101 EntityView savedView = doPost("/api/entity-view", view, EntityView.class);
92 102
93 Assert.assertNotNull(savedView); 103 Assert.assertNotNull(savedView);
@@ -112,7 +122,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes @@ -112,7 +122,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
112 EntityView view = new EntityView(); 122 EntityView view = new EntityView();
113 view.setName("Test entity view"); 123 view.setName("Test entity view");
114 view.setEntityId(testDevice.getId()); 124 view.setEntityId(testDevice.getId());
115 - view.setKeys(Arrays.asList("key1", "key2", "key3")); 125 + view.setKeys(new TelemetryEntityView((TelemetryEntityView) obj));
116 EntityView savedView = doPost("/api/entity-view", view, EntityView.class); 126 EntityView savedView = doPost("/api/entity-view", view, EntityView.class);
117 127
118 doDelete("/api/entity-view/" + savedView.getId().getId().toString()) 128 doDelete("/api/entity-view/" + savedView.getId().getId().toString())
@@ -24,7 +24,7 @@ import java.util.Arrays; @@ -24,7 +24,7 @@ import java.util.Arrays;
24 24
25 @RunWith(ClasspathSuite.class) 25 @RunWith(ClasspathSuite.class)
26 @ClasspathSuite.ClassnameFilters({ 26 @ClasspathSuite.ClassnameFilters({
27 - "org.thingsboard.server.controller.sql.*SqlTest", 27 + "org.thingsboard.server.controller.sql.EntityViewControllerSqlTest",
28 }) 28 })
29 public class ControllerSqlTestSuite { 29 public class ControllerSqlTestSuite {
30 30
@@ -20,6 +20,5 @@ import org.thingsboard.server.controller.BaseEntityViewControllerTest; @@ -20,6 +20,5 @@ import org.thingsboard.server.controller.BaseEntityViewControllerTest;
20 /** 20 /**
21 * Created by Victor Basanets on 8/27/2017. 21 * Created by Victor Basanets on 8/27/2017.
22 */ 22 */
23 -public class EntityViewControllerNoSqlTest  
24 - extends BaseEntityViewControllerTest { 23 +public class EntityViewControllerNoSqlTest extends BaseEntityViewControllerTest {
25 } 24 }
@@ -27,18 +27,5 @@ import java.util.Arrays; @@ -27,18 +27,5 @@ import java.util.Arrays;
27 * Created by Victor Basanets on 8/27/2017. 27 * Created by Victor Basanets on 8/27/2017.
28 */ 28 */
29 @DaoSqlTest 29 @DaoSqlTest
30 -public class EntityViewControllerSqlTest  
31 - extends BaseEntityViewControllerTest {  
32 -  
33 - @Test  
34 - public void testSaveEntityViewWithIdOfDevice() throws Exception {  
35 - super.testSaveEntityViewWithIdOfDevice();  
36 - }  
37 -  
38 - @Test  
39 - public void testFindEntityViewById() throws Exception {  
40 - super.testFindEntityViewById();  
41 - }  
42 -  
43 - 30 +public class EntityViewControllerSqlTest extends BaseEntityViewControllerTest {
44 } 31 }