Restructure for authorative models

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/ToscaServiceTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
similarity index 70%
rename from models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/ToscaServiceTemplateTest.java
rename to models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
index aad410e..4569d42 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/ToscaServiceTemplateTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
@@ -33,93 +33,93 @@ 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.ToscaDataType;
-import org.onap.policy.models.tosca.simple.concepts.ToscaDataTypes;
-import org.onap.policy.models.tosca.simple.concepts.ToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.ToscaPolicyTypes;
-import org.onap.policy.models.tosca.simple.concepts.ToscaServiceTemplate;
-import org.onap.policy.models.tosca.simple.concepts.ToscaTopologyTemplate;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataTypes;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyTypes;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaTopologyTemplate;
 
 /**
  * DAO test for ToscaDatatype.
  *
  * @author Liam Fallon (liam.fallon@est.tech)
  */
-public class ToscaServiceTemplateTest {
+public class JpaToscaServiceTemplateTest {
 
     @Test
     public void testServiceTemplatePojo() {
-        assertNotNull(new ToscaServiceTemplate());
-        assertNotNull(new ToscaServiceTemplate(new PfConceptKey()));
-        assertNotNull(new ToscaServiceTemplate(new PfConceptKey(), ""));
-        assertNotNull(new ToscaServiceTemplate(new ToscaServiceTemplate()));
+        assertNotNull(new JpaToscaServiceTemplate());
+        assertNotNull(new JpaToscaServiceTemplate(new PfConceptKey()));
+        assertNotNull(new JpaToscaServiceTemplate(new PfConceptKey(), ""));
+        assertNotNull(new JpaToscaServiceTemplate(new JpaToscaServiceTemplate()));
 
         try {
-            new ToscaServiceTemplate((PfConceptKey) null);
+            new JpaToscaServiceTemplate((PfConceptKey) null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("key is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaServiceTemplate(null, null);
+            new JpaToscaServiceTemplate(null, null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("key is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaServiceTemplate(null, "");
+            new JpaToscaServiceTemplate(null, "");
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("key is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaServiceTemplate(new PfConceptKey(), null);
+            new JpaToscaServiceTemplate(new PfConceptKey(), null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("toscaDefinitionsVersion is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaServiceTemplate((ToscaServiceTemplate) null);
+            new JpaToscaServiceTemplate((JpaToscaServiceTemplate) null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
         }
 
         PfConceptKey tstKey = new PfConceptKey("tst", "0.0.1");
-        ToscaServiceTemplate tst = new ToscaServiceTemplate(tstKey, "Tosca Version");
+        JpaToscaServiceTemplate tst = new JpaToscaServiceTemplate(tstKey, "Tosca Version");
 
         PfConceptKey dataTypeKey = new PfConceptKey("DataType", "0.0.1");
-        ToscaDataType dataType0 = new ToscaDataType(dataTypeKey);
+        JpaToscaDataType dataType0 = new JpaToscaDataType(dataTypeKey);
         PfConceptKey dtsKey = new PfConceptKey("dts", "0.0.1");
-        Map<PfConceptKey, ToscaDataType> dataTypeMap = new TreeMap<>();
+        Map<PfConceptKey, JpaToscaDataType> dataTypeMap = new TreeMap<>();
         dataTypeMap.put(dataTypeKey, dataType0);
-        ToscaDataTypes dataTypes = new ToscaDataTypes(dtsKey, dataTypeMap);
+        JpaToscaDataTypes dataTypes = new JpaToscaDataTypes(dtsKey, dataTypeMap);
         tst.setDataTypes(dataTypes);
         assertEquals(dataTypes, tst.getDataTypes());
 
         PfConceptKey policyTypeKey = new PfConceptKey("DataType", "0.0.1");
-        ToscaPolicyType policyType0 = new ToscaPolicyType(policyTypeKey);
+        JpaToscaPolicyType policyType0 = new JpaToscaPolicyType(policyTypeKey);
         PfConceptKey ptsKey = new PfConceptKey("dts", "0.0.1");
-        Map<PfConceptKey, ToscaPolicyType> policyTypeMap = new TreeMap<>();
+        Map<PfConceptKey, JpaToscaPolicyType> policyTypeMap = new TreeMap<>();
         policyTypeMap.put(policyTypeKey, policyType0);
-        ToscaPolicyTypes policyTypes = new ToscaPolicyTypes(ptsKey, policyTypeMap);
+        JpaToscaPolicyTypes policyTypes = new JpaToscaPolicyTypes(ptsKey, policyTypeMap);
         tst.setPolicyTypes(policyTypes);
         assertEquals(policyTypes, tst.getPolicyTypes());
 
         PfReferenceKey tttKey = new PfReferenceKey(tstKey, "TopologyTemplate");
-        ToscaTopologyTemplate ttt = new ToscaTopologyTemplate(tttKey);
+        JpaToscaTopologyTemplate ttt = new JpaToscaTopologyTemplate(tttKey);
         tst.setTopologyTemplate(ttt);
         assertEquals(ttt, tst.getTopologyTemplate());
 
-        ToscaServiceTemplate tttClone0 = new ToscaServiceTemplate(tst);
+        JpaToscaServiceTemplate tttClone0 = new JpaToscaServiceTemplate(tst);
         assertEquals(tst, tttClone0);
         assertEquals(0, tst.compareTo(tttClone0));
 
-        ToscaServiceTemplate tttClone1 = new ToscaServiceTemplate();
+        JpaToscaServiceTemplate tttClone1 = new JpaToscaServiceTemplate();
         tst.copyTo(tttClone1);
         assertEquals(tst, tttClone1);
         assertEquals(0, tst.compareTo(tttClone1));
@@ -129,7 +129,7 @@ public class ToscaServiceTemplateTest {
         assertFalse(tst.compareTo(tst.getKey()) == 0);
 
         PfConceptKey otherDtKey = new PfConceptKey("otherDt", "0.0.1");
-        ToscaServiceTemplate otherDt = new ToscaServiceTemplate(otherDtKey);
+        JpaToscaServiceTemplate otherDt = new JpaToscaServiceTemplate(otherDtKey);
 
         assertFalse(tst.compareTo(otherDt) == 0);
         otherDt.setKey(tstKey);
@@ -151,13 +151,13 @@ public class ToscaServiceTemplateTest {
         }
 
         assertEquals(6, tst.getKeys().size());
-        assertEquals(1, new ToscaServiceTemplate().getKeys().size());
+        assertEquals(1, new JpaToscaServiceTemplate().getKeys().size());
 
-        new ToscaServiceTemplate().clean();
+        new JpaToscaServiceTemplate().clean();
         tst.clean();
         assertEquals(tttClone0, tst);
 
-        assertFalse(new ToscaServiceTemplate().validate(new PfValidationResult()).isValid());
+        assertFalse(new JpaToscaServiceTemplate().validate(new PfValidationResult()).isValid());
         assertTrue(tst.validate(new PfValidationResult()).isValid());
 
         tst.setDescription(null);