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

delete unnecessary code and refactoring test after code review. Also remove unnecessary file

pull/6009/head
van-vanich 5 years ago
parent
62ee824530
commit
f5aff76d81
16 changed files with 89 additions and 320 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
  2. 3
      dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
  3. 2
      dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java
  4. 21
      dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java
  5. 100
      dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java
  6. 33
      dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDaoTest.java
  7. 9
      dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java
  8. 29
      dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
  9. 16
      dao/src/test/resources/dbunit/device_credentials.xml
  10. 1
      dao/src/test/resources/dbunit/empty_dataset.xml
  11. 18
      dao/src/test/resources/dbunit/event.xml
  12. 34
      dao/src/test/resources/dbunit/rule.xml
  13. 45
      dao/src/test/resources/dbunit/user.xml
  14. 18
      dao/src/test/resources/dbunit/user_credentials.xml
  15. 31
      dao/src/test/resources/dbunit/widget_type.xml
  16. 47
      dao/src/test/resources/dbunit/widgets_bundle.xml

2
dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
View File

@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
@RunWith(ClasspathSuite.class)
@ClassnameFilters({
"org.thingsboard.server.dao.sql.*.*Test"
"org.thingsboard.server.dao.sql.*Test"
})
public class JpaDaoTestSuite {

3
dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server.dao.sql.alarm;
import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.thingsboard.server.common.data.alarm.Alarm;
@ -35,6 +36,7 @@ import static org.junit.Assert.assertNotNull;
/**
* Created by Valerii Sosliuk on 5/21/2017.
*/
@Slf4j
public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
@Autowired
@ -43,6 +45,7 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException {
log.info("Current system time in millis = {}", System.currentTimeMillis());
UUID tenantId = UUID.fromString("d4b68f40-3e96-11e7-a884-898080180d6b");
UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b");
UUID originator2Id = UUID.fromString("d4b68f42-3e96-11e7-a884-898080180d6b");

2
dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java
View File

@ -95,4 +95,4 @@ public class JpaBaseComponentDescriptorDaoTest extends AbstractJpaDaoTest {
componentDescriptorDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, component);
}
}
}

21
dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java
View File

