X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fxml%2Fgenerator%2Fmodel%2FTestModel.java;h=2bd6fc7cd2db3b4e53d3e8625eab55d93c41f654;hb=49a1e7a2d020b9413e08ba34d2af83c1c6604d54;hp=fbac64c0267acecce2a9772aa7b822190d1f6f01;hpb=5b6b32d3ab0dc27c72351f6aa9e0bdef8d599e13;p=aai%2Fbabel.git

diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
index fbac64c..2bd6fc7 100644
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
@@ -18,6 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.babel.xml.generator.model;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -28,6 +29,8 @@ import static org.junit.Assert.assertThat;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +45,7 @@ import org.onap.aai.babel.xml.generator.types.ModelType;
 public class TestModel {
 
     private Service serviceModel = new Service();
-    private Resource resourceModel = new VirtualFunction();
+    private List<Resource> resourceModels = Arrays.asList(new VirtualFunction());
     private Widget widgetModel = new OamNetwork();
     private Model anonymousModel;
 
@@ -50,6 +53,14 @@ public class TestModel {
         System.setProperty("APP_HOME", ".");
     }
 
+    /**
+     * Load the Widget to UUID mappings from the Artifact Generator properties.
+     *
+     * @throws FileNotFoundException
+     *             if the properties file is missing
+     * @throws IOException
+     *             if the properties file is not loaded
+     */
     @Before
     public void setup() throws FileNotFoundException, IOException {
         InputStream in = TestModel.class.getClassLoader().getResourceAsStream("artifact-generator.properties");
@@ -83,6 +94,8 @@ public class TestModel {
         assertThat(Model.getModelFor("any.unknown.type"), is(nullValue()));
 
         assertThat(Model.getModelFor("org.openecomp.resource.vf.allottedResource"), instanceOf(AllotedResource.class));
+        assertThat(Model.getModelFor("org.openecomp.resource.vf.allottedResource.with.sub.type"),
+                instanceOf(AllotedResource.class));
         assertThat(Model.getModelFor("org.openecomp.resource.vfc.AllottedResource"),
                 instanceOf(ProvidingService.class));
         assertThat(Model.getModelFor("org.openecomp.resource.vfc"), instanceOf(VServerWidget.class));
@@ -100,13 +113,15 @@ public class TestModel {
 
     @Test
     public void testGetCardinality() {
-        resourceModel.getCardinality();
+        resourceModels.get(0).getCardinality();
     }
 
     @Test
     public void testGetModelType() {
         assertThat(serviceModel.getModelType(), is(ModelType.SERVICE));
-        assertThat(resourceModel.getModelType(), is(ModelType.RESOURCE));
+        for (Resource resourceModel : resourceModels) {
+            assertThat(resourceModel.getModelType(), is(ModelType.RESOURCE));
+        }
         assertThat(widgetModel.getModelType(), is(ModelType.WIDGET));
         assertThat(anonymousModel.getModelType(), is(nullValue()));
     }
@@ -119,6 +134,9 @@ public class TestModel {
     @Test(expected = org.onap.aai.babel.xml.generator.error.IllegalAccessException.class)
     public void testGetModelNameVersionIdIsUnsupported() {
         assertThat(widgetModel.getModelNameVersionId(), is(nullValue()));
+        assertThat(resourceModels.get(0).getModelType(), is(ModelType.RESOURCE));
+        assertThat(widgetModel.getModelType(), is(ModelType.WIDGET));
+        assertThat(anonymousModel.getModelType(), is(nullValue()));
     }
 
 }