1 files changed, 7 insertions, 15 deletions
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestCbamUtils.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestCbamUtils.java
index 7f544616..360e1d7c 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestCbamUtils.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestCbamUtils.java
@@ -102,14 +102,10 @@ public class TestCbamUtils {
     public void testFatalFailure() throws Exception {
         Exception expectedException = new Exception();
         Logger logger = Mockito.mock(Logger.class);
-        try {
-            CbamUtils.fatalFailure(logger, "msg", expectedException);
-            fail();
-        } catch (RuntimeException e) {
-            assertEquals("msg", e.getMessage());
-            assertEquals(expectedException, e.getCause());
-            verify(logger).error("msg", expectedException);
-        }
+        RuntimeException e = CbamUtils.buildFatalFailure(logger, "msg", expectedException);
+        assertEquals("msg", e.getMessage());
+        assertEquals(expectedException, e.getCause());
+        verify(logger).error("msg", expectedException);
     }
 
     /**
@@ -118,13 +114,9 @@ public class TestCbamUtils {
     @Test
     public void testFatalFailureWithNoException() throws Exception {
         Logger logger = Mockito.mock(Logger.class);
-        try {
-            CbamUtils.fatalFailure(logger, "msg");
-            fail();
-        } catch (RuntimeException e) {
-            assertEquals("msg", e.getMessage());
-            verify(logger).error("msg");
-        }
+        RuntimeException e = CbamUtils.buildFatalFailure(logger, "msg");
+        assertEquals("msg", e.getMessage());
+        verify(logger).error("msg");
     }
 
     @Test