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=88555ee2fa6ce9a8aa1df8df50c191bc0f5d0e3e;hb=bfde3ef00beb3c6f31cebfd12e90b9b9cdcc492e;hp=14f3798e39d563bd0fd2831e40ceac84a2f2296a;hpb=895cafe7aaf5f462e0bf3c3a2ab7fcb863bba78e;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 14f3798..88555ee 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
@@ -41,16 +41,14 @@ import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
 public class TestVfModule {
 
     /**
-     * Load the Widget Configuration, including the type mappings and the UUID mappings.
+     * Load the Widget mappings configuration.
      *
      * @throws IOException
      *             if the mappings configuration cannot be loaded
      */
     @BeforeClass
     public static void setup() throws IOException {
-        ArtifactTestUtils util = new ArtifactTestUtils();
-        util.loadWidgetToUuidMappings();
-        util.loadWidgetMappings();
+        new ArtifactTestUtils().loadWidgetMappings();
     }
 
     /**
@@ -96,20 +94,20 @@ public class TestVfModule {
     /**
      * 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
      *             if the Widget mapping configuration is missing
      */
     @Test
     public void testNonMemberWidgetToVf() throws XmlArtifactGenerationException {
         Resource vfModule = createNewVfModule();
-        assertThat(vfModule.addWidget(createNewWidget(WidgetType.valueOf("SERVICE"))), is(false));
+        assertThat(vfModule.addWidget(Widget.createWidget("SERVICE")), is(false));
         assertNumberOfWidgets(vfModule, 0);
     }
 
     /**
      * OAM Network is specifically excluded from a VF Module.
-     * 
+     *
      * @throws XmlArtifactGenerationException
      *             if the Widget mapping configuration is missing
      */
@@ -122,12 +120,12 @@ public class TestVfModule {
 
     /**
      * Add a Volume Widget to a VF Module via a vserver Widget.
-     * 
+     *
      * <li>Create a VF Module</li>
      * <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
      *             if the Widget mapping configuration is missing
      */
@@ -157,12 +155,12 @@ public class TestVfModule {
 
     /**
      * Add an L-Interface Widget to a VF Module via a vserver Widget.
-     * 
+     *
      * <li>Create a VF Module</li>
      * <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
      *             if the Widget mapping configuration is missing
      */
@@ -192,13 +190,13 @@ public class TestVfModule {
 
     /**
      * Add a Volume and an L-Interface Widget to a VF Module via a vserver Widget.
-     * 
+     *
      * <li>Create a VF Module</li>
      * <li>Add a Volume Widget</li>
      * <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
      *             if the Widget mapping configuration is missing
      */
@@ -235,19 +233,6 @@ public class TestVfModule {
         assertThat(model.getWidgets(), hasSize(numberOfWidgets));
     }
 
-    /**
-     * Use the static Factory method to create a new Widget.
-     *
-     * @param widgetType
-     *            type of Widget to create
-     * @return a new Widget
-     * @throws XmlArtifactGenerationException
-     *             if the Widget mapping configuration is missing
-     */
-    private Widget createNewWidget(WidgetType widgetType) throws XmlArtifactGenerationException {
-        return Widget.getWidget(widgetType);
-    }
-
     /**
      * Create a new VF Module that contains zero widgets and has no members.
      *
@@ -312,7 +297,7 @@ public class TestVfModule {
      */
     private boolean createNewWidgetForModule(Resource vfModule, WidgetType widgetType)
             throws XmlArtifactGenerationException {
-        Widget widget = createNewWidget(widgetType);
+        Widget widget = Widget.createWidget(widgetType);
         setWidgetAsMember(vfModule, widget);
         return vfModule.addWidget(widget);
     }
@@ -343,7 +328,7 @@ public class TestVfModule {
      *             if the Widget mapping configuration is missing
      */
     private int createVserverForVf(Resource vfModule) throws XmlArtifactGenerationException {
-        Widget vserverWidget = createNewWidget(WidgetType.valueOf("VSERVER"));
+        Widget vserverWidget = Widget.createWidget("VSERVER");
         assertNumberOfWidgets(vfModule, 0);
         final int initialWidgetCount = addVserverToVf(vfModule, vserverWidget);
         assertNumberOfWidgets(vfModule, 1);
@@ -352,7 +337,7 @@ public class TestVfModule {
 
     /**
      * Add the specified vserver to the specified VF Module.
-     * 
+     *
      * @param vfModule
      *            the VF Module to update
      * @param vserverWidget