summaryrefslogtreecommitdiffstats
path: root/models-tosca/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-tosca/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-tosca/src')
-rw-r--r--models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java11
1 files changed, 3 insertions, 8 deletions
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 {