Java 17 Upgrade

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintLogicalTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintLogicalTest.java
index d3239da..2fdd29c 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintLogicalTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaConstraintLogicalTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019, 2023 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 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,12 +21,12 @@
 
 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.assertNotEquals;
 import static org.junit.Assert.assertNull;
 
 import java.util.ArrayList;
-
 import org.junit.Test;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint;
 
@@ -36,30 +37,32 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint;
  */
 public class JpaToscaConstraintLogicalTest {
 
+    private static final String HELLO = "Hello";
+
     @Test
     public void testLogicalConstraint() {
         ToscaConstraint c0 = new ToscaConstraint();
-        c0.setEqual("Hello");
+        c0.setEqual(HELLO);
         JpaToscaConstraintLogical jc0 = new JpaToscaConstraintLogical(c0);
         assertEquals(c0, jc0.toAuthorative());
 
         ToscaConstraint c1 = new ToscaConstraint();
-        c1.setGreaterOrEqual("Hello");
+        c1.setGreaterOrEqual(HELLO);
         JpaToscaConstraintLogical jc1 = new JpaToscaConstraintLogical(c1);
         assertEquals(c1, jc1.toAuthorative());
 
         ToscaConstraint c2 = new ToscaConstraint();
-        c2.setGreaterThan("Hello");
+        c2.setGreaterThan(HELLO);
         JpaToscaConstraintLogical jc2 = new JpaToscaConstraintLogical(c2);
         assertEquals(c2, jc2.toAuthorative());
 
         ToscaConstraint c3 = new ToscaConstraint();
-        c3.setLessOrEqual("Hello");
+        c3.setLessOrEqual(HELLO);
         JpaToscaConstraintLogical jc3 = new JpaToscaConstraintLogical(c3);
         assertEquals(c3, jc3.toAuthorative());
 
         ToscaConstraint c4 = new ToscaConstraint();
-        c4.setLessThan("Hello");
+        c4.setLessThan(HELLO);
         JpaToscaConstraintLogical jc4 = new JpaToscaConstraintLogical(c4);
         assertEquals(c4, jc4.toAuthorative());
 
@@ -67,7 +70,7 @@ public class JpaToscaConstraintLogicalTest {
         JpaToscaConstraintLogical jc5 = new JpaToscaConstraintLogical(c5);
         assertNull(jc5.toAuthorative());
 
-        assertEquals(-1, jc0.compareTo(null));
+        assertThatThrownBy(() -> jc0.compareTo(null)).isInstanceOf(NullPointerException.class);
         assertEquals(0, jc0.compareTo(jc0));
         assertNotEquals(0, jc0.compareTo(new JpaToscaConstraintValidValues(new ArrayList<>())));
         assertEquals(-2, jc0.compareTo(jc1));