@ -42,10 +42,13 @@ public class JpaDeviceCredentialsDaoTest extends AbstractJpaDaoTest {
DeviceCredentialsDao deviceCredentialsDao;
List<DeviceCredentials> deviceCredentialsList;
DeviceCredentials neededDeviceCredentials;
@Before
public void setUp() {
deviceCredentialsList = List.of(createAndSaveDeviceCredentials(), createAndSaveDeviceCredentials());
neededDeviceCredentials = deviceCredentialsList.get(0);
assertNotNull(neededDeviceCredentials);
}
DeviceCredentials createAndSaveDeviceCredentials() {
@ -66,20 +69,16 @@ public class JpaDeviceCredentialsDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindByDeviceId() {
DeviceCredentials result = deviceCredentialsList.get(0);
assertNotNull(result);
DeviceCredentials deviceCredentials = deviceCredentialsDao.findByDeviceId(SYSTEM_TENANT_ID, result.getDeviceId().getId());
assertNotNull(deviceCredentials);
assertEquals(result.getId(), deviceCredentials.getId());
assertEquals(result.getCredentialsId(), deviceCredentials.getCredentialsId());
DeviceCredentials foundedDeviceCredentials = deviceCredentialsDao.findByDeviceId(SYSTEM_TENANT_ID, neededDeviceCredentials.getDeviceId().getId());
assertNotNull(foundedDeviceCredentials);
assertEquals(neededDeviceCredentials.getId(), foundedDeviceCredentials.getId());
assertEquals(neededDeviceCredentials.getCredentialsId(), foundedDeviceCredentials.getCredentialsId());
}
@Test
public void findByCredentialsId() {
DeviceCredentials result = deviceCredentialsList.get(0);
assertNotNull(result);
DeviceCredentials deviceCredentials = deviceCredentialsDao.findByCredentialsId(SYSTEM_TENANT_ID, result.getCredentialsId());
assertNotNull(deviceCredentials);
assertEquals(result.getId(), deviceCredentials.getId());
DeviceCredentials foundedDeviceCredentials = deviceCredentialsDao.findByCredentialsId(SYSTEM_TENANT_ID, neededDeviceCredentials.getCredentialsId());
assertNotNull(foundedDeviceCredentials);
assertEquals(neededDeviceCredentials.getId(), foundedDeviceCredentials.getId());
}
}

100
dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java
View File

@ -23,7 +23,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils;
import org.thingsboard.common.util.ThingsBoardThreadFactory;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.DeviceProfile;
@ -43,6 +42,8 @@ import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -52,6 +53,13 @@ import static org.junit.Assert.assertNotNull;
*/
public class JpaDeviceDaoTest extends AbstractJpaDaoTest {
public static final int COUNT_DEVICES = 40;
public static final String PREFIX_FOR_DEVICE_NAME = "SEARCH_TEXT_";
List<UUID> deviceIds;
UUID tenantId1;
UUID tenantId2;
UUID customerId1;
UUID customerId2;
@Autowired
private DeviceDao deviceDao;
@ -64,8 +72,19 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest {
@Before
public void setUp() {
createDeviceProfile();
tenantId1 = Uuids.timeBased();
customerId1 = Uuids.timeBased();
tenantId2 = Uuids.timeBased();
customerId2 = Uuids.timeBased();
deviceIds = createDevices(tenantId1, tenantId2, customerId1, customerId2, COUNT_DEVICES);
}
private void createDeviceProfile() {
DeviceProfile deviceProfile = new DeviceProfile();
deviceProfile.setName("TEST" + RandomStringUtils.random(7));
deviceProfile.setName("TEST");
deviceProfile.setTenantId(TenantId.SYS_TENANT_ID);
deviceProfile.setType(DeviceProfileType.DEFAULT);
deviceProfile.setTransportType(DeviceTransportType.DEFAULT);
@ -75,6 +94,8 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest {
@After
public void tearDown() throws Exception {
deviceDao.removeAllByIds(deviceIds);
deviceProfileDao.removeById(TenantId.SYS_TENANT_ID, savedDeviceProfile.getUuidId());
if (executor != null) {
executor.shutdownNow();
}
@ -82,13 +103,7 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindDevicesByTenantId() {
UUID tenantId1 = Uuids.timeBased();
UUID tenantId2 = Uuids.timeBased();
UUID customerId1 = Uuids.timeBased();
UUID customerId2 = Uuids.timeBased();
createDevices(tenantId1, tenantId2, customerId1, customerId2, 40);
PageLink pageLink = new PageLink(15, 0, "SEARCH_TEXT");
PageLink pageLink = new PageLink(15, 0, PREFIX_FOR_DEVICE_NAME);
PageData<Device> devices1 = deviceDao.findDevicesByTenantId(tenantId1, pageLink);
assertEquals(15, devices1.getData().size());
@ -99,11 +114,12 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest {
}
@Test
public void testFindAsync() throws ExecutionException, InterruptedException {
public void testFindAsync() throws ExecutionException, InterruptedException, TimeoutException {
UUID tenantId = Uuids.timeBased();
UUID customerId = Uuids.timeBased();
Device device = getDevice(tenantId, customerId);
deviceDao.save(TenantId.fromUUID(tenantId), device);
// send to method getDevice() number = 40, because make random name is bad and name "SEARCH_TEXT_40" don't used
Device device = getDevice(tenantId, customerId, 40);
deviceIds.add(deviceDao.save(TenantId.fromUUID(tenantId), device).getUuidId());
UUID uuid = device.getId().getId();
Device entity = deviceDao.findById(TenantId.fromUUID(tenantId), uuid);
@ -112,73 +128,43 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest {
executor = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10, ThingsBoardThreadFactory.forName(getClass().getSimpleName() + "-test-scope")));
ListenableFuture<Device> future = executor.submit(() -> deviceDao.findById(TenantId.fromUUID(tenantId), uuid));
Device asyncDevice = future.get();
Device asyncDevice = future.get(30, TimeUnit.SECONDS);
assertNotNull("Async device expected to be not null", asyncDevice);
}
@Test
public void testFindDevicesByTenantIdAndIdsAsync() throws ExecutionException, InterruptedException {
UUID tenantId1 = Uuids.timeBased();
UUID customerId1 = Uuids.timeBased();
UUID tenantId2 = Uuids.timeBased();
UUID customerId2 = Uuids.timeBased();
List<UUID> deviceIds = new ArrayList<>();
for(int i = 0; i < 5; i++) {
UUID deviceId1 = Uuids.timeBased();
UUID deviceId2 = Uuids.timeBased();
deviceDao.save(TenantId.fromUUID(tenantId1), getDevice(tenantId1, customerId1, deviceId1));
deviceDao.save(TenantId.fromUUID(tenantId2), getDevice(tenantId2, customerId2, deviceId2));
deviceIds.add(deviceId1);
deviceIds.add(deviceId2);
}
public void testFindDevicesByTenantIdAndIdsAsync() throws ExecutionException, InterruptedException, TimeoutException {
ListenableFuture<List<Device>> devicesFuture = deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId1, deviceIds);
List<Device> devices = devicesFuture.get();
assertEquals(5, devices.size());
List<Device> devices = devicesFuture.get(30, TimeUnit.SECONDS);
assertEquals(20, devices.size());
}
@Test
public void testFindDevicesByTenantIdAndCustomerIdAndIdsAsync() throws ExecutionException, InterruptedException {
UUID tenantId1 = Uuids.timeBased();
UUID customerId1 = Uuids.timeBased();
UUID tenantId2 = Uuids.timeBased();
UUID customerId2 = Uuids.timeBased();
List<UUID> deviceIds = new ArrayList<>();
for(int i = 0; i < 20; i++) {
UUID deviceId1 = Uuids.timeBased();
UUID deviceId2 = Uuids.timeBased();
deviceDao.save(TenantId.fromUUID(tenantId1), getDevice(tenantId1, customerId1, deviceId1));
deviceDao.save(TenantId.fromUUID(tenantId2), getDevice(tenantId2, customerId2, deviceId2));
deviceIds.add(deviceId1);
deviceIds.add(deviceId2);
}
public void testFindDevicesByTenantIdAndCustomerIdAndIdsAsync() throws ExecutionException, InterruptedException, TimeoutException {
ListenableFuture<List<Device>> devicesFuture = deviceDao.findDevicesByTenantIdCustomerIdAndIdsAsync(tenantId1, customerId1, deviceIds);
List<Device> devices = devicesFuture.get();
List<Device> devices = devicesFuture.get(30, TimeUnit.SECONDS);
assertEquals(20, devices.size());
}
private void createDevices(UUID tenantId1, UUID tenantId2, UUID customerId1, UUID customerId2, int count) {
private List<UUID> createDevices(UUID tenantId1, UUID tenantId2, UUID customerId1, UUID customerId2, int count) {
List<UUID> savedDevicesUUID = new ArrayList<>();
for (int i = 0; i < count / 2; i++) {
deviceDao.save(TenantId.fromUUID(tenantId1), getDevice(tenantId1, customerId1));
deviceDao.save(TenantId.fromUUID(tenantId2), getDevice(tenantId2, customerId2));
savedDevicesUUID.add(deviceDao.save(TenantId.fromUUID(tenantId1), getDevice(tenantId1, customerId1, i)).getUuidId());
savedDevicesUUID.add(deviceDao.save(TenantId.fromUUID(tenantId2), getDevice(tenantId2, customerId2, i + count / 2)).getUuidId());
}
return savedDevicesUUID;
}
private Device getDevice(UUID tenantId, UUID customerID) {
return getDevice(tenantId, customerID, Uuids.timeBased());
private Device getDevice(UUID tenantId, UUID customerID, int number) {
return getDevice(tenantId, customerID, Uuids.timeBased(), number);
}
private Device getDevice(UUID tenantId, UUID customerID, UUID deviceId) {
private Device getDevice(UUID tenantId, UUID customerID, UUID deviceId, int number) {
Device device = new Device();
device.setId(new DeviceId(deviceId));
device.setTenantId(TenantId.fromUUID(tenantId));
device.setCustomerId(new CustomerId(customerID));
device.setName("SEARCH_TEXT" + RandomStringUtils.random(7));
device.setName(PREFIX_FOR_DEVICE_NAME + number);
device.setDeviceProfileId(savedDeviceProfile.getId());
return device;
}

33
dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDaoTest.java
View File

@ -40,8 +40,9 @@ public class JpaUserCredentialsDaoTest extends AbstractJpaDaoTest {
public static final String ACTIVATE_TOKEN = "ACTIVATE_TOKEN_0";
public static final String RESET_TOKEN = "RESET_TOKEN_0";
final int COUNT_USER_CREDENTIALS = 2;
public static final int COUNT_USER_CREDENTIALS = 2;
List<UserCredentials> userCredentialsList;
UserCredentials neededUserCredentials;
@Autowired
private UserCredentialsDao userCredentialsDao;
@ -52,6 +53,8 @@ public class JpaUserCredentialsDaoTest extends AbstractJpaDaoTest {
for (int i=0; i<COUNT_USER_CREDENTIALS; i++) {
userCredentialsList.add(createUserCredentials(i));
}
neededUserCredentials = userCredentialsList.get(0);
assertNotNull(neededUserCredentials);
}
UserCredentials createUserCredentials(int number) {
@ -79,32 +82,22 @@ public class JpaUserCredentialsDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindByUserId() {
UserCredentials result = userCredentialsList.get(0);
assertNotNull(result);
UserCredentials userCredentials = userCredentialsDao.findByUserId(SYSTEM_TENANT_ID, result.getUserId().getId());
assertNotNull(userCredentials);
assertEquals(result.getId(), userCredentials.getId());
assertEquals(result.isEnabled(), userCredentials.isEnabled());
assertEquals(result.getPassword(), userCredentials.getPassword());
assertEquals(result.getActivateToken(), userCredentials.getActivateToken());
assertEquals(result.getResetToken(), userCredentials.getResetToken());
UserCredentials foundedUserCredentials = userCredentialsDao.findByUserId(SYSTEM_TENANT_ID, neededUserCredentials.getUserId().getId());
assertNotNull(foundedUserCredentials);
assertEquals(neededUserCredentials, foundedUserCredentials);
}
@Test
public void testFindByActivateToken() {
UserCredentials userCredentials = userCredentialsDao.findByActivateToken(SYSTEM_TENANT_ID, ACTIVATE_TOKEN);
assertNotNull(userCredentials);
UserCredentials result = userCredentialsList.get(0);
assertNotNull(result);
assertEquals(result.getId(), userCredentials.getId());
UserCredentials foundedUserCredentials = userCredentialsDao.findByActivateToken(SYSTEM_TENANT_ID, ACTIVATE_TOKEN);
assertNotNull(foundedUserCredentials);
assertEquals(neededUserCredentials.getId(), foundedUserCredentials.getId());
}
@Test
public void testFindByResetToken() {
UserCredentials userCredentials = userCredentialsDao.findByResetToken(SYSTEM_TENANT_ID, RESET_TOKEN);
assertNotNull(userCredentials);
UserCredentials result = userCredentialsList.get(0);
assertNotNull(result);
assertEquals(result.getId(), userCredentials.getId());
UserCredentials foundedUserCredentials = userCredentialsDao.findByResetToken(SYSTEM_TENANT_ID, RESET_TOKEN);
assertNotNull(foundedUserCredentials);
assertEquals(neededUserCredentials.getId(), foundedUserCredentials.getId());
}
}

9
dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java
View File

@ -46,7 +46,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
*/
public class JpaUserDaoTest extends AbstractJpaDaoTest {
// add to count user sysadmin@thingsboard.org
// it comes from the DefaultSystemDataLoaderService super class
final int COUNT_CREATED_USER = 1;
final int COUNT_SYSADMIN_USER = 90;
UUID tenantId;
@ -75,9 +75,9 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindByEmail() throws JsonProcessingException {
User user = new User();
user.setId(new UserId(UUID.fromString("cd481534-27cc-11e7-93ae-92361f002671")));
user.setTenantId(TenantId.fromUUID(UUID.fromString("1edcb2c6-27cb-11e7-93ae-92361f002671")));
user.setCustomerId(new CustomerId(UUID.fromString("51477cb4-27cb-11e7-93ae-92361f002671")));
user.setId(new UserId(UUID.randomUUID()));
user.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
user.setCustomerId(new CustomerId(UUID.randomUUID()));
user.setEmail("user@thingsboard.org");
user.setFirstName("Jackson");
user.setLastName("Roberts");
@ -120,7 +120,6 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest {
PageData<User> customerUsers3 = userDao.findCustomerUsers(tenantId, customerId,
pageLink);
assertEquals(0, customerUsers3.getData().size());
delete30TenantAdminsAnd60CustomerUsers(tenantId, customerId);
}
private void create30TenantAdminsAnd60CustomerUsers(UUID tenantId, UUID customerId) {

29
dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
View File

@ -25,7 +25,6 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.widget.WidgetsBundle;
import org.thingsboard.server.dao.AbstractJpaDaoTest;
import org.thingsboard.server.dao.service.AbstractServiceTest;
import org.thingsboard.server.dao.widget.WidgetsBundleDao;
import java.util.List;
@ -53,7 +52,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindAll() {
createSystemWidgetBundles(7, "WB_");
widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID);
assertEquals(7, widgetsBundles.size());
}
@ -61,7 +60,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
public void testFindWidgetsBundleByTenantIdAndAlias() {
createSystemWidgetBundles(1, "WB_");
WidgetsBundle widgetsBundle = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(
AbstractServiceTest.SYSTEM_TENANT_ID.getId(), "WB_" + 0);
TenantId.SYS_TENANT_ID.getId(), "WB_" + 0);
widgetsBundles = List.of(widgetsBundle);
assertEquals("WB_" + 0, widgetsBundle.getAlias());
}
@ -69,15 +68,15 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
@Test
public void testFindSystemWidgetsBundles() {
createSystemWidgetBundles(30, "WB_");
widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID);
assertEquals(30, widgetsBundles.size());
// Get first page
PageLink pageLink = new PageLink(10, 0, "WB");
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(TenantId.SYS_TENANT_ID, pageLink);
assertEquals(10, widgetsBundles1.getData().size());
// Get next page
pageLink = pageLink.nextPageLink();
PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(TenantId.SYS_TENANT_ID, pageLink);
assertEquals(10, widgetsBundles2.getData().size());
}
@ -91,8 +90,8 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
createWidgetBundles(5, tenantId2, "WB2_");
createSystemWidgetBundles(10, "WB_SYS_");
}
widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID);
assertEquals(180, widgetsBundleDao.find(TenantId.SYS_TENANT_ID).size());
PageLink pageLink1 = new PageLink(40, 0, "WB");
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId1, pageLink1);
@ -117,8 +116,8 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
createWidgetBundles(3, tenantId2, "WB2_");
createSystemWidgetBundles(2, "WB_SYS_");
}
widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
assertEquals(100, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID);
assertEquals(100, widgetsBundleDao.find(TenantId.SYS_TENANT_ID).size());
PageLink pageLink = new PageLink(30, 0, "WB");
PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
@ -142,8 +141,8 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
UUID tenantId = Uuids.timeBased();
createWidgetBundles(5, tenantId, "ABC_");
createSystemWidgetBundles(5, "SYS_");
widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
assertEquals(10, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID);
assertEquals(10, widgetsBundleDao.find(TenantId.SYS_TENANT_ID).size());
PageLink textPageLink = new PageLink(30, 0, "TEXT_NOT_FOUND");
PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink);
assertEquals(0, widgetsBundles4.getData().size());
@ -156,7 +155,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
widgetsBundle.setTitle(prefix + i);
widgetsBundle.setId(new WidgetsBundleId(Uuids.timeBased()));
widgetsBundle.setTenantId(TenantId.fromUUID(tenantId));
widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle);
widgetsBundleDao.save(TenantId.SYS_TENANT_ID, widgetsBundle);
}
}
@ -165,9 +164,9 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
WidgetsBundle widgetsBundle = new WidgetsBundle();
widgetsBundle.setAlias(prefix + i);
widgetsBundle.setTitle(prefix + i);
widgetsBundle.setTenantId(AbstractServiceTest.SYSTEM_TENANT_ID);
widgetsBundle.setTenantId(TenantId.SYS_TENANT_ID);
widgetsBundle.setId(new WidgetsBundleId(Uuids.timeBased()));
widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle);
widgetsBundleDao.save(TenantId.SYS_TENANT_ID, widgetsBundle);
}
}
}

