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%2FJpaToscaTopologyTemplateTest.java;h=3790329b926b447cd08588840cd8797ece2091a4;hb=0f18850ed482e71db9d61fa2656e5e84c2f61f74;hp=714b6722c134b65dab5cce130a5ebff6bbbb8273;hpb=1c3fb9a68d8d27c4bdc3e177550a031b8b3ec5b0;p=policy%2Fmodels.git

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplateTest.java
index 714b6722c..3790329b9 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplateTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplateTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Copyright (C) 2019-2021 Nordix Foundation.
  *  Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,6 +58,12 @@ public class JpaToscaTopologyTemplateTest {
         assertThatThrownBy(() -> new JpaToscaTopologyTemplate((JpaToscaTopologyTemplate) null))
                 .isInstanceOf(NullPointerException.class);
 
+        assertThatThrownBy(() -> new JpaToscaTopologyTemplate((JpaToscaTopologyTemplate) null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void testTopologyTemplates() {
         PfReferenceKey tttKey = new PfReferenceKey("tst", VERSION_001, "ttt");
         JpaToscaTopologyTemplate ttt = new JpaToscaTopologyTemplate(tttKey);
 
@@ -75,12 +81,10 @@ public class JpaToscaTopologyTemplateTest {
         ttt.setPolicies(policies);
 
         JpaToscaTopologyTemplate tttClone0 = new JpaToscaTopologyTemplate(ttt);
-        assertEquals(ttt, tttClone0);
-        assertEquals(0, ttt.compareTo(tttClone0));
+        checkEqualsTopologyTemplate(ttt, tttClone0);
 
         JpaToscaTopologyTemplate tttClone1 = new JpaToscaTopologyTemplate(ttt);
-        assertEquals(ttt, tttClone1);
-        assertEquals(0, ttt.compareTo(tttClone1));
+        checkEqualsTopologyTemplate(ttt, tttClone1);
 
         assertEquals(-1, ttt.compareTo(null));
         assertEquals(0, ttt.compareTo(ttt));
@@ -97,11 +101,16 @@ public class JpaToscaTopologyTemplateTest {
         otherDt.setPolicies(policies);
         assertEquals(0, ttt.compareTo(otherDt));
 
-        assertThatThrownBy(() -> new JpaToscaTopologyTemplate((JpaToscaTopologyTemplate) null))
-                .isInstanceOf(NullPointerException.class);
-
         assertEquals(4, ttt.getKeys().size());
         assertEquals(1, new JpaToscaTopologyTemplate().getKeys().size());
+    }
+
+    @Test
+    public void testTopologyTemplateValidation() {
+        PfReferenceKey tttKey = new PfReferenceKey("tst", VERSION_001, "ttt");
+        JpaToscaTopologyTemplate ttt = new JpaToscaTopologyTemplate(tttKey);
+
+        JpaToscaTopologyTemplate tttClone0 = new JpaToscaTopologyTemplate(ttt);
 
         new JpaToscaTopologyTemplate().clean();
         ttt.clean();
@@ -124,4 +133,9 @@ public class JpaToscaTopologyTemplateTest {
 
         assertThatThrownBy(() -> ttt.validate(null)).hasMessageMatching("fieldName is marked .*on.*ull but is null");
     }
+
+    private void checkEqualsTopologyTemplate(JpaToscaTopologyTemplate ttt1, JpaToscaTopologyTemplate ttt2) {
+        assertEquals(ttt1, ttt2);
+        assertEquals(0, ttt1.compareTo(ttt2));
+    }
 }