Java 17 Upgrade

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintTest.java
index ce5ace1..02e3fda 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2021, 2023 Nordix Foundation.
  *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,13 +45,16 @@ public class JpaToscaConstraintTest {
         assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT));
 
         assertThatThrownBy(() -> new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, null))
-                        .hasMessage("operation is marked @NonNull but is null");
+                .hasMessageMatching("operation is marked .*on.*ull but is null");
 
         assertThatThrownBy(() -> new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, "Hello"))
-                        .hasMessage("operation is marked @NonNull but is null");
+                .hasMessageMatching("operation is marked .*on.*ull but is null");
 
         assertThatThrownBy(() -> new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, null))
-                        .hasMessage("compareTo is marked @NonNull but is null");
+                .hasMessageMatching("compareTo is marked .*on.*ull but is null");
+
+        assertThatThrownBy(() -> new JpaToscaConstraintInRange((List<String>) null))
+                .hasMessageMatching("rangeValues is marked .*on.*ull but is null");
 
         assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT));
 
@@ -65,7 +68,7 @@ public class JpaToscaConstraintTest {
         validValues.add("hello");
         validValues.add("goodbye");
         JpaToscaConstraintValidValues cvv0 = new JpaToscaConstraintValidValues(validValues);
-        assertEquals(-1, cvv0.compareTo(null));
+        assertThatThrownBy(() -> cvv0.compareTo(null)).isInstanceOf(NullPointerException.class);
         assertEquals(0, cvv0.compareTo(cvv0));
         assertNotEquals(0, cvv0.compareTo(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT)));
         JpaToscaConstraintValidValues cvv1 = new JpaToscaConstraintValidValues(validValues);
@@ -73,5 +76,26 @@ public class JpaToscaConstraintTest {
 
         cvv1.fromAuthorative(new ToscaConstraint());
         assertNotNull(cvv1.getValidValues());
+
+        List<String> rangeValues = new ArrayList<>();
+        rangeValues.add("hello");
+        rangeValues.add("goodbye");
+        JpaToscaConstraintInRange cir0 = new JpaToscaConstraintInRange(rangeValues);
+        assertThatThrownBy(() -> cir0.compareTo(null)).isInstanceOf(NullPointerException.class);
+        assertEquals(0, cir0.compareTo(cir0));
+        assertNotEquals(0, cir0.compareTo(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT)));
+        JpaToscaConstraintInRange cir1 = new JpaToscaConstraintInRange(rangeValues);
+        assertEquals(0, cir0.compareTo(cir1));
+
+        ToscaConstraint tc0 = new ToscaConstraint();
+        tc0.setRangeValues(rangeValues);
+        JpaToscaConstraintInRange cir2 = new JpaToscaConstraintInRange(tc0);
+        assertEquals(0, cir0.compareTo(cir2));
+
+        cir1.fromAuthorative(new ToscaConstraint());
+        assertNotNull(cir1.getRangeValues());
+
+        ToscaConstraint tc1 = cir2.toAuthorative();
+        assertEquals(tc0, tc1);
     }
 }