Browse Source

junit5: BaseAssetProfileServiceTest annotation exceptions refactoring

pull/8174/head
Oleksandra Matviienko 4 years ago
parent
commit
6de73fc6ba
  1. 19
      dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java

19
dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java

@ -23,6 +23,7 @@ import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.thingsboard.common.util.ThingsBoardThreadFactory; import org.thingsboard.common.util.ThingsBoardThreadFactory;
import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.asset.Asset;
@ -150,22 +151,26 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest {
Assert.assertEquals(savedAssetProfile2.getId(), defaultAssetProfile.getId()); Assert.assertEquals(savedAssetProfile2.getId(), defaultAssetProfile.getId());
} }
@Test(expected = DataValidationException.class) @Test
public void testSaveAssetProfileWithEmptyName() { public void testSaveAssetProfileWithEmptyName() {
AssetProfile assetProfile = new AssetProfile(); AssetProfile assetProfile = new AssetProfile();
assetProfile.setTenantId(tenantId); assetProfile.setTenantId(tenantId);
assetProfileService.saveAssetProfile(assetProfile); Assertions.assertThrows(DataValidationException.class, () -> {
assetProfileService.saveAssetProfile(assetProfile);
});
} }
@Test(expected = DataValidationException.class) @Test
public void testSaveAssetProfileWithSameName() { public void testSaveAssetProfileWithSameName() {
AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile"); AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
assetProfileService.saveAssetProfile(assetProfile); assetProfileService.saveAssetProfile(assetProfile);
AssetProfile assetProfile2 = this.createAssetProfile(tenantId, "Asset Profile"); AssetProfile assetProfile2 = this.createAssetProfile(tenantId, "Asset Profile");
assetProfileService.saveAssetProfile(assetProfile2); Assertions.assertThrows(DataValidationException.class, () -> {
assetProfileService.saveAssetProfile(assetProfile2);
});
} }
@Test(expected = DataValidationException.class) @Test
public void testDeleteAssetProfileWithExistingAsset() { public void testDeleteAssetProfileWithExistingAsset() {
AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile"); AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
AssetProfile savedAssetProfile = assetProfileService.saveAssetProfile(assetProfile); AssetProfile savedAssetProfile = assetProfileService.saveAssetProfile(assetProfile);
@ -174,7 +179,9 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest {
asset.setName("Test asset"); asset.setName("Test asset");
asset.setAssetProfileId(savedAssetProfile.getId()); asset.setAssetProfileId(savedAssetProfile.getId());
assetService.saveAsset(asset); assetService.saveAsset(asset);
assetProfileService.deleteAssetProfile(tenantId, savedAssetProfile.getId()); Assertions.assertThrows(DataValidationException.class, () -> {
assetProfileService.deleteAssetProfile(tenantId, savedAssetProfile.getId());
});
} }
@Test @Test

Loading…
Cancel
Save