16
dao/src/test/resources/dbunit/device_credentials.xml
View File

@ -1,16 +0,0 @@
<dataset>
<device_credentials
id="uuid'958e3314-3215-11e7-93ae-92361f002671'"
device_id="uuid'958e3a30-3215-11e7-93ae-92361f002671'"
credentials_type="ACCESS_TOKEN"
credentials_id="ID_1"
credentials_value="ACCESS_TOKEN_1"
/>
<device_credentials
id="uuid'958e3c74-3215-11e7-93ae-92361f002671'"
device_id="uuid'958e3e5e-3215-11e7-93ae-92361f002671'"
credentials_type="ACCESS_TOKEN"
credentials_id="ID_2"
credentials_value="ACCESS_TOKEN_2"
/>
</dataset>

1
dao/src/test/resources/dbunit/empty_dataset.xml
View File

@ -1 +0,0 @@
<dataset></dataset>

18
dao/src/test/resources/dbunit/event.xml
View File

@ -1,18 +0,0 @@
<dataset>
<event
id="uuid'be41c7a2-31f5-11e7-9cfd-2786e6aa2046'"
tenant_id="uuid'be41c7a0-31f5-11e7-9cfd-2786e6aa2046'"
entity_id="uuid'be41c7a1-31f5-11e7-9cfd-2786e6aa2046'"
entity_type="DEVICE"
event_type="STATS"
event_uid="uuid'be41c7a3-31f5-11e7-9cfd-2786e6aa2046'"
/>
<event
id="uuid'be41c7a4-31f5-11e7-9cfd-2786e6aa2046'"
tenant_id="uuid'be41c7a0-31f5-11e7-9cfd-2786e6aa2046'"
entity_id="uuid'be41c7a1-31f5-11e7-9cfd-2786e6aa2046'"
entity_type="DEVICE"
event_type="STATS"
event_uid="uuid'be41c7a5-31f5-11e7-9cfd-2786e6aa2046'"
/>
</dataset>

34
dao/src/test/resources/dbunit/rule.xml
View File

@ -1,34 +0,0 @@
<dataset>
<rule
id="uuid'8e834e11-2e0a-11e7-83ec-f7f6dbfb4833'"
tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
name="RULE_11"
weight="1"
search_text="rule_11"
plugin_token="token_1"
/>
<rule
id="uuid'8e834e12-2e0a-11e7-83ec-f7f6dbfb4833'"
tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
name="RULE_12"
weight="1"
search_text="rule_12"
plugin_token="token_1"
/>
<rule
id="uuid'8e834e13-2e0a-11e7-83ec-f7f6dbfb4833'"
tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
name="RULE_13"
weight="1"
search_text="rule_13"
plugin_token="token_1"
/>
<rule
id="uuid'8e834e14-2e0a-11e7-83ec-f7f6dbfb4833'"
tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
name="RULE_14"
weight="2"
search_text="rule_14"
plugin_token="token_2"
/>
</dataset>

45
dao/src/test/resources/dbunit/user.xml
View File

@ -1,45 +0,0 @@
<dataset>
<tb_user id="uuid'9cb58ba0-27c1-11e7-93ae-92361f002671'"
tenant_id="uuid'c97ea14e-27c1-11e7-93ae-92361f002671'"
customer_id="uuid'cdf9c79e-27c1-11e7-93ae-92361f002671'"
authority="SYS_ADMIN"
email="sysadm@thingsboard.org"
search_text="SYSADM SEARCH TEXT"
first_name="John"
last_name="Doe"
/>
<tb_user id="uuid'1312f328-27c7-11e7-93ae-92361f002671'"
tenant_id="uuid'1e1cd4c8-27c7-11e7-93ae-92361f002671'"
authority="TENANT_ADMIN"
email="tenantadm1@thingsboard.org"
search_text="TENANTADM1 SEARCH TEXT"
first_name="Samuel"
last_name="Serif"
/>
<tb_user id="uuid'2b090dde-27ca-11e7-93ae-92361f002671'"
tenant_id="uuid'1e1cd4c8-27c7-11e7-93ae-92361f002671'"
authority="TENANT_ADMIN"
email="tenantadm2@thingsboard.org"
search_text="TENANTADM2 SEARCH TEXT"
first_name="Penny"
last_name="Morgan"
/>
<tb_user id="uuid'cc8c1ca8-27c7-11e7-93ae-92361f002671'"
tenant_id="uuid'd2e27caa-27c7-11e7-93ae-92361f002671'"
customer_id="uuid'd89e128a-27c7-11e7-93ae-92361f002671'"
authority="CUSTOMER_USER"
email="customeruser@thingsboard.org"
search_text="CUSTOMER USER SEARCH TEXT"
first_name="Norman"
last_name="Gordon"
/>
<tb_user id="uuid'edb2de58-27c7-11e7-93ae-92361f002671'"
tenant_id="uuid'f229675e-27c7-11e7-93ae-92361f002671'"
customer_id="uuid'f7a3d4e4-27c7-11e7-93ae-92361f002671'"
authority="REFRESH_TOKEN"
email="refreshtoken@thingsboard.org"
search_text="REFRESH TOKEN SEARCH TEXT"
first_name="Refresh"
last_name="Token"
/>
</dataset>

18
dao/src/test/resources/dbunit/user_credentials.xml
View File

@ -1,18 +0,0 @@
<dataset>
<user_credentials
id="uuid'3ed10af0-27d5-11e7-93ae-92361f002671'"
user_id="uuid'44ee8552-27d5-11e7-93ae-92361f002671'"
enabled="true"
password="password"
activate_token="ACTIVATE_TOKEN_1"
reset_token="RESET_TOKEN_1"
/>
<user_credentials
id="uuid'4b9e010c-27d5-11e7-93ae-92361f002671'"
user_id="uuid'787827e6-27d7-11e7-93ae-92361f002671'"
enabled="true"
password="password"
activate_token="ACTIVATE_TOKEN_2"
reset_token="RESET_TOKEN_2"
/>
</dataset>

31
dao/src/test/resources/dbunit/widget_type.xml
View File

@ -1,31 +0,0 @@
<dataset>
<widget_type
id="uuid'2b7e4c91-2dfe-11e7-94aa-f7f6dbfb4833'"
tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
bundle_alias="BUNDLE_ALIAS_1"
alias="ALIAS1"
name="ALIAS1"
/>
<widget_type
id="uuid'2b7e4c92-2dfe-11e7-94aa-f7f6dbfb4833'"
tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
bundle_alias="BUNDLE_ALIAS_1"
alias="ALIAS2"
name="ALIAS2"
/>
<widget_type
id="uuid'2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833'"
tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
bundle_alias="BUNDLE_ALIAS_1"
alias="ALIAS3"
name="ALIAS3"
/>
<widget_type
id="uuid'2b7e4c94-2dfe-11e7-94aa-f7f6dbfb4833'"
tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
bundle_alias="BUNDLE_ALIAS_2"
alias="ALIAS4"
name="ALIAS4"
/>
</dataset>

47
dao/src/test/resources/dbunit/widgets_bundle.xml
View File

@ -1,47 +0,0 @@
<dataset>
<widgets_bundle
id="uuid'250ac7b4-2825-11e7-93ae-92361f002671'"
tenant_id="uuid'250aca8e-2825-11e7-93ae-92361f002671'"
alias="WB1"
title="Widgets Bundle 1"
search_text="WB SEARCH TEXT 1"
/>
<widgets_bundle
id="uuid'3269c18a-2825-11e7-93ae-92361f002671'"
tenant_id="uuid'3269c18a-2825-11e7-93ae-92361f002671'"
alias="WB2"
title="Widgets Bundle 2"
search_text="WB SEARCH TEXT 2"
/>
<widgets_bundle
id="uuid'44e6af4e-2825-11e7-93ae-92361f002671'"
tenant_id="uuid'250aca8e-2825-11e7-93ae-92361f002671'"
alias="WB3"
title="Widgets Bundle 3"
search_text="WB SEARCH TEXT 3"
/>
<widgets_bundle
id="uuid'696dc9b4-2830-11e7-93ae-92361f002671'"
alias="WB4"
title="Widgets Bundle 4"
search_text="SYSTEM BUNDLE 1"
/>
<widgets_bundle
id="uuid'1a83fc50-2840-11e7-93ae-92361f002671'"
alias="WB5"
title="Widgets Bundle 5"
search_text="SYSTEM BUNDLE 2"
/>
<widgets_bundle
id="uuid'6a593dde-2841-11e7-93ae-92361f002671'"
alias="WB6"
title="Widgets Bundle 6"
search_text="SYSTEM BUNDLE 1"
/>
<widgets_bundle
id="uuid'3beb4b1a-294d-11e7-93ae-92361f002671'"
alias="WB6"
title="Widgets Bundle 7"
search_text="ABC DEF"
/>
</dataset>
Write Preview
Loading…
Cancel
Save