diff options
3 files changed, 20 insertions, 33 deletions
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java index b418234c7..2e742c336 100644 --- a/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java +++ b/models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ package org.onap.policy.models.base; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import javax.ws.rs.core.Response; - import org.junit.Test; import org.onap.policy.models.errors.concepts.ErrorResponseInfo; @@ -36,19 +36,13 @@ public class PfModelExceptionInfoTest { @Test public void testExceptionInfo() { - try { - throw new PfModelException(Response.Status.ACCEPTED, "HELLO"); - } catch (PfModelException pfme) { - String errorMessage = getErrorMessage(pfme); - assertEquals("Server returned: Accepted", errorMessage.substring(0, 25)); - } + final PfModelException pfme = new PfModelException(Response.Status.ACCEPTED, "HELLO"); + assertThat(pfme).hasMessage("HELLO"); + assertEquals("Server returned: Accepted", getErrorMessage(pfme).substring(0, 25)); - try { - throw new PfModelRuntimeException(Response.Status.ACCEPTED, "HELLO"); - } catch (PfModelRuntimeException pfme) { - String errorMessage = getErrorMessage(pfme); - assertEquals("Server returned: Accepted", errorMessage.substring(0, 25)); - } + final PfModelRuntimeException pfmr = new PfModelRuntimeException(Response.Status.ACCEPTED, "HELLO"); + assertThat(pfmr).hasMessage("HELLO"); + assertEquals("Server returned: Accepted", getErrorMessage(pfmr).substring(0, 25)); } private String getErrorMessage(final ErrorResponseInfo eri) { 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 261e58a8d..c19b18b63 100644 --- 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,6 @@ /*- * ============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"); @@ -21,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; /** @@ -37,15 +37,13 @@ public class ErrorResponseUtilsTest { @Test public void testErrorResponseUtils() { - try { - throw new IOException(EXCEPTION1, new NumberFormatException("Exception 0")); - } 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(EXCEPTION1, errorResponse.getErrorMessage()); - assertEquals(EXCEPTION1, 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)); } } diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java index 318eaeede..fb01d5e8c 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java @@ -21,17 +21,15 @@ package org.onap.policy.models.tosca.simple.serialization; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; - import java.util.Map; - import org.junit.Test; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -132,7 +130,7 @@ public class MonitoringPolicySerializationTest { @Test public void testSerialization() { - try { + assertThatCode(() -> { // vCPE JpaToscaServiceTemplate serviceTemplate = deserializeMonitoringInputJson(VCPE_MON_INPUT_JSON); String serializedServiceTemplate = serializeMonitoringServiceTemplate(serviceTemplate); @@ -148,10 +146,7 @@ public class MonitoringPolicySerializationTest { serializedServiceTemplate = serializeMonitoringServiceTemplate(serviceTemplate); verifyVfwMonitoringOutputserialization(serializedServiceTemplate); - } catch (Exception e) { - LOGGER.warn("No exception should be thrown", e); - fail("No exception should be thrown"); - } + }).as("No exception should be thrown").doesNotThrowAnyException(); } private JpaToscaServiceTemplate deserializeMonitoringInputJson(String resourcePath) throws Exception { |