X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2FDashboardUserManagerTest.java;fp=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2FDashboardUserManagerTest.java;h=68887740c0e0fd1606397bd7f7af259b1a9ec09e;hb=329b53efb578dd41a6de31eafd5f228f3f10987c;hp=a18115995f034a77622a8525de9ad6f7cda08a27;hpb=c204fe007d1569ad0ad9fbdb1041571ccf32696e;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java
index a1811599..68887740 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.onap.portalsdk.core.restful.domain.EcompRole;
@@ -59,12 +60,9 @@ public class DashboardUserManagerTest {
 		EcompUser user = createEcompUser(loginId);
 		dum.createUser(user);
 		logger.info("Created user {}", user);
-		try {
+		Assertions.assertThrows(PortalAPIException.class, () -> {
 			dum.createUser(user);
-			throw new Exception("Unexpected success");
-		} catch (PortalAPIException ex) {
-			logger.info("caught expected exception: {}", ex.toString());
-		}
+		});
 		Assert.assertFalse(dum.getUsers().isEmpty());
 		EcompUser fetched = dum.getUser(loginId);
 		Assert.assertEquals(fetched, user);
@@ -73,11 +71,9 @@ public class DashboardUserManagerTest {
 		EcompUser missing = dum.getUser("foo");
 		Assert.assertNull(missing);
 		EcompUser unk = createEcompUser("unknown");
-		try {
+		Assertions.assertThrows(PortalAPIException.class, () -> {
 			dum.updateUser("unk", unk);
-		} catch (PortalAPIException ex) {
-			logger.info("caught expected exception: {}", ex.toString());
-		}
+		});
 	}
 
 }