From 6de73fc6baf05037cb884351796149b13431838f Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 6 Mar 2023 14:02:40 +0100
Subject: [PATCH] junit5: BaseAssetProfileServiceTest annotation exceptions
 refactoring

---
 .../service/BaseAssetProfileServiceTest.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java
index ea0d9abedf..091b309269 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java
+++ b/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.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.asset.Asset;
@@ -150,22 +151,26 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest {
         Assert.assertEquals(savedAssetProfile2.getId(), defaultAssetProfile.getId());
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetProfileWithEmptyName() {
         AssetProfile assetProfile = new AssetProfile();
         assetProfile.setTenantId(tenantId);
-        assetProfileService.saveAssetProfile(assetProfile);
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetProfileService.saveAssetProfile(assetProfile);
+        });
     }
 
-    @Test(expected = DataValidationException.class)
+    @Test
     public void testSaveAssetProfileWithSameName() {
         AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
         assetProfileService.saveAssetProfile(assetProfile);
         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() {
         AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
         AssetProfile savedAssetProfile = assetProfileService.saveAssetProfile(assetProfile);
@@ -174,7 +179,9 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest {
         asset.setName("Test asset");
         asset.setAssetProfileId(savedAssetProfile.getId());
         assetService.saveAsset(asset);
-        assetProfileService.deleteAssetProfile(tenantId, savedAssetProfile.getId());
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            assetProfileService.deleteAssetProfile(tenantId, savedAssetProfile.getId());
+        });
     }
 
     @Test