fixes
This commit is contained in:
Dima Landiak
Andrew Shvayka
parent
ac007bea24
commit
a167b39b44
@ -79,8 +79,14 @@ import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
|
||||
|
||||
@ActiveProfiles("test")
|
||||
@ -221,6 +227,7 @@ public abstract class AbstractControllerTest {
|
||||
}
|
||||
|
||||
private Tenant savedDifferentTenant;
|
||||
|
||||
protected void loginDifferentTenant() throws Exception {
|
||||
loginSysAdmin();
|
||||
Tenant tenant = new Tenant();
|
||||
@ -316,6 +323,10 @@ public abstract class AbstractControllerTest {
|
||||
return readResponse(doGet(urlTemplate, urlVariables).andExpect(status().isOk()), responseClass);
|
||||
}
|
||||
|
||||
protected <T> T doGet(String urlTemplate, Class<T> responseClass, ResultMatcher resultMatcher, Object... urlVariables) throws Exception {
|
||||
return readResponse(doGet(urlTemplate, urlVariables).andExpect(resultMatcher), responseClass);
|
||||
}
|
||||
|
||||
protected <T> T doGetAsync(String urlTemplate, Class<T> responseClass, Object... urlVariables) throws Exception {
|
||||
return readResponse(doGetAsync(urlTemplate, urlVariables).andExpect(status().isOk()), responseClass);
|
||||
}
|
||||
@ -357,9 +368,9 @@ public abstract class AbstractControllerTest {
|
||||
return readResponse(doGet(urlTemplate, vars).andExpect(status().isOk()), responseType);
|
||||
}
|
||||
|
||||
protected <T> T doGetTypedWithTimePageLink(String urlTemplate, TypeReference<T> responseType,
|
||||
TimePageLink pageLink,
|
||||
Object... urlVariables) throws Exception {
|
||||
protected <T> T doGetTypedWithTimePageLink(String urlTemplate, TypeReference<T> responseType,
|
||||
TimePageLink pageLink,
|
||||
Object... urlVariables) throws Exception {
|
||||
List<Object> pageLinkVariables = new ArrayList<>();
|
||||
urlTemplate += "limit={limit}";
|
||||
pageLinkVariables.add(pageLink.getLimit());
|
||||
@ -425,7 +436,7 @@ public abstract class AbstractControllerTest {
|
||||
return mockMvc.perform(postRequest);
|
||||
}
|
||||
|
||||
protected <T> ResultActions doPostAsync(String urlTemplate, T content, Long timeout, String... params) throws Exception {
|
||||
protected <T> ResultActions doPostAsync(String urlTemplate, T content, Long timeout, String... params) throws Exception {
|
||||
MockHttpServletRequestBuilder postRequest = post(urlTemplate);
|
||||
setJwtToken(postRequest);
|
||||
String json = json(content);
|
||||
|
||||
@ -15,32 +15,37 @@
|
||||
*/
|
||||
package org.thingsboard.server.controller;
|
||||
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import com.datastax.driver.core.utils.UUIDs;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import org.apache.commons.lang3.RandomStringUtils;
|
||||
import org.thingsboard.server.common.data.*;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.thingsboard.server.common.data.Customer;
|
||||
import org.thingsboard.server.common.data.Device;
|
||||
import org.thingsboard.server.common.data.EntitySubtype;
|
||||
import org.thingsboard.server.common.data.Tenant;
|
||||
import org.thingsboard.server.common.data.User;
|
||||
import org.thingsboard.server.common.data.id.CustomerId;
|
||||
import org.thingsboard.server.common.data.id.DeviceCredentialsId;
|
||||
import org.thingsboard.server.common.data.id.DeviceId;
|
||||
import org.thingsboard.server.common.data.page.TextPageData;
|
||||
import org.thingsboard.server.common.data.page.TextPageLink;
|
||||
import org.thingsboard.server.common.data.relation.EntityRelation;
|
||||
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
|
||||
import org.thingsboard.server.common.data.security.Authority;
|
||||
import org.thingsboard.server.common.data.security.DeviceCredentials;
|
||||
import org.thingsboard.server.common.data.security.DeviceCredentialsType;
|
||||
import org.thingsboard.server.dao.model.ModelConstants;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
|
||||
|
||||
public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
@ -72,8 +77,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
public void afterTest() throws Exception {
|
||||
loginSysAdmin();
|
||||
|
||||
doDelete("/api/tenant/"+savedTenant.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -115,7 +120,7 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
device.setType("default");
|
||||
Device savedDevice = doPost("/api/device", device, Device.class);
|
||||
loginDifferentTenant();
|
||||
doPost("/api/device", savedDevice, Device.class, status().isForbidden());
|
||||
doPost("/api/device", savedDevice, Device.class, status().isNotFound());
|
||||
deleteDifferentTenant();
|
||||
}
|
||||
|
||||
@ -133,26 +138,27 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
@Test
|
||||
public void testFindDeviceTypesByTenantId() throws Exception {
|
||||
List<Device> devices = new ArrayList<>();
|
||||
for (int i=0;i<3;i++) {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
Device device = new Device();
|
||||
device.setName("My device B"+i);
|
||||
device.setName("My device B" + i);
|
||||
device.setType("typeB");
|
||||
devices.add(doPost("/api/device", device, Device.class));
|
||||
}
|
||||
for (int i=0;i<7;i++) {
|
||||
for (int i = 0; i < 7; i++) {
|
||||
Device device = new Device();
|
||||
device.setName("My device C"+i);
|
||||
device.setName("My device C" + i);
|
||||
device.setType("typeC");
|
||||
devices.add(doPost("/api/device", device, Device.class));
|
||||
}
|
||||
for (int i=0;i<9;i++) {
|
||||
for (int i = 0; i < 9; i++) {
|
||||
Device device = new Device();
|
||||
device.setName("My device A"+i);
|
||||
device.setName("My device A" + i);
|
||||
device.setType("typeA");
|
||||
devices.add(doPost("/api/device", device, Device.class));
|
||||
}
|
||||
List<EntitySubtype> deviceTypes = doGetTyped("/api/device/types",
|
||||
new TypeReference<List<EntitySubtype>>(){});
|
||||
new TypeReference<List<EntitySubtype>>() {
|
||||
});
|
||||
|
||||
Assert.assertNotNull(deviceTypes);
|
||||
Assert.assertEquals(3, deviceTypes.size());
|
||||
@ -168,11 +174,11 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
device.setType("default");
|
||||
Device savedDevice = doPost("/api/device", device, Device.class);
|
||||
|
||||
doDelete("/api/device/"+savedDevice.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
doDelete("/api/device/" + savedDevice.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
|
||||
doGet("/api/device/"+savedDevice.getId().getId().toString())
|
||||
.andExpect(status().isNotFound());
|
||||
doGet("/api/device/" + savedDevice.getId().getId().toString())
|
||||
.andExpect(status().isNotFound());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -189,8 +195,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
Device device = new Device();
|
||||
device.setType("default");
|
||||
doPost("/api/device", device)
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Device name should be specified")));
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Device name should be specified")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -228,7 +234,7 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
doPost("/api/customer/" + UUIDs.timeBased().toString()
|
||||
+ "/device/" + savedDevice.getId().getId().toString())
|
||||
.andExpect(status().isNotFound());
|
||||
.andExpect(status().isNotFound());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -262,12 +268,12 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
doPost("/api/customer/" + savedCustomer.getId().getId().toString()
|
||||
+ "/device/" + savedDevice.getId().getId().toString())
|
||||
.andExpect(status().isForbidden());
|
||||
.andExpect(status().isForbidden());
|
||||
|
||||
loginSysAdmin();
|
||||
|
||||
doDelete("/api/tenant/"+savedTenant2.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -293,7 +299,7 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
deviceCredentials.setCredentialsType(DeviceCredentialsType.ACCESS_TOKEN);
|
||||
deviceCredentials.setCredentialsId("access_token");
|
||||
doPost("/api/device/credentials", deviceCredentials)
|
||||
.andExpect(status().isOk());
|
||||
.andExpect(status().isOk());
|
||||
|
||||
DeviceCredentials foundDeviceCredentials =
|
||||
doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class);
|
||||
@ -305,7 +311,7 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
public void testSaveDeviceCredentialsWithEmptyDevice() throws Exception {
|
||||
DeviceCredentials deviceCredentials = new DeviceCredentials();
|
||||
doPost("/api/device/credentials", deviceCredentials)
|
||||
.andExpect(status().isBadRequest());
|
||||
.andExpect(status().isBadRequest());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -318,8 +324,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class);
|
||||
deviceCredentials.setCredentialsType(null);
|
||||
doPost("/api/device/credentials", deviceCredentials)
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Device credentials type should be specified")));
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Device credentials type should be specified")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -332,8 +338,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class);
|
||||
deviceCredentials.setCredentialsId(null);
|
||||
doPost("/api/device/credentials", deviceCredentials)
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Device credentials id should be specified")));
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Device credentials id should be specified")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -350,8 +356,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
newDeviceCredentials.setCredentialsType(deviceCredentials.getCredentialsType());
|
||||
newDeviceCredentials.setCredentialsId(deviceCredentials.getCredentialsId());
|
||||
doPost("/api/device/credentials", newDeviceCredentials)
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Unable to update non-existent device credentials")));
|
||||
.andExpect(status().isBadRequest())
|
||||
.andExpect(statusReason(containsString("Unable to update non-existent device credentials")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -364,15 +370,15 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class);
|
||||
deviceCredentials.setDeviceId(new DeviceId(UUIDs.timeBased()));
|
||||
doPost("/api/device/credentials", deviceCredentials)
|
||||
.andExpect(status().isNotFound());
|
||||
.andExpect(status().isNotFound());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFindTenantDevices() throws Exception {
|
||||
List<Device> devices = new ArrayList<>();
|
||||
for (int i=0;i<178;i++) {
|
||||
for (int i = 0; i < 178; i++) {
|
||||
Device device = new Device();
|
||||
device.setName("Device"+i);
|
||||
device.setName("Device" + i);
|
||||
device.setType("default");
|
||||
devices.add(doPost("/api/device", device, Device.class));
|
||||
}
|
||||
@ -381,7 +387,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
TextPageData<Device> pageData = null;
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
loadedDevices.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -398,10 +405,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
public void testFindTenantDevicesByName() throws Exception {
|
||||
String title1 = "Device title 1";
|
||||
List<Device> devicesTitle1 = new ArrayList<>();
|
||||
for (int i=0;i<143;i++) {
|
||||
for (int i = 0; i < 143; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title1+suffix;
|
||||
String name = title1 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType("default");
|
||||
@ -409,10 +416,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
}
|
||||
String title2 = "Device title 2";
|
||||
List<Device> devicesTitle2 = new ArrayList<>();
|
||||
for (int i=0;i<75;i++) {
|
||||
for (int i = 0; i < 75; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title2+suffix;
|
||||
String name = title2 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType("default");
|
||||
@ -424,7 +431,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
TextPageData<Device> pageData = null;
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
loadedDevicesTitle1.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -440,7 +448,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
pageLink = new TextPageLink(4, title2);
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
loadedDevicesTitle2.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -453,24 +462,26 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
Assert.assertEquals(devicesTitle2, loadedDevicesTitle2);
|
||||
|
||||
for (Device device : loadedDevicesTitle1) {
|
||||
doDelete("/api/device/"+device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
doDelete("/api/device/" + device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
pageLink = new TextPageLink(4, title1);
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
|
||||
for (Device device : loadedDevicesTitle2) {
|
||||
doDelete("/api/device/"+device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
doDelete("/api/device/" + device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
pageLink = new TextPageLink(4, title2);
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
}
|
||||
@ -480,10 +491,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
String title1 = "Device title 1";
|
||||
String type1 = "typeA";
|
||||
List<Device> devicesType1 = new ArrayList<>();
|
||||
for (int i=0;i<143;i++) {
|
||||
for (int i = 0; i < 143; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title1+suffix;
|
||||
String name = title1 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType(type1);
|
||||
@ -492,10 +503,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
String title2 = "Device title 2";
|
||||
String type2 = "typeB";
|
||||
List<Device> devicesType2 = new ArrayList<>();
|
||||
for (int i=0;i<75;i++) {
|
||||
for (int i = 0; i < 75; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title2+suffix;
|
||||
String name = title2 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType(type2);
|
||||
@ -507,7 +518,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
TextPageData<Device> pageData = null;
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type1);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type1);
|
||||
loadedDevicesType1.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -523,7 +535,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
pageLink = new TextPageLink(4);
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type2);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type2);
|
||||
loadedDevicesType2.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -536,24 +549,26 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
Assert.assertEquals(devicesType2, loadedDevicesType2);
|
||||
|
||||
for (Device device : loadedDevicesType1) {
|
||||
doDelete("/api/device/"+device.getId().getId().toString())
|
||||
doDelete("/api/device/" + device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
pageLink = new TextPageLink(4);
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type1);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type1);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
|
||||
for (Device device : loadedDevicesType2) {
|
||||
doDelete("/api/device/"+device.getId().getId().toString())
|
||||
doDelete("/api/device/" + device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
pageLink = new TextPageLink(4);
|
||||
pageData = doGetTypedWithPageLink("/api/tenant/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type2);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type2);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
}
|
||||
@ -566,13 +581,13 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
CustomerId customerId = customer.getId();
|
||||
|
||||
List<Device> devices = new ArrayList<>();
|
||||
for (int i=0;i<128;i++) {
|
||||
for (int i = 0; i < 128; i++) {
|
||||
Device device = new Device();
|
||||
device.setName("Device"+i);
|
||||
device.setName("Device" + i);
|
||||
device.setType("default");
|
||||
device = doPost("/api/device", device, Device.class);
|
||||
devices.add(doPost("/api/customer/" + customerId.getId().toString()
|
||||
+ "/device/" + device.getId().getId().toString(), Device.class));
|
||||
+ "/device/" + device.getId().getId().toString(), Device.class));
|
||||
}
|
||||
|
||||
List<Device> loadedDevices = new ArrayList<>();
|
||||
@ -580,7 +595,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
TextPageData<Device> pageData = null;
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
loadedDevices.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -602,10 +618,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
String title1 = "Device title 1";
|
||||
List<Device> devicesTitle1 = new ArrayList<>();
|
||||
for (int i=0;i<125;i++) {
|
||||
for (int i = 0; i < 125; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title1+suffix;
|
||||
String name = title1 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType("default");
|
||||
@ -615,10 +631,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
}
|
||||
String title2 = "Device title 2";
|
||||
List<Device> devicesTitle2 = new ArrayList<>();
|
||||
for (int i=0;i<143;i++) {
|
||||
for (int i = 0; i < 143; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title2+suffix;
|
||||
String name = title2 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType("default");
|
||||
@ -632,7 +648,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
TextPageData<Device> pageData = null;
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
loadedDevicesTitle1.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -648,7 +665,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
pageLink = new TextPageLink(4, title2);
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
loadedDevicesTitle2.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -662,23 +680,25 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
for (Device device : loadedDevicesTitle1) {
|
||||
doDelete("/api/customer/device/" + device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
pageLink = new TextPageLink(4, title1);
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
|
||||
for (Device device : loadedDevicesTitle2) {
|
||||
doDelete("/api/customer/device/" + device.getId().getId().toString())
|
||||
.andExpect(status().isOk());
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
pageLink = new TextPageLink(4, title2);
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
}
|
||||
@ -693,10 +713,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
String title1 = "Device title 1";
|
||||
String type1 = "typeC";
|
||||
List<Device> devicesType1 = new ArrayList<>();
|
||||
for (int i=0;i<125;i++) {
|
||||
for (int i = 0; i < 125; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title1+suffix;
|
||||
String name = title1 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType(type1);
|
||||
@ -707,10 +727,10 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
String title2 = "Device title 2";
|
||||
String type2 = "typeD";
|
||||
List<Device> devicesType2 = new ArrayList<>();
|
||||
for (int i=0;i<143;i++) {
|
||||
for (int i = 0; i < 143; i++) {
|
||||
Device device = new Device();
|
||||
String suffix = RandomStringUtils.randomAlphanumeric(15);
|
||||
String name = title2+suffix;
|
||||
String name = title2 + suffix;
|
||||
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
|
||||
device.setName(name);
|
||||
device.setType(type2);
|
||||
@ -724,7 +744,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
TextPageData<Device> pageData = null;
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type1);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type1);
|
||||
loadedDevicesType1.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -740,7 +761,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
pageLink = new TextPageLink(4);
|
||||
do {
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type2);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type2);
|
||||
loadedDevicesType2.addAll(pageData.getData());
|
||||
if (pageData.hasNext()) {
|
||||
pageLink = pageData.getNextPageLink();
|
||||
@ -759,7 +781,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
pageLink = new TextPageLink(4);
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type1);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type1);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
|
||||
@ -770,9 +793,56 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
|
||||
|
||||
pageLink = new TextPageLink(4);
|
||||
pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/devices?type={type}&",
|
||||
new TypeReference<TextPageData<Device>>(){}, pageLink, type2);
|
||||
new TypeReference<TextPageData<Device>>() {
|
||||
}, pageLink, type2);
|
||||
Assert.assertFalse(pageData.hasNext());
|
||||
Assert.assertEquals(0, pageData.getData().size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSwapDeviceFromOneTenantToAnother() throws Exception {
|
||||
Device device = new Device();
|
||||
device.setName("My device");
|
||||
device.setType("default");
|
||||
Device savedDevice = doPost("/api/device", device, Device.class);
|
||||
|
||||
Device anotherDevice = new Device();
|
||||
anotherDevice.setName("My device1");
|
||||
anotherDevice.setType("default");
|
||||
Device savedAnotherDevice = doPost("/api/device", anotherDevice, Device.class);
|
||||
|
||||
EntityRelation relation = new EntityRelation();
|
||||
relation.setFrom(savedDevice.getId());
|
||||
relation.setTo(savedAnotherDevice.getId());
|
||||
relation.setTypeGroup(RelationTypeGroup.COMMON);
|
||||
relation.setType("Contains");
|
||||
doPost("/api/relation", relation);
|
||||
|
||||
loginSysAdmin();
|
||||
Tenant tenant = new Tenant();
|
||||
tenant.setTitle("Different tenant");
|
||||
Tenant savedDifferentTenant = doPost("/api/tenant", tenant, Tenant.class);
|
||||
Assert.assertNotNull(savedDifferentTenant);
|
||||
|
||||
User user = new User();
|
||||
user.setAuthority(Authority.TENANT_ADMIN);
|
||||
user.setTenantId(savedDifferentTenant.getId());
|
||||
user.setEmail("tenant9@thingsboard.org");
|
||||
user.setFirstName("Sam");
|
||||
user.setLastName("Downs");
|
||||
|
||||
createUserAndLogin(user, "testPassword1");
|
||||
|
||||
login("tenant2@thingsboard.org", "testPassword1");
|
||||
Device swappedDevice = doPost("/api/tenant/" + savedDifferentTenant.getId().getId() + "/device/" + savedDevice.getId().getId(), Device.class);
|
||||
|
||||
doGet("/api/device/" + swappedDevice.getId().getId().toString(), Device.class, status().isNotFound());
|
||||
|
||||
login("tenant9@thingsboard.org", "testPassword1");
|
||||
|
||||
Device foundDevice1 = doGet("/api/device/" + swappedDevice.getId().getId().toString(), Device.class);
|
||||
Assert.assertNotNull(foundDevice1);
|
||||
|
||||
doGet("/api/relation?fromId=" + savedDevice.getId().getId() + "&fromType=DEVICE&relationType=Contains&toId=" + savedAnotherDevice.getId().getId() + "&toType=DEVICE", EntityRelation.class, status().isNotFound());
|
||||
}
|
||||
}
|
||||
|
||||
@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.id.TenantId;
|
||||
import org.thingsboard.server.common.data.page.TextPageLink;
|
||||
import org.thingsboard.server.dao.DaoUtil;
|
||||
import org.thingsboard.server.dao.model.EntitySubtypeEntity;
|
||||
import org.thingsboard.server.dao.model.ModelConstants;
|
||||
import org.thingsboard.server.dao.model.nosql.DeviceEntity;
|
||||
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
|
||||
import org.thingsboard.server.dao.util.NoSqlDao;
|
||||
@ -191,12 +192,17 @@ public class CassandraDeviceDao extends CassandraAbstractSearchTextDao<DeviceEnt
|
||||
|
||||
@Override
|
||||
public Device findDeviceByTenantIdAndId(TenantId tenantId, UUID id) {
|
||||
return findById(tenantId, id);
|
||||
Select.Where query = select().from(getColumnFamilyName()).where(eq(ModelConstants.TENANT_ID_PROPERTY, tenantId.getId())).and(eq(ModelConstants.ID_PROPERTY, id));
|
||||
log.trace("Execute query {}", query);
|
||||
DeviceEntity entity = findOneByStatement(tenantId, query);
|
||||
return DaoUtil.getData(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListenableFuture<Device> findDeviceByTenantIdAndIdAsync(TenantId tenantId, UUID id) {
|
||||
return findByIdAsync(tenantId, id);
|
||||
Select.Where query = select().from(getColumnFamilyName()).where(eq(ModelConstants.TENANT_ID_PROPERTY, tenantId.getId())).and(eq(ModelConstants.ID_PROPERTY, id));
|
||||
log.trace("Execute query {}", query);
|
||||
return findOneByStatementAsync(tenantId, query);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -355,7 +355,10 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
|
||||
|
||||
relationService.removeRelations(device.getTenantId(), device.getId());
|
||||
|
||||
auditLogService.removeAuditLogs(device.getTenantId(), device.getId());
|
||||
// TODO: 30/07/2020 implement for Cassandra
|
||||
if (sqlDatabaseUsed) {
|
||||
auditLogService.removeAuditLogs(device.getTenantId(), device.getId());
|
||||
}
|
||||
|
||||
device.setTenantId(tenantId);
|
||||
device.setCustomerId(null);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user