Skip to content

Commit 7e834a9

Browse files
ViacheslavKlimovViacheslavKlimov
committed
Fix tests compilation
1 parent 4a4f134 commit 7e834a9

18 files changed

Lines changed: 45 additions & 45 deletions

‎ce/src/test/java/org/thingsboard/client/api/AbstractApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void setUp() throws Exception {
7171
Customer customer = new Customer();
7272
customer.setTitle("Java client test customer");
7373
customer.setTenantId(savedTenant.getId());
74-
savedCustomer = client.saveCustomer(customer, null, null, null, null);
74+
savedCustomer = client.saveCustomer(customer, null, null, null);
7575

7676
User customerUser = new User();
7777
customerUser.setAuthority(Authority.CUSTOMER_USER);

‎ce/src/test/java/org/thingsboard/client/api/AssetApiTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void testAssetLifecycle() throws ApiException {
4242
asset.setLabel("Test Asset " + i);
4343
asset.setType(((i % 2 == 0) ? "default" : "building"));
4444

45-
Asset createdAsset = client.saveAsset(asset, null, null, null, null);
45+
Asset createdAsset = client.saveAsset(asset, null, null, null);
4646
assertNotNull(createdAsset);
4747
assertNotNull(createdAsset.getId());
4848
assertEquals(assetName, createdAsset.getName());
@@ -51,15 +51,15 @@ void testAssetLifecycle() throws ApiException {
5151
}
5252

5353
// find all, check count
54-
PageDataAsset allAssets = client.getTenantAssets(100, 0, null, null, null, null, null);
54+
PageDataAsset allAssets = client.getTenantAssets(100, 0, null, null, null, null);
5555

5656
assertNotNull(allAssets);
5757
assertNotNull(allAssets.getData());
5858
int initialSize = allAssets.getData().size();
5959
assertEquals(20, initialSize, "Expected at least 20 assets, but got " + allAssets.getData().size());
6060

6161
//find all with search text, check count
62-
PageDataAsset allAssetsBySearchText = client.getTenantAssets(100, 0, null, TEST_PREFIX_2, null, null, null);
62+
PageDataAsset allAssetsBySearchText = client.getTenantAssets(100, 0, null, TEST_PREFIX_2, null, null);
6363
assertEquals(10, allAssetsBySearchText.getData().size(), "Expected exactly 10 test assets");
6464

6565
// find by id
@@ -72,7 +72,7 @@ void testAssetLifecycle() throws ApiException {
7272
client.deleteAsset(assetToDeleteId.toString());
7373

7474
// Verify the asset is deleted
75-
PageDataAsset assetsAfterDelete = client.getTenantAssets(100, 0, null, null, null, null, null);
75+
PageDataAsset assetsAfterDelete = client.getTenantAssets(100, 0, null, null, null, null);
7676
assertEquals(initialSize - 1, assetsAfterDelete.getData().size());
7777

7878
assertReturns404(() ->

‎ce/src/test/java/org/thingsboard/client/api/CalculatedFieldApiTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ void testCalculatedFieldLifecycle() throws ApiException {
5959
Device device1 = new Device();
6060
device1.setName("CalcFieldDevice1_" + timestamp);
6161
device1.setType("default");
62-
Device createdDevice1 = client.saveDevice(device1, null, null, null, null, null);
62+
Device createdDevice1 = client.saveDevice(device1, null, null, null, null);
6363

6464
Device device2 = new Device();
6565
device2.setName("CalcFieldDevice2_" + timestamp);
6666
device2.setType("default");
67-
Device createdDevice2 = client.saveDevice(device2, null, null, null, null, null);
67+
Device createdDevice2 = client.saveDevice(device2, null, null, null, null);
6868

6969
// create calculated fields on device1
7070
for (int i = 0; i < 5; i++) {
@@ -184,7 +184,7 @@ void testAlarmCalculatedFieldLifecycle() throws ApiException {
184184
Device device = new Device();
185185
device.setName("AlarmCalcFieldDevice_" + timestamp);
186186
device.setType("default");
187-
Device createdDevice = client.saveDevice(device, null, null, null, null, null);
187+
Device createdDevice = client.saveDevice(device, null, null, null, null);
188188

189189
// build the alarm calculated field configuration
190190
AlarmCalculatedFieldConfiguration config = new AlarmCalculatedFieldConfiguration();

‎ce/src/test/java/org/thingsboard/client/api/CustomerApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void testCustomerLifecycle() throws ApiException {
8383
Device device = new Device();
8484
device.setName("CustomerTestDevice_" + timestamp);
8585
device.setType("default");
86-
Device createdDevice = client.saveDevice(device, null, null, null, null, null);
86+
Device createdDevice = client.saveDevice(device, null, null, null, null);
8787

8888
String customerId = createdCustomers.get(0).getId().getId().toString();
8989
client.assignDeviceToCustomer(customerId, createdDevice.getId().getId().toString());

‎ce/src/test/java/org/thingsboard/client/api/DeviceApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void testDeviceLifecycle() throws Exception {
4545
device.setLabel("Test Device " + i);
4646
device.setType(((i % 2 == 0) ? "default" : "thermostat"));
4747

48-
Device createdDevice = client.saveDevice(device, null, null, null, null, null);
48+
Device createdDevice = client.saveDevice(device, null, null, null, null);
4949
assertNotNull(createdDevice);
5050
assertNotNull(createdDevice.getId());
5151
assertEquals(deviceName, createdDevice.getName());

‎ce/src/test/java/org/thingsboard/client/api/EntityQueryApiTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ void testFindByDeviceTypeFilter() throws Exception {
7070
Device d = new Device();
7171
d.setName(QUERY_TEST_PREFIX + "temp_" + ts + "_" + i);
7272
d.setType(type1);
73-
client.saveDevice(d, null, null, null, null, null);
73+
client.saveDevice(d, null, null, null, null);
7474
}
7575
for (int i = 0; i < 2; i++) {
7676
Device d = new Device();
7777
d.setName(QUERY_TEST_PREFIX + "hum_" + ts + "_" + i);
7878
d.setType(type2);
79-
client.saveDevice(d, null, null, null, null, null);
79+
client.saveDevice(d, null, null, null, null);
8080
}
8181

8282
// filter by single device type
@@ -126,7 +126,7 @@ void testFindByEntityNameFilter() throws Exception {
126126
Device d = new Device();
127127
d.setName(prefix + "_" + i);
128128
d.setType("default");
129-
client.saveDevice(d, null, null, null, null, null);
129+
client.saveDevice(d, null, null, null, null);
130130
}
131131

132132
EntityDataQuery query = new EntityDataQuery()
@@ -146,9 +146,9 @@ void testFindByEntityNameFilter() throws Exception {
146146
void testFindByEntityListFilter() throws Exception {
147147
long ts = System.currentTimeMillis();
148148

149-
Device d1 = client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "list_" + ts + "_1").type("default"), null, null, null, null, null);
150-
Device d2 = client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "list_" + ts + "_2").type("default"), null, null, null, null, null);
151-
client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "list_" + ts + "_3").type("default"), null, null, null, null, null);
149+
Device d1 = client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "list_" + ts + "_1").type("default"), null, null, null, null);
150+
Device d2 = client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "list_" + ts + "_2").type("default"), null, null, null, null);
151+
client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "list_" + ts + "_3").type("default"), null, null, null, null);
152152

153153
EntityDataQuery query = new EntityDataQuery()
154154
.entityFilter(new EntityListFilter()
@@ -173,7 +173,7 @@ void testFindByEntityListFilter() throws Exception {
173173
@Test
174174
void testFindBySingleEntityFilter() throws Exception {
175175
long ts = System.currentTimeMillis();
176-
Device device = client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "single_" + ts).type("default"), null, null, null, null, null);
176+
Device device = client.saveDevice(new Device().name(QUERY_TEST_PREFIX + "single_" + ts).type("default"), null, null, null, null);
177177

178178
EntityDataQuery query = new EntityDataQuery()
179179
.entityFilter(new SingleEntityFilter()
@@ -219,8 +219,8 @@ void testFindWithKeyFilter() throws Exception {
219219
String matchName = QUERY_TEST_PREFIX + "kf_match_" + ts;
220220
String noMatchName = QUERY_TEST_PREFIX + "kf_other_" + ts;
221221

222-
client.saveDevice(new Device().name(matchName).type("default"), null, null, null, null, null);
223-
client.saveDevice(new Device().name(noMatchName).type("default"), null, null, null, null, null);
222+
client.saveDevice(new Device().name(matchName).type("default"), null, null, null, null);
223+
client.saveDevice(new Device().name(noMatchName).type("default"), null, null, null, null);
224224

225225
KeyFilter nameKeyFilter = new KeyFilter()
226226
.key(new EntityKey().type(EntityKeyType.ENTITY_FIELD).key("name"))
@@ -251,7 +251,7 @@ void testFindWithPagination() throws Exception {
251251
Device d = new Device();
252252
d.setName(QUERY_TEST_PREFIX + "page_" + ts + "_" + i);
253253
d.setType("default");
254-
client.saveDevice(d, null, null, null, null, null);
254+
client.saveDevice(d, null, null, null, null);
255255
}
256256

257257
EntityDataPageLink smallPage = new EntityDataPageLink()

‎ce/src/test/java/org/thingsboard/client/api/EntityRelationApiTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ void testEntityRelationLifecycle() throws ApiException {
4646
Asset building = new Asset();
4747
building.setName(TEST_PREFIX + "Building_" + timestamp);
4848
building.setType("building");
49-
building = client.saveAsset(building, null, null, null, null);
49+
building = client.saveAsset(building, null, null, null);
5050

5151
Asset floor = new Asset();
5252
floor.setName(TEST_PREFIX + "Floor_" + timestamp);
5353
floor.setType("floor");
54-
floor = client.saveAsset(floor, null, null, null, null);
54+
floor = client.saveAsset(floor, null, null, null);
5555

5656
Device device1 = new Device();
5757
device1.setName(TEST_PREFIX + "Sensor_" + timestamp + "_1");

‎ce/src/test/java/org/thingsboard/client/api/EntityViewApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private Device createTestDevice(String suffix) throws Exception {
247247
Device device = new Device();
248248
device.setName(EV_PREFIX + "device_" + suffix);
249249
device.setType("default");
250-
return client.saveDevice(device, null, null, null, null, null);
250+
return client.saveDevice(device, null, null, null, null);
251251
}
252252

253253
private EntityView createEntityView(String name, String type, Device device) throws Exception {

‎ce/src/test/java/org/thingsboard/client/api/RpcV1ApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private Device createDevice(String name) throws ApiException {
3434
Device device = new Device();
3535
device.setName(name);
3636
device.setType("default");
37-
return client.saveDevice(device, null, null, null, null, null);
37+
return client.saveDevice(device, null, null, null, null);
3838
}
3939

4040
// -------------------------------------------------------------------------

‎ce/src/test/java/org/thingsboard/client/api/RpcV2ApiTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private Device createDevice(String name) throws ApiException {
3939
Device device = new Device();
4040
device.setName(name);
4141
device.setType("default");
42-
return client.saveDevice(device, null, null, null, null, null);
42+
return client.saveDevice(device, null, null, null, null);
4343
}
4444

4545
/**

0 commit comments

Comments
 (0)