X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-tosca%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Ftosca%2Fsimple%2Fconcepts%2FJpaToscaConstraintLogicalTest.java;h=de0c813e219508d83c4c43f4e75cfae55e1aef7b;hb=2e9186e1eb441b3ec47cf2a959e34b9409134aba;hp=2da46a71ec9b5616b5edec4d420c3c64caf50646;hpb=fbed360c0acdc127fdf56a99401c1aea691ce57e;p=policy%2Fmodels.git

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 2da46a71e..de0c813e2 100644
--- 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
@@ -21,148 +21,44 @@
 package org.onap.policy.models.tosca.simple.concepts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 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.JpaToscaConstraintLogical;
-import org.onap.policy.models.tosca.simple.concepts.testconcepts.DummyToscaConstraint;
 
 /**
- * DAO test for ToscaConstraintLogical.
+ * DAO test for ToscaConstraintLogicalString.
  *
  * @author Liam Fallon (liam.fallon@est.tech)
  */
 public class JpaToscaConstraintLogicalTest {
 
     @Test
-    public void testConstraintLogicalPojo() {
-        assertNotNull(new JpaToscaConstraintLogical());
-        assertNotNull(new JpaToscaConstraintLogical(new PfReferenceKey()));
+    public void testConstraintLogicalStringPojo() {
+        assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "Constraint"));
 
         try {
-            new JpaToscaConstraintLogical((PfReferenceKey) null);
+            new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, null);
             fail("test should throw an exception");
         } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
+            assertEquals("operation is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new JpaToscaConstraintLogical((JpaToscaConstraintLogical) null);
+            new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, "Hello");
             fail("test should throw an exception");
         } catch (Exception exc) {
-            assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
+            assertEquals("operation is marked @NonNull but is null", exc.getMessage());
         }
 
-        PfConceptKey tclParentKey = new PfConceptKey("tParentKey", "0.0.1");
-        PfReferenceKey tclKey = new PfReferenceKey(tclParentKey, "trigger0");
-        JpaToscaConstraintLogical tcl = new JpaToscaConstraintLogical(tclKey, JpaToscaConstraintLogical.Operation.EQ);
-
-        try {
-            new JpaToscaConstraintLogical(tcl);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("cannot copy an immutable constraint", exc.getMessage());
-        }
-
-        JpaToscaConstraintLogical tclClone1 = new JpaToscaConstraintLogical();
-        try {
-            tcl.copyTo(tclClone1);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("cannot copy an immutable constraint", exc.getMessage());
-        }
-        tclClone1 = new JpaToscaConstraintLogical(tclKey, JpaToscaConstraintLogical.Operation.EQ);
-
-        assertEquals(tcl, tclClone1);
-        assertEquals(0, tcl.compareTo(tclClone1));
-
-        assertEquals(-1, tcl.compareTo(null));
-        assertEquals(0, tcl.compareTo(tcl));
-        assertFalse(tcl.compareTo(tcl.getKey()) == 0);
-
-        JpaToscaConstraintLogical differentTcl =
-                new JpaToscaConstraintLogical(new PfReferenceKey(), JpaToscaConstraintLogical.Operation.EQ);
-        assertFalse(tcl.compareTo(differentTcl) == 0);
-
-        JpaToscaConstraintLogical otherTc =
-                new JpaToscaConstraintLogical(tclKey, JpaToscaConstraintLogical.Operation.EQ);
-        assertEquals(0, tcl.compareTo(otherTc));
-
-        try {
-            tcl.copyTo(null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("target is marked @NonNull but is null", exc.getMessage());
-        }
-
-        assertEquals(1, tcl.getKeys().size());
-        assertEquals(1, new JpaToscaConstraintLogical().getKeys().size());
-
-        JpaToscaConstraintLogical tclClone0 = new JpaToscaConstraintLogical();
-        new JpaToscaConstraintLogical().clean();
-        tcl.clean();
-        assertEquals(tclClone0, tcl);
-
-        assertFalse(new JpaToscaConstraintLogical().validate(new PfValidationResult()).isValid());
-        assertTrue(tcl.validate(new PfValidationResult()).isValid());
-
-        try {
-            tcl.validate(null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
-        }
-
-        DummyToscaConstraint dtc = new DummyToscaConstraint();
-        try {
-            new DummyToscaConstraint(dtc);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("cannot copy an immutable constraint", exc.getMessage());
-        }
-
-        try {
-            new DummyToscaConstraint((PfReferenceKey) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("key is marked @NonNull but is null", exc.getMessage());
-        }
-
-        try {
-            new DummyToscaConstraint((DummyToscaConstraint) null);
-            fail("test should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
-        }
-
-        DummyToscaConstraint dtcClone = new DummyToscaConstraint();
-
-        assertEquals(dtc, dtcClone);
-        assertEquals(dtc, dtc);
-        assertEquals(0, dtc.compareTo(dtcClone));
-        assertEquals(0, dtc.compareTo(dtc));
-        assertEquals(-1, dtc.compareTo(null));
-        assertEquals(0, dtc.compareTo(dtcClone));
-        assertFalse(dtc.compareTo(dtcClone.getKey()) == 0);
-
         try {
-            dtc.copyTo(null);
+            new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, null);
             fail("test should throw an exception");
         } catch (Exception exc) {
-            assertEquals("target is marked @NonNull but is null", exc.getMessage());
+            assertEquals("compareTo is marked @NonNull but is null", exc.getMessage());
         }
 
-        try {
-            dtc.copyTo(dtcClone);
-            fail("target should throw an exception");
-        } catch (Exception exc) {
-            assertEquals("cannot copy an immutable constraint", exc.getMessage());
-        }
+        assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "Constraint"));
     }
 }