re base code

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / merge / instance / DataForMergeHolderTest.java

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 8c265a6..1b09e62 100644 (file)
--- 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