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

Fix testVcWithCalculatedFields_betweenTenants

pull/12707/head
Andrii Landiak 2 years ago
parent
9f2d399f4c
commit
6a759ae061
1 changed files with 4 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java

9
application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java
View File

@ -575,7 +575,7 @@ public class VersionControlTest extends AbstractControllerTest {
public void testVcWithCalculatedFields_betweenTenants() throws Exception { public void testVcWithCalculatedFields_betweenTenants() throws Exception {
Asset asset = createAsset(null, null, "Asset 1"); Asset asset = createAsset(null, null, "Asset 1");
Device device = createDevice(null, null, "Device 1", "test1"); Device device = createDevice(null, null, "Device 1", "test1");
createCalculatedField("CalculatedField1", device.getId(), asset.getId()); CalculatedField calculatedField = createCalculatedField("CalculatedField1", device.getId(), asset.getId());
String versionId = createVersion("calculated fields of asset and device", EntityType.ASSET, EntityType.DEVICE, EntityType.DEVICE_PROFILE, EntityType.ASSET_PROFILE); String versionId = createVersion("calculated fields of asset and device", EntityType.ASSET, EntityType.DEVICE, EntityType.DEVICE_PROFILE, EntityType.ASSET_PROFILE);
loginTenant2(); loginTenant2();
@ -585,16 +585,15 @@ public class VersionControlTest extends AbstractControllerTest {
Asset importedAsset = findAsset(asset.getName()); Asset importedAsset = findAsset(asset.getName());
Device importedDevice = findDevice(device.getName()); Device importedDevice = findDevice(device.getName());
CalculatedField importedCalculatedField = findCalculatedFieldByEntityId(importedDevice.getId());
checkImportedEntity(tenantId1, device, tenantId2, importedDevice); checkImportedEntity(tenantId1, device, tenantId2, importedDevice);
checkImportedEntity(tenantId1, asset, tenantId2, importedAsset); checkImportedEntity(tenantId1, asset, tenantId2, importedAsset);
List<CalculatedField> importedCalculatedFields = findCalculatedFieldsByEntityId(importedDevice.getId()); List<CalculatedField> importedCalculatedFields = findCalculatedFieldsByEntityId(importedDevice.getId());
assertThat(importedCalculatedFields).size().isOne(); assertThat(importedCalculatedFields).size().isOne();
assertThat(importedCalculatedFields.get(0)).satisfies(importedField -> { assertThat(importedCalculatedFields.get(0)).satisfies(importedField -> {
assertThat(importedField.getName()).isEqualTo(importedCalculatedField.getName()); assertThat(importedField.getName()).isEqualTo(calculatedField.getName());
assertThat(importedField.getType()).isEqualTo(importedCalculatedField.getType()); assertThat(importedField.getType()).isEqualTo(calculatedField.getType());
assertThat(importedField.getId()).isNotEqualTo(importedCalculatedField.getId()); assertThat(importedField.getId()).isNotEqualTo(calculatedField.getId());
}); });
} }

Write Preview
Loading…
Cancel
Save