X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fxml%2Fgenerator%2Fmodel%2FTestVfModule.java;h=417102380095f933014001b5e67fe5f8ebdea4af;hb=f5dae47e293ae63a7a2f18230b772a699a52566f;hp=1a5986b15e84091703a19d184c10b89be6602d54;hpb=7fcc74469c941c1834cd02b54ff5ca88a53bf83b;p=aai%2Fbabel.git

diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
index 1a5986b..4171023 100644
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
@@ -33,6 +33,7 @@ import java.util.Map;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.aai.babel.util.ArtifactTestUtils;
+import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
 import org.onap.aai.babel.xml.generator.model.Widget.Type;
 
 /**
@@ -44,9 +45,15 @@ public class TestVfModule {
         System.setProperty("APP_HOME", ".");
     }
 
+    /**
+     * @throws IOException
+     *             if a properties file is not loaded
+     */
     @BeforeClass
     public static void setup() throws IOException {
-        new ArtifactTestUtils().loadWidgetToUuidMappings();
+        ArtifactTestUtils util = new ArtifactTestUtils();
+        util.loadWidgetToUuidMappings();
+        util.loadWidgetMappings();
     }
 
     /**
@@ -54,25 +61,25 @@ public class TestVfModule {
      */
     @Test
     public void testHashCode() {
-        VfModule vfModule = createNewVfModule();
+        Resource vfModule = createNewVfModule();
         populateIdentInfo(vfModule);
         assertThat(vfModule.hashCode(), is(notNullValue()));
     }
-    
+
     /**
      * Call equals() method for code coverage.
      */
     @Test
     public void testEquals() {
-        VfModule vfModuleA = createNewVfModule();
-        populateIdentInfo(vfModuleA);        
+        Resource vfModuleA = createNewVfModule();
+        populateIdentInfo(vfModuleA);
 
-       // equals() is reflexive
+        // equals() is reflexive
         assertThat(vfModuleA.equals(vfModuleA), is(true));
-        
+
         // equals() is symmetric
-        VfModule vfModuleB = createNewVfModule();
-        populateIdentInfo(vfModuleB);        
+        Resource vfModuleB = createNewVfModule();
+        populateIdentInfo(vfModuleB);
         assertThat(vfModuleA.equals(vfModuleB), is(true));
         assertThat(vfModuleB.equals(vfModuleA), is(true));
 
@@ -80,32 +87,34 @@ public class TestVfModule {
     }
 
     @Test
-    public void testAddVServerWidgetToVf() {
+    public void testAddVServerWidgetToVf() throws XmlArtifactGenerationException {
         assertAddWidget(createNewVfModule(), Type.VSERVER);
     }
 
     @Test
-    public void testAddServiceWidgetToVf() {
+    public void testAddServiceWidgetToVf() throws XmlArtifactGenerationException {
         assertAddWidget(createNewVfModule(), Type.SERVICE);
     }
 
     /**
      * Add a new Widget to a VF Module, where the Widget is NOT set as a member. N.B. For the current VF Module
      * implementation the actual Widget type is not important.
+     * @throws XmlArtifactGenerationException 
      */
     @Test
-    public void testNonMemberWidgetToVf() {
-        VfModule vfModule = createNewVfModule();
+    public void testNonMemberWidgetToVf() throws XmlArtifactGenerationException {
+        Resource vfModule = createNewVfModule();
         assertThat(vfModule.addWidget(createNewWidget(Type.SERVICE)), is(false));
         assertNumberOfWidgets(vfModule, 0);
     }
 
     /**
      * OAM Network is specifically excluded from a VF Module.
+     * @throws XmlArtifactGenerationException 
      */
     @Test
-    public void testAddOamNetworkWidgetToVf() {
-        VfModule vfModule = createNewVfModule();
+    public void testAddOamNetworkWidgetToVf() throws XmlArtifactGenerationException {
+        Resource vfModule = createNewVfModule();
         assertThat(createNewWidgetForModule(vfModule, Type.OAM_NETWORK), is(false));
         assertNumberOfWidgets(vfModule, 0);
     }
@@ -117,10 +126,11 @@ public class TestVfModule {
      * <li>Add a Volume Widget</li>
      * <li>Add a vserver Widget</li>
      * <li>Check that the Volume Widget appears under the vserver</li>
+     * @throws XmlArtifactGenerationException 
      */
     @Test
-    public void testAddVolumeWidgetToVf() {
-        VfModule vfModule = createNewVfModule();
+    public void testAddVolumeWidgetToVf() throws XmlArtifactGenerationException {
+        Resource vfModule = createNewVfModule();
 
         // Adding a Volume widget has no effect until a vserver widget is added.
         assertAddWidget(vfModule, Type.VOLUME);
@@ -149,10 +159,11 @@ public class TestVfModule {
      * <li>Add an L-Interface Widget</li>
      * <li>Add a vserver Widget</li>
      * <li>Check that the L-Interface Widget appears under the vserver</li>
+     * @throws XmlArtifactGenerationException 
      */
     @Test
-    public void testAddLinterfaceWidgetToVf() {
-        VfModule vfModule = createNewVfModule();
+    public void testAddLinterfaceWidgetToVf() throws XmlArtifactGenerationException {
+        Resource vfModule = createNewVfModule();
 
         // Adding an L-Interface widget has no effect until a vserver widget is added.
         assertFailToAddWidget(vfModule, Type.LINT);
@@ -182,10 +193,11 @@ public class TestVfModule {
      * <li>Add an L-Interface Widget</li>
      * <li>Add a vserver Widget</li>
      * <li>Check that both Widgets appear under the vserver</li>
+     * @throws XmlArtifactGenerationException 
      */
     @Test
-    public void testAddVolumeAndLinterfaceWidgetToVf() {
-        VfModule vfModule = createNewVfModule();
+    public void testAddVolumeAndLinterfaceWidgetToVf() throws XmlArtifactGenerationException {
+        Resource vfModule = createNewVfModule();
 
         // Adding a Volume widget has no effect until a vserver widget is added.
         assertAddWidget(vfModule, Type.VOLUME);
@@ -222,8 +234,9 @@ public class TestVfModule {
      * @param widgetType
      *            type of Widget to create
      * @return a new Widget
+     * @throws XmlArtifactGenerationException 
      */
-    private Widget createNewWidget(Type widgetType) {
+    private Widget createNewWidget(Type widgetType) throws XmlArtifactGenerationException {
         return Widget.getWidget(widgetType);
     }
 
@@ -232,8 +245,8 @@ public class TestVfModule {
      *
      * @return new VF Module resource
      */
-    private VfModule createNewVfModule() {
-        VfModule vfModule = new VfModule();
+    private Resource createNewVfModule() {
+        Resource vfModule = new Resource(Type.VFMODULE, true);
         assertNumberOfWidgets(vfModule, 0);
         return vfModule;
     }
@@ -244,7 +257,7 @@ public class TestVfModule {
      * @param vfModule
      *            to be populated
      */
-    private void populateIdentInfo(VfModule vfModule) {
+    private void populateIdentInfo(Resource vfModule) {
         Map<String, String> modelIdentInfo = new HashMap<>();
         modelIdentInfo.put("UUID", "dummy_uuid");
         vfModule.populateModelIdentificationInformation(modelIdentInfo);
@@ -257,8 +270,9 @@ public class TestVfModule {
      *            the VF Module to update
      * @param widgetType
      *            the type of Widget to create and add
+     * @throws XmlArtifactGenerationException 
      */
-    private void assertAddWidget(VfModule vfModule, Type widgetType) {
+    private void assertAddWidget(Resource vfModule, Type widgetType) throws XmlArtifactGenerationException {
         assertThat(createNewWidgetForModule(vfModule, widgetType), is(true));
     }
 
@@ -269,8 +283,9 @@ public class TestVfModule {
      *            the VF Module
      * @param widgetType
      *            the type of Widget to create and attempt to add
+     * @throws XmlArtifactGenerationException 
      */
-    private void assertFailToAddWidget(VfModule vfModule, Type widgetType) {
+    private void assertFailToAddWidget(Resource vfModule, Type widgetType) throws XmlArtifactGenerationException {
         assertThat(createNewWidgetForModule(vfModule, widgetType), is(false));
     }
 
@@ -282,8 +297,9 @@ public class TestVfModule {
      * @param widgetType
      *            the type of Widget to create and attempt to add
      * @return whether or not the Widget was added to the module
+     * @throws XmlArtifactGenerationException 
      */
-    private boolean createNewWidgetForModule(VfModule vfModule, Type widgetType) {
+    private boolean createNewWidgetForModule(Resource vfModule, Type widgetType) throws XmlArtifactGenerationException {
         Widget widget = createNewWidget(widgetType);
         setWidgetAsMember(vfModule, widget);
         return vfModule.addWidget(widget);
@@ -299,7 +315,7 @@ public class TestVfModule {
      * @param widget
      *            the widget to be set as the member
      */
-    private void setWidgetAsMember(VfModule vfModule, Widget widget) {
+    private void setWidgetAsMember(Resource vfModule, Widget widget) {
         String id = widget.getId();
         widget.addKey(id);
         vfModule.setMembers(Collections.singletonList(id));
@@ -311,9 +327,10 @@ public class TestVfModule {
      * @param vfModule
      *            the VF Module to update
      * @return the number of Widgets present in the vserver on creation
+     * @throws XmlArtifactGenerationException 
      */
-    private int createVserverForVf(VfModule vfModule) {
-        VServerWidget vserverWidget = (VServerWidget) createNewWidget(Type.VSERVER);
+    private int createVserverForVf(Resource vfModule) throws XmlArtifactGenerationException {
+        Widget vserverWidget = createNewWidget(Type.VSERVER);
         assertNumberOfWidgets(vfModule, 0);
         final int initialWidgetCount = addVserverToVf(vfModule, vserverWidget);
         assertNumberOfWidgets(vfModule, 1);
@@ -328,8 +345,9 @@ public class TestVfModule {
      * @param vserverWidget
      *            the Widget to add
      * @return initial widget count for the vserver Widget
+     * @throws XmlArtifactGenerationException 
      */
-    private int addVserverToVf(VfModule vfModule, VServerWidget vserverWidget) {
+    private int addVserverToVf(Resource vfModule, Widget vserverWidget) throws XmlArtifactGenerationException {
         // A vserver (initially) has Flavor, Image, Tenant and Vfc.
         final int initialWidgetCount = 4;
         assertNumberOfWidgets(vserverWidget, initialWidgetCount);