Browse Source

No more device type

pull/3477/head
Andrii Shvaika 6 years ago
parent
commit
ce4ecedc29
  1. 5
      application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java
  2. 2
      application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
  3. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceProfileRepository.java
  4. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
  5. 6
      dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java

5
application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java

@ -186,9 +186,8 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
public void testSaveDeviceWithEmptyType() throws Exception {
Device device = new Device();
device.setName("My device");
doPost("/api/device", device)
.andExpect(status().isBadRequest())
.andExpect(statusReason(containsString("Device type should be specified")));
Device savedDevice = doPost("/api/device", device, Device.class);
Assert.assertEquals("default", savedDevice.getType());
}
@Test

2
application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java

@ -121,7 +121,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
Assert.assertNotNull(foundDefaultDeviceProfileInfo.getName());
Assert.assertNotNull(foundDefaultDeviceProfileInfo.getType());
Assert.assertEquals(DeviceProfileType.DEFAULT, foundDefaultDeviceProfileInfo.getType());
Assert.assertEquals("Default", foundDefaultDeviceProfileInfo.getName());
Assert.assertEquals("default", foundDefaultDeviceProfileInfo.getName());
}
@Test

2
dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceProfileRepository.java

@ -55,6 +55,6 @@ public interface DeviceProfileRepository extends PagingAndSortingRepository<Devi
"WHERE d.tenantId = :tenantId AND d.isDefault = true")
DeviceProfileInfo findDefaultDeviceProfileInfo(@Param("tenantId") UUID tenantId);
DeviceProfile findByTenantIdAndName(UUID id, String profileName);
DeviceProfileEntity findByTenantIdAndName(UUID id, String profileName);
}

2
dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java

@ -82,6 +82,6 @@ public class JpaDeviceProfileDao extends JpaAbstractSearchTextDao<DeviceProfileE
@Override
public DeviceProfile findByName(TenantId tenantId, String profileName) {
return deviceProfileRepository.findByTenantIdAndName(tenantId.getId(), profileName);
return DaoUtil.getData(deviceProfileRepository.findByTenantIdAndName(tenantId.getId(), profileName));
}
}

6
dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java

@ -270,7 +270,7 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
device.setName(name);
device.setType("default");
devicesTitle1.add(new DeviceInfo(deviceService.saveDevice(device), null, false, "Default"));
devicesTitle1.add(new DeviceInfo(deviceService.saveDevice(device), null, false, "default"));
}
String title2 = "Device title 2";
List<DeviceInfo> devicesTitle2 = new ArrayList<>();
@ -282,7 +282,7 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
device.setName(name);
device.setType("default");
devicesTitle2.add(new DeviceInfo(deviceService.saveDevice(device), null, false, "Default"));
devicesTitle2.add(new DeviceInfo(deviceService.saveDevice(device), null, false, "default"));
}
List<DeviceInfo> loadedDevicesTitle1 = new ArrayList<>();
@ -435,7 +435,7 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest {
device.setName("Device"+i);
device.setType("default");
device = deviceService.saveDevice(device);
devices.add(new DeviceInfo(deviceService.assignDeviceToCustomer(tenantId, device.getId(), customerId), customer.getTitle(), customer.isPublic(), "Default"));
devices.add(new DeviceInfo(deviceService.assignDeviceToCustomer(tenantId, device.getId(), customerId), customer.getTitle(), customer.isPublic(), "default"));
}
List<DeviceInfo> loadedDevices = new ArrayList<>();

Loading…
Cancel
Save