Sonar Fixes policy/models, removing model-yaml

[policy/models.git] / models-tosca / src / test / java / org / onap / policy / models / tosca / simple / concepts / JpaToscaTimeIntervalTest.java

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java
index 707e66d..ef9039a 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 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,19 +21,18 @@
 
 package org.onap.policy.models.tosca.simple.concepts;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.Date;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
 import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTimeInterval;
 
 /**
  * DAO test for ToscaTimeInterval.
@@ -41,6 +41,8 @@ import org.onap.policy.models.tosca.simple.concepts.JpaToscaTimeInterval;
  */
 public class JpaToscaTimeIntervalTest {
 
+    private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
+
     @Test
     public void testTimeIntervalPojo() {
         assertNotNull(new JpaToscaTimeInterval());
@@ -48,68 +50,28 @@ public class JpaToscaTimeIntervalTest {
         assertNotNull(new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), new Date()));
         assertNotNull(new JpaToscaTimeInterval(new JpaToscaTimeInterval()));
 
-        try {
-            new JpaToscaTimeInterval((PfReferenceKey) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(null, null, null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(null, null, new Date());
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(null, new Date(), null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(null, new Date(), new Date());
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(new PfReferenceKey(), null, null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("startTime is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(new PfReferenceKey(), null, new Date());
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("startTime is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("endTime is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new JpaToscaTimeInterval((JpaToscaTimeInterval) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
-        }
+        assertThatThrownBy(() -> new JpaToscaTimeInterval((PfReferenceKey) null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, new Date())).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(null, new Date(), null)).hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(null, new Date(), new Date()))
+                .hasMessageMatching(KEY_IS_NULL);
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, null))
+                .hasMessageMatching("startTime is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, new Date()))
+                .hasMessageMatching("startTime is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), null))
+                .hasMessageMatching("endTime is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaServiceTemplate((JpaToscaServiceTemplate) null))
+                .isInstanceOf(NullPointerException.class);
 
         PfConceptKey ttiParentKey = new PfConceptKey("tParentKey", "0.0.1");
         PfReferenceKey ttiKey = new PfReferenceKey(ttiParentKey, "trigger0");
@@ -121,33 +83,25 @@ public class JpaToscaTimeIntervalTest {
         assertEquals(tti, tdtClone0);
         assertEquals(0, tti.compareTo(tdtClone0));
 
-        JpaToscaTimeInterval tdtClone1 = new JpaToscaTimeInterval();
-        tti.copyTo(tdtClone1);
+        JpaToscaTimeInterval tdtClone1 = new JpaToscaTimeInterval(tti);
         assertEquals(tti, tdtClone1);
         assertEquals(0, tti.compareTo(tdtClone1));
 
         assertEquals(-1, tti.compareTo(null));
         assertEquals(0, tti.compareTo(tti));
-        assertFalse(tti.compareTo(tti.getKey()) == 0);
+        assertNotEquals(0, tti.compareTo(tti.getKey()));
 
         PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", "0.0.1", "OtherTimeInterval");
         JpaToscaTimeInterval otherDt = new JpaToscaTimeInterval(otherDtKey);
 
-        assertFalse(tti.compareTo(otherDt) == 0);
+        assertNotEquals(0, tti.compareTo(otherDt));
         otherDt.setKey(ttiKey);
-        assertFalse(tti.compareTo(otherDt) == 0);
+        assertNotEquals(0, tti.compareTo(otherDt));
         otherDt.setStartTime(startTime);
-        assertFalse(tti.compareTo(otherDt) == 0);
+        assertNotEquals(0, tti.compareTo(otherDt));
         otherDt.setEndTime(endTime);
         assertEquals(0, tti.compareTo(otherDt));
 
-        try {
-            tti.copyTo(null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("target is marked @NonNull but is null", exc.getMessage());
-        }
-
         assertEquals(1, tti.getKeys().size());
         assertEquals(1, new JpaToscaTimeInterval().getKeys().size());
 
@@ -172,11 +126,6 @@ public class JpaToscaTimeIntervalTest {
         tti.setEndTime(endTime);
         assertTrue(tti.validate(new PfValidationResult()).isValid());
 
-        try {
-            tti.validate(null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
-        }
+        assertThatThrownBy(() -> tti.validate(null)).hasMessageMatching("resultIn is marked .*on.*ull but is null");
     }
 }