summaryrefslogtreecommitdiffstats
path: root/models-base/src
diff options
context:
space:
mode:
authorwaynedunican <wayne.dunican@est.tech>2020-06-18 10:46:36 +0100
committerwaynedunican <wayne.dunican@est.tech>2020-06-18 17:04:43 +0100
commitc2779afe6761065de7b06e74dd2a36886c05653f (patch)
treedc11c6f8de143b600723f0a2adf52713e4b07408 /models-base/src
parent860a08ffb33bc0ae37e87c7d76ac6633f3ad3bee (diff)
Replaced try/catch blocks in policy/models with assertj assertions.
Issue-ID: POLICY-2451 Change-Id: I095beb674196d5ec5c4dd9b93d3a56cca5ee4788 Signed-off-by: waynedunican <wayne.dunican@est.tech>
Diffstat (limited to 'models-base/src')
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfModelExceptionInfoTest.java22
1 files changed, 8 insertions, 14 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) {