summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-07-29 16:13:45 +0300
committerMichael Lando <ml636r@att.com>2018-07-29 16:20:34 +0300
commit5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch)
tree2f9dfc45191e723da69cf74be7829784e9741b94 /catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java
parent9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff)
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java')
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java
index 8c265a6be3..1b09e629b2 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolderTest.java
@@ -1,17 +1,12 @@
package org.openecomp.sdc.be.components.merge.instance;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.*;
+
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.InputDefinition;
-
public class DataForMergeHolderTest {
private DataForMergeHolder createTestSubject() {
@@ -144,7 +139,7 @@ public class DataForMergeHolderTest {
@Test
public void testSetVfRelationsInfo() throws Exception {
DataForMergeHolder testSubject;
- VfRelationsMergeInfo vfRelationsMergeInfo = null;
+ ContainerRelationsMergeInfo vfRelationsMergeInfo = null;
// default test
testSubject = createTestSubject();
@@ -154,11 +149,11 @@ public class DataForMergeHolderTest {
@Test
public void testGetVfRelationsMergeInfo() throws Exception {
DataForMergeHolder testSubject;
- VfRelationsMergeInfo result;
+ ContainerRelationsMergeInfo result;
// default test
testSubject = createTestSubject();
- result = testSubject.getVfRelationsMergeInfo();
+ result = testSubject.getContainerRelationsMergeInfo();
}
@Test