import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.onap.aai.babel.util.ArtifactTestUtils;
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
+ @BeforeAll
public static void setup() throws IOException {
- ArtifactTestUtils util = new ArtifactTestUtils();
- util.loadWidgetToUuidMappings();
- util.loadWidgetMappings();
+ new ArtifactTestUtils().loadWidgetMappings();
}
/**
/**
* 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
*/
/**
* 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
*/
/**
* 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
*/
/**
* 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
*/
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.
*
*/
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);
}
* 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);
/**
* Add the specified vserver to the specified VF Module.
- *
+ *
* @param vfModule
* the VF Module to update
* @param vserverWidget