* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2019 European Software Marketing Ltd.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.junit.Assert.assertThat;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
+import org.onap.aai.babel.util.ArtifactTestUtils;
import org.onap.aai.babel.xml.generator.model.Widget.Type;
/**
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
- */
@BeforeClass
- public static void setup() throws FileNotFoundException, IOException {
- InputStream in = TestVfModule.class.getClassLoader().getResourceAsStream("artifact-generator.properties");
- Properties properties = new Properties();
- properties.load(in);
- in.close();
- WidgetConfigurationUtil.setConfig(properties);
+ public static void setup() throws IOException {
+ new ArtifactTestUtils().loadWidgetToUuidMappings();
}
/**
- * Call equals() and hashCode() methods for code coverage.
+ * Call hashCode() method for code coverage.
*/
@Test
- public void testEqualsHashCode() {
- VfModule vfModule = createNewVfModule();
+ public void testHashCode() {
+ Resource vfModule = createNewVfModule();
populateIdentInfo(vfModule);
assertThat(vfModule.hashCode(), is(notNullValue()));
- assertThat(vfModule.equals(vfModule), is(true));
- // Tests that the overridden equals() method correctly returns false for a different type of Object
- // This is necessary to achieve complete code coverage
- assertThat(vfModule.equals("string"), is(false)); // NOSONAR
+ }
+
+ /**
+ * Call equals() method for code coverage.
+ */
+ @Test
+ public void testEquals() {
+ Resource vfModuleA = createNewVfModule();
+ populateIdentInfo(vfModuleA);
+
+ // equals() is reflexive
+ assertThat(vfModuleA.equals(vfModuleA), is(true));
+
+ // equals() is symmetric
+ Resource vfModuleB = createNewVfModule();
+ populateIdentInfo(vfModuleB);
+ assertThat(vfModuleA.equals(vfModuleB), is(true));
+ assertThat(vfModuleB.equals(vfModuleA), is(true));
+
+ assertThat(vfModuleA.equals(null), is(false));
}
@Test
*/
@Test
public void testNonMemberWidgetToVf() {
- VfModule vfModule = createNewVfModule();
+ Resource vfModule = createNewVfModule();
assertThat(vfModule.addWidget(createNewWidget(Type.SERVICE)), is(false));
assertNumberOfWidgets(vfModule, 0);
}
*/
@Test
public void testAddOamNetworkWidgetToVf() {
- VfModule vfModule = createNewVfModule();
+ Resource vfModule = createNewVfModule();
assertThat(createNewWidgetForModule(vfModule, Type.OAM_NETWORK), is(false));
assertNumberOfWidgets(vfModule, 0);
}
*/
@Test
public void testAddVolumeWidgetToVf() {
- VfModule vfModule = createNewVfModule();
+ Resource vfModule = createNewVfModule();
// Adding a Volume widget has no effect until a vserver widget is added.
assertAddWidget(vfModule, Type.VOLUME);
*/
@Test
public void testAddLinterfaceWidgetToVf() {
- VfModule vfModule = createNewVfModule();
+ Resource vfModule = createNewVfModule();
// Adding an L-Interface widget has no effect until a vserver widget is added.
assertFailToAddWidget(vfModule, Type.LINT);
*/
@Test
public void testAddVolumeAndLinterfaceWidgetToVf() {
- VfModule vfModule = createNewVfModule();
+ Resource vfModule = createNewVfModule();
// Adding a Volume widget has no effect until a vserver widget is added.
assertAddWidget(vfModule, Type.VOLUME);
/**
* Use the static Factory method to create a new Widget.
*
- * @param widgetType type of Widget to create
+ * @param widgetType
+ * type of Widget to create
* @return a new Widget
*/
private Widget createNewWidget(Type widgetType) {
*
* @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;
}
/**
* Set up some dummy Model Identification properties.
*
- * @param vfModule to be populated
+ * @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);
/**
* Create a new Widget and assert that it is successfully added to the VF Module.
*
- * @param vfModule the VF Module to update
- * @param widgetType the type of Widget to create and add
+ * @param vfModule
+ * the VF Module to update
+ * @param widgetType
+ * the type of Widget to create and add
*/
- private void assertAddWidget(VfModule vfModule, Type widgetType) {
+ private void assertAddWidget(Resource vfModule, Type widgetType) {
assertThat(createNewWidgetForModule(vfModule, widgetType), is(true));
}
/**
* Create a new Widget and assert that it cannot be added to the VF Module.
*
- * @param vfModule the VF Module
- * @param widgetType the type of Widget to create and attempt to add
+ * @param vfModule
+ * the VF Module
+ * @param widgetType
+ * the type of Widget to create and attempt to add
*/
- private void assertFailToAddWidget(VfModule vfModule, Type widgetType) {
+ private void assertFailToAddWidget(Resource vfModule, Type widgetType) {
assertThat(createNewWidgetForModule(vfModule, widgetType), is(false));
}
/**
* Create a new widget, make it a member of the VF Module, then try to add it.
*
- * @param vfModule the VF Module to update
- * @param widgetType the type of Widget to create and attempt to add
+ * @param vfModule
+ * the VF Module to update
+ * @param widgetType
+ * the type of Widget to create and attempt to add
* @return whether or not the Widget was added to the module
*/
- private boolean createNewWidgetForModule(VfModule vfModule, Type widgetType) {
+ private boolean createNewWidgetForModule(Resource vfModule, Type widgetType) {
Widget widget = createNewWidget(widgetType);
setWidgetAsMember(vfModule, widget);
return vfModule.addWidget(widget);
* to its set of keys, and by then setting the VF Module's members to a Singleton List comprised of this ID. These
* updates allow the Widget to be successfully added to the VF Module. (Non-member Widgets cannot be added.)
*
- * @param vfModule the module for which members are overwritten
- * @param widget the widget to be set as the member
+ * @param vfModule
+ * the module for which members are overwritten
+ * @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));
/**
* Create a vserver widget and add it to the specified VF Module.
*
- * @param vfModule the VF Module to update
+ * @param vfModule
+ * the VF Module to update
* @return the number of Widgets present in the vserver on creation
*/
- private int createVserverForVf(VfModule vfModule) {
+ private int createVserverForVf(Resource vfModule) {
VServerWidget vserverWidget = (VServerWidget) createNewWidget(Type.VSERVER);
assertNumberOfWidgets(vfModule, 0);
final int initialWidgetCount = addVserverToVf(vfModule, vserverWidget);
/**
* Add the specified vserver to the specified VF Module.
*
- * @param vfModule the VF Module to update
- * @param vserverWidget the Widget to add
+ * @param vfModule
+ * the VF Module to update
+ * @param vserverWidget
+ * the Widget to add
* @return initial widget count for the vserver Widget
*/
- private int addVserverToVf(VfModule vfModule, VServerWidget vserverWidget) {
+ private int addVserverToVf(Resource vfModule, VServerWidget vserverWidget) {
// A vserver (initially) has Flavor, Image, Tenant and Vfc.
final int initialWidgetCount = 4;
assertNumberOfWidgets(vserverWidget, initialWidgetCount);
Code Review / aai / babel.git / blobdiff