Restructure for authorative models

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/ToscaDataTypesTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataTypesTest.java
similarity index 73%
rename from models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/ToscaDataTypesTest.java
rename to models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataTypesTest.java
index b92b6b0..ce90e37 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/ToscaDataTypesTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaDataTypesTest.java
@@ -28,48 +28,48 @@ import java.util.TreeMap;
 
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
-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.JpaToscaDataType;
+import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataTypes;
 
-public class ToscaDataTypesTest {
+public class JpaToscaDataTypesTest {
 
     @Test
     public void testDataTypes() {
-        assertNotNull(new ToscaDataTypes());
-        assertNotNull(new ToscaDataTypes(new PfConceptKey()));
-        assertNotNull(new ToscaDataTypes(new PfConceptKey(), new TreeMap<PfConceptKey, ToscaDataType>()));
-        assertNotNull(new ToscaDataTypes(new ToscaDataTypes()));
+        assertNotNull(new JpaToscaDataTypes());
+        assertNotNull(new JpaToscaDataTypes(new PfConceptKey()));
+        assertNotNull(new JpaToscaDataTypes(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaDataType>()));
+        assertNotNull(new JpaToscaDataTypes(new JpaToscaDataTypes()));
 
         try {
-            new ToscaDataTypes((PfConceptKey) null);
+            new JpaToscaDataTypes((PfConceptKey) null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("key is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaDataTypes((ToscaDataTypes) null);
+            new JpaToscaDataTypes((JpaToscaDataTypes) null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaDataTypes(null, null);
+            new JpaToscaDataTypes(null, null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("key is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaDataTypes(new PfConceptKey(), null);
+            new JpaToscaDataTypes(new PfConceptKey(), null);
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
         }
 
         try {
-            new ToscaDataTypes(null, new TreeMap<PfConceptKey, ToscaDataType>());
+            new JpaToscaDataTypes(null, new TreeMap<PfConceptKey, JpaToscaDataType>());
             fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("key is marked @NonNull but is null", exc.getMessage());