简柏林 / thingskit · Commits

Commit bdb3d3db25bdb56f595394d1cfa70e94ba9e7227

Authored by Volodymyr Babak
1 parent 467c85bf

Fixes for JPA DAO tests

Inline Side-by-side
Showing 12 changed files with 57 additions and 73 deletions
... ... @@ -28,8 +28,6 @@ import org.thingsboard.server.dao.model.BaseEntity;
28 28 import java.util.List;
29 29 import java.util.UUID;
30 30
31   -import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW;
32   -
33 31 /**
34 32 * @author Valerii Sosliuk
35 33 */
... ...
... ... @@ -20,8 +20,8 @@ import org.springframework.data.jpa.repository.Query;
20 20 import org.springframework.data.repository.CrudRepository;
21 21 import org.springframework.data.repository.query.Param;
22 22 import org.thingsboard.server.common.data.asset.TenantAssetType;
23   -import org.thingsboard.server.dao.util.SqlDao;
24 23 import org.thingsboard.server.dao.model.sql.AssetEntity;
  24 +import org.thingsboard.server.dao.util.SqlDao;
25 25
26 26 import java.util.List;
27 27 import java.util.UUID;
... ...
... ... @@ -24,7 +24,7 @@ import java.util.Arrays;
24 24
25 25 @RunWith(ClasspathSuite.class)
26 26 @ClassnameFilters({
27   - "org.thingsboard.server.dao.sql.*AASDTest"
  27 + "org.thingsboard.server.dao.sql.alarm.JpaAlarmDaoTest"
28 28 })
29 29 public class JpaDaoTestSuite {
30 30
... ...
... ... @@ -51,7 +51,6 @@ public class JpaDbunitTestConfig {
51 51 DatabaseDataSourceConnectionFactoryBean databaseDataSourceConnectionFactoryBean = new DatabaseDataSourceConnectionFactoryBean();
52 52 databaseDataSourceConnectionFactoryBean.setDatabaseConfig(databaseConfigBean());
53 53 databaseDataSourceConnectionFactoryBean.setDataSource(dataSource);
54   - databaseDataSourceConnectionFactoryBean.setSchema("public");
55 54 return databaseDataSourceConnectionFactoryBean;
56 55 }
57 56 }
... ...
... ... @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.sql.alarm;
18 18 import com.google.common.util.concurrent.ListenableFuture;
19 19 import org.junit.Test;
20 20 import org.springframework.beans.factory.annotation.Autowired;
21   -import org.springframework.data.domain.PageRequest;
22   -import org.thingsboard.server.common.data.EntityType;
23 21 import org.thingsboard.server.common.data.alarm.Alarm;
24 22 import org.thingsboard.server.common.data.alarm.AlarmId;
25 23 import org.thingsboard.server.common.data.alarm.AlarmStatus;
... ... @@ -27,7 +25,6 @@ import org.thingsboard.server.common.data.id.DeviceId;
27 25 import org.thingsboard.server.common.data.id.TenantId;
28 26 import org.thingsboard.server.dao.AbstractJpaDaoTest;
29 27 import org.thingsboard.server.dao.alarm.AlarmDao;
30   -import org.thingsboard.server.dao.model.sql.AlarmEntity;
31 28
32 29 import java.util.UUID;
33 30 import java.util.concurrent.ExecutionException;
... ... @@ -43,8 +40,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
43 40 @Autowired
44 41 private AlarmDao alarmDao;
45 42
46   - @Autowired
47   - private AlarmRepository alarmRepository;
48 43
49 44 @Test
50 45 public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException {
... ... @@ -59,9 +54,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
59 54 saveAlarm(alarm2Id, tenantId, originator1Id, "TEST_ALARM");
60 55 saveAlarm(alarm3Id, tenantId, originator2Id, "TEST_ALARM");
61 56 assertEquals(3, alarmDao.find().size());
62   - AlarmEntity alarmEntity = alarmRepository.findLatestByOriginatorAndType(
63   - tenantId, originator1Id, EntityType.DEVICE, "TEST_ALARM", new PageRequest(0, 1)).get(0);
64   - assertNotNull(alarmEntity);
65 57 ListenableFuture<Alarm> future = alarmDao
66 58 .findLatestByOriginatorAndType(new TenantId(tenantId), new DeviceId(originator1Id), "TEST_ALARM");
67 59 Alarm alarm = future.get();
... ... @@ -69,11 +61,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
69 61 assertEquals(alarm2Id, alarm.getId().getId());
70 62 }
71 63
72   - @Test
73   - public void testFindAlarmByIdAsync() {
74   - // TODO: implement
75   - }
76   -
77 64 private void saveAlarm(UUID id, UUID tenantId, UUID deviceId, String type) {
78 65 Alarm alarm = new Alarm();
79 66 alarm.setId(new AlarmId(id));
... ...
1 1 <dataset>
2 2 <device_credentials
3   - id="958e3314-3215-11e7-93ae-92361f002671"
4   - device_id="958e3a30-3215-11e7-93ae-92361f002671"
  3 + id="uuid'958e3314-3215-11e7-93ae-92361f002671'"
  4 + device_id="uuid'958e3a30-3215-11e7-93ae-92361f002671'"
5 5 credentials_type="ACCESS_TOKEN"
6 6 credentials_id="ID_1"
7 7 credentials_value="ACCESS_TOKEN_1"
8 8 />
9 9 <device_credentials
10   - id="958e3c74-3215-11e7-93ae-92361f002671"
11   - device_id="958e3e5e-3215-11e7-93ae-92361f002671"
  10 + id="uuid'958e3c74-3215-11e7-93ae-92361f002671'"
  11 + device_id="uuid'958e3e5e-3215-11e7-93ae-92361f002671'"
12 12 credentials_type="ACCESS_TOKEN"
13 13 credentials_id="ID_2"
14 14 credentials_value="ACCESS_TOKEN_2"
... ...
1 1 <dataset>
2 2 <event
3   - id="be41c7a2-31f5-11e7-9cfd-2786e6aa2046"
4   - tenant_id="be41c7a0-31f5-11e7-9cfd-2786e6aa2046"
5   - entity_id="be41c7a1-31f5-11e7-9cfd-2786e6aa2046"
  3 + id="uuid'be41c7a2-31f5-11e7-9cfd-2786e6aa2046'"
  4 + tenant_id="uuid'be41c7a0-31f5-11e7-9cfd-2786e6aa2046'"
  5 + entity_id="uuid'be41c7a1-31f5-11e7-9cfd-2786e6aa2046'"
6 6 entity_type="DEVICE"
7 7 event_type="STATS"
8   - event_uid="be41c7a3-31f5-11e7-9cfd-2786e6aa2046"
  8 + event_uid="uuid'be41c7a3-31f5-11e7-9cfd-2786e6aa2046'"
9 9 />
10 10 <event
11   - id="be41c7a4-31f5-11e7-9cfd-2786e6aa2046"
12   - tenant_id="be41c7a0-31f5-11e7-9cfd-2786e6aa2046"
13   - entity_id="be41c7a1-31f5-11e7-9cfd-2786e6aa2046"
  11 + id="uuid'be41c7a4-31f5-11e7-9cfd-2786e6aa2046'"
  12 + tenant_id="uuid'be41c7a0-31f5-11e7-9cfd-2786e6aa2046'"
  13 + entity_id="uuid'be41c7a1-31f5-11e7-9cfd-2786e6aa2046'"
14 14 entity_type="DEVICE"
15 15 event_type="STATS"
16   - event_uid="be41c7a5-31f5-11e7-9cfd-2786e6aa2046"
  16 + event_uid="uuid'be41c7a5-31f5-11e7-9cfd-2786e6aa2046'"
17 17 />
18 18 </dataset>
\ No newline at end of file
... ...
1 1 <dataset>
2 2 <rule
3   - id="8e834e11-2e0a-11e7-83ec-f7f6dbfb4833"
4   - tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
  3 + id="uuid'8e834e11-2e0a-11e7-83ec-f7f6dbfb4833'"
  4 + tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
5 5 name="RULE_11"
6 6 weight="1"
7 7 search_text="rule_11"
8 8 plugin_token="token_1"
9 9 />
10 10 <rule
11   - id="8e834e12-2e0a-11e7-83ec-f7f6dbfb4833"
12   - tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
  11 + id="uuid'8e834e12-2e0a-11e7-83ec-f7f6dbfb4833'"
  12 + tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
13 13 name="RULE_12"
14 14 weight="1"
15 15 search_text="rule_12"
16 16 plugin_token="token_1"
17 17 />
18 18 <rule
19   - id="8e834e13-2e0a-11e7-83ec-f7f6dbfb4833"
20   - tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
  19 + id="uuid'8e834e13-2e0a-11e7-83ec-f7f6dbfb4833'"
  20 + tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
21 21 name="RULE_13"
22 22 weight="1"
23 23 search_text="rule_13"
24 24 plugin_token="token_1"
25 25 />
26 26 <rule
27   - id="8e834e14-2e0a-11e7-83ec-f7f6dbfb4833"
28   - tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
  27 + id="uuid'8e834e14-2e0a-11e7-83ec-f7f6dbfb4833'"
  28 + tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
29 29 name="RULE_14"
30 30 weight="2"
31 31 search_text="rule_14"
... ...
1 1 <dataset>
2   - <tb_user id="9cb58ba0-27c1-11e7-93ae-92361f002671"
3   - tenant_id="c97ea14e-27c1-11e7-93ae-92361f002671"
4   - customer_id="cdf9c79e-27c1-11e7-93ae-92361f002671"
  2 + <tb_user id="uuid'9cb58ba0-27c1-11e7-93ae-92361f002671'"
  3 + tenant_id="uuid'c97ea14e-27c1-11e7-93ae-92361f002671'"
  4 + customer_id="uuid'cdf9c79e-27c1-11e7-93ae-92361f002671'"
5 5 authority="SYS_ADMIN"
6 6 email="sysadm@thingsboard.org"
7 7 search_text="SYSADM SEARCH TEXT"
8 8 first_name="John"
9 9 last_name="Doe"
10 10 />
11   - <tb_user id="1312f328-27c7-11e7-93ae-92361f002671"
12   - tenant_id="1e1cd4c8-27c7-11e7-93ae-92361f002671"
  11 + <tb_user id="uuid'1312f328-27c7-11e7-93ae-92361f002671'"
  12 + tenant_id="uuid'1e1cd4c8-27c7-11e7-93ae-92361f002671'"
13 13 authority="TENANT_ADMIN"
14 14 email="tenantadm1@thingsboard.org"
15 15 search_text="TENANTADM1 SEARCH TEXT"
16 16 first_name="Samuel"
17 17 last_name="Serif"
18 18 />
19   - <tb_user id="2b090dde-27ca-11e7-93ae-92361f002671"
20   - tenant_id="1e1cd4c8-27c7-11e7-93ae-92361f002671"
  19 + <tb_user id="uuid'2b090dde-27ca-11e7-93ae-92361f002671'"
  20 + tenant_id="uuid'1e1cd4c8-27c7-11e7-93ae-92361f002671'"
21 21 authority="TENANT_ADMIN"
22 22 email="tenantadm2@thingsboard.org"
23 23 search_text="TENANTADM2 SEARCH TEXT"
24 24 first_name="Penny"
25 25 last_name="Morgan"
26 26 />
27   - <tb_user id="cc8c1ca8-27c7-11e7-93ae-92361f002671"
28   - tenant_id="d2e27caa-27c7-11e7-93ae-92361f002671"
29   - customer_id="d89e128a-27c7-11e7-93ae-92361f002671"
  27 + <tb_user id="uuid'cc8c1ca8-27c7-11e7-93ae-92361f002671'"
  28 + tenant_id="uuid'd2e27caa-27c7-11e7-93ae-92361f002671'"
  29 + customer_id="uuid'd89e128a-27c7-11e7-93ae-92361f002671'"
30 30 authority="CUSTOMER_USER"
31 31 email="customeruser@thingsboard.org"
32 32 search_text="CUSTOMER USER SEARCH TEXT"
33 33 first_name="Norman"
34 34 last_name="Gordon"
35 35 />
36   - <tb_user id="edb2de58-27c7-11e7-93ae-92361f002671"
37   - tenant_id="f229675e-27c7-11e7-93ae-92361f002671"
38   - customer_id="f7a3d4e4-27c7-11e7-93ae-92361f002671"
  36 + <tb_user id="uuid'edb2de58-27c7-11e7-93ae-92361f002671'"
  37 + tenant_id="uuid'f229675e-27c7-11e7-93ae-92361f002671'"
  38 + customer_id="uuid'f7a3d4e4-27c7-11e7-93ae-92361f002671'"
39 39 authority="REFRESH_TOKEN"
40 40 email="refreshtoken@thingsboard.org"
41 41 search_text="REFRESH TOKEN SEARCH TEXT"
... ...
1 1 <dataset>
2 2 <user_credentials
3   - id="3ed10af0-27d5-11e7-93ae-92361f002671"
4   - user_id="44ee8552-27d5-11e7-93ae-92361f002671"
  3 + id="uuid'3ed10af0-27d5-11e7-93ae-92361f002671'"
  4 + user_id="uuid'44ee8552-27d5-11e7-93ae-92361f002671'"
5 5 enabled="true"
6 6 password="password"
7 7 activate_token="ACTIVATE_TOKEN_1"
8 8 reset_token="RESET_TOKEN_1"
9 9 />
10 10 <user_credentials
11   - id="4b9e010c-27d5-11e7-93ae-92361f002671"
12   - user_id="787827e6-27d7-11e7-93ae-92361f002671"
  11 + id="uuid'4b9e010c-27d5-11e7-93ae-92361f002671'"
  12 + user_id="uuid'787827e6-27d7-11e7-93ae-92361f002671'"
13 13 enabled="true"
14 14 password="password"
15 15 activate_token="ACTIVATE_TOKEN_2"
... ...
1 1 <dataset>
2 2 <widget_type
3   - id="2b7e4c91-2dfe-11e7-94aa-f7f6dbfb4833"
4   - tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
  3 + id="uuid'2b7e4c91-2dfe-11e7-94aa-f7f6dbfb4833'"
  4 + tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
5 5 bundle_alias="BUNDLE_ALIAS_1"
6 6 alias="ALIAS1"
7 7 name="ALIAS1"
8 8 />
9 9 <widget_type
10   - id="2b7e4c92-2dfe-11e7-94aa-f7f6dbfb4833"
11   - tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
  10 + id="uuid'2b7e4c92-2dfe-11e7-94aa-f7f6dbfb4833'"
  11 + tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
12 12 bundle_alias="BUNDLE_ALIAS_1"
13 13 alias="ALIAS2"
14 14 name="ALIAS2"
15 15 />
16 16 <widget_type
17   - id="2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833"
18   - tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
  17 + id="uuid'2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833'"
  18 + tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
19 19 bundle_alias="BUNDLE_ALIAS_1"
20 20 alias="ALIAS3"
21 21 name="ALIAS3"
22 22 />
23 23 <widget_type
24   - id="2b7e4c94-2dfe-11e7-94aa-f7f6dbfb4833"
25   - tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
  24 + id="uuid'2b7e4c94-2dfe-11e7-94aa-f7f6dbfb4833'"
  25 + tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
26 26 bundle_alias="BUNDLE_ALIAS_2"
27 27 alias="ALIAS4"
28 28 name="ALIAS4"
... ...
1 1 <dataset>
2 2 <widgets_bundle
3   - id="250ac7b4-2825-11e7-93ae-92361f002671"
4   - tenant_id="250aca8e-2825-11e7-93ae-92361f002671"
  3 + id="uuid'250ac7b4-2825-11e7-93ae-92361f002671'"
  4 + tenant_id="uuid'250aca8e-2825-11e7-93ae-92361f002671'"
5 5 alias="WB1"
6 6 title="Widgets Bundle 1"
7 7 search_text="WB SEARCH TEXT 1"
8 8 />
9 9 <widgets_bundle
10   - id="3269c18a-2825-11e7-93ae-92361f002671"
11   - tenant_id="3269c18a-2825-11e7-93ae-92361f002671"
  10 + id="uuid'3269c18a-2825-11e7-93ae-92361f002671'"
  11 + tenant_id="uuid'3269c18a-2825-11e7-93ae-92361f002671'"
12 12 alias="WB2"
13 13 title="Widgets Bundle 2"
14 14 search_text="WB SEARCH TEXT 2"
15 15 />
16 16 <widgets_bundle
17   - id="44e6af4e-2825-11e7-93ae-92361f002671"
18   - tenant_id="250aca8e-2825-11e7-93ae-92361f002671"
  17 + id="uuid'44e6af4e-2825-11e7-93ae-92361f002671'"
  18 + tenant_id="uuid'250aca8e-2825-11e7-93ae-92361f002671'"
19 19 alias="WB3"
20 20 title="Widgets Bundle 3"
21 21 search_text="WB SEARCH TEXT 3"
22 22 />
23 23 <widgets_bundle
24   - id="696dc9b4-2830-11e7-93ae-92361f002671"
  24 + id="uuid'696dc9b4-2830-11e7-93ae-92361f002671'"
25 25 alias="WB4"
26 26 title="Widgets Bundle 4"
27 27 search_text="SYSTEM BUNDLE 1"
28 28 />
29 29 <widgets_bundle
30   - id="1a83fc50-2840-11e7-93ae-92361f002671"
  30 + id="uuid'1a83fc50-2840-11e7-93ae-92361f002671'"
31 31 alias="WB5"
32 32 title="Widgets Bundle 5"
33 33 search_text="SYSTEM BUNDLE 2"
34 34 />
35 35 <widgets_bundle
36   - id="6a593dde-2841-11e7-93ae-92361f002671"
  36 + id="uuid'6a593dde-2841-11e7-93ae-92361f002671'"
37 37 alias="WB6"
38 38 title="Widgets Bundle 6"
39 39 search_text="SYSTEM BUNDLE 1"
40 40 />
41 41 <widgets_bundle
42   - id="3beb4b1a-294d-11e7-93ae-92361f002671"
  42 + id="uuid'3beb4b1a-294d-11e7-93ae-92361f002671'"
43 43 alias="WB6"
44 44 title="Widgets Bundle 7"
45 45 search_text="ABC DEF"
... ...