Replaced try/catch blocks in policy/models with assertj assertions.

[policy/models.git] / models-errors / src / test / java / org / onap / policy / models / errors / concepts / ErrorResponseUtilsTest.java

diff --git a/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java b/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
index 4f4ef39..c19b18b 100644 (file)
--- a/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
+++ b/models-errors/src/test/java/org/onap/policy/models/errors/concepts/ErrorResponseUtilsTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +21,10 @@
 
 package org.onap.policy.models.errors.concepts;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
-
 import org.junit.Test;
 
 /**
@@ -32,22 +33,17 @@ import org.junit.Test;
  * @author Liam Fallon (liam.fallon@est.tech)
  */
 public class ErrorResponseUtilsTest {
+    private static final String EXCEPTION1 = "Exception 1";
+
     @Test
     public void testErrorResponseUtils() {
-        try {
-            try {
-                throw new NumberFormatException("Exception 0");
-            }
-            catch (Exception nfe) {
-                throw new IOException("Exception 1", nfe);
-            }
-        } catch (Exception ioe) {
-            ErrorResponse errorResponse = new ErrorResponse();
-            ErrorResponseUtils.getExceptionMessages(errorResponse, ioe);
+        final IOException ioe = new IOException(EXCEPTION1, new NumberFormatException("Exception 0"));
+        final ErrorResponse errorResponse = new ErrorResponse();
+        assertThat(ioe).hasMessage(EXCEPTION1);
 
-            assertEquals("Exception 1", errorResponse.getErrorMessage());
-            assertEquals("Exception 1", errorResponse.getErrorDetails().get(0));
-            assertEquals("Exception 0", errorResponse.getErrorDetails().get(1));
-        }
+        ErrorResponseUtils.getExceptionMessages(errorResponse, ioe);
+        assertEquals(EXCEPTION1, errorResponse.getErrorMessage());
+        assertEquals(EXCEPTION1, errorResponse.getErrorDetails().get(0));
+        assertEquals("Exception 0", errorResponse.getErrorDetails().get(1));
     }
 }