Catalog-be dead code removal

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

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBLTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBLTest.java
index aac50a3..817aa5d 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBLTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBLTest.java
@@ -1,10 +1,6 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.List;
-
+import fj.data.Either;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -23,7 +19,10 @@ import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 
-import fj.data.Either;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.mockito.Mockito.when;
 
 public class ComponentCapabilitiesPropertiesMergeBLTest {
 
@@ -51,17 +50,13 @@ public class ComponentCapabilitiesPropertiesMergeBLTest {
 
        @Test
        public void testDescription() throws Exception {
-               // ComponentCapabilitiesPropertiesMergeBL testSubject;
                String result;
 
-               // default test
-               // testSubject = createTestSubject();
                result = testSubject.description();
        }
 
        @Test
        public void testMergeComponents() throws Exception {
-               // ComponentCapabilitiesPropertiesMergeBL testSubject;
                Component prevComponent = ObjectGenerator.buildResourceWithComponentInstance("mock3");
                Component currentComponent = ObjectGenerator.buildResourceWithComponentInstance("mock1", "mock2");
                currentComponent.setUniqueId("mock");
@@ -75,7 +70,6 @@ public class ComponentCapabilitiesPropertiesMergeBLTest {
 
        @Test
        public void testMergeComponentInstanceCapabilities() throws Exception {
-               // ComponentCapabilitiesPropertiesMergeBL testSubject;
                Component currentComponent = null;
                Component origInstanceCmpt = null;
                String instanceId = "";
@@ -83,8 +77,6 @@ public class ComponentCapabilitiesPropertiesMergeBLTest {
                List<CapabilityDefinition> prevInstanceCapabilities = null;
                ActionStatus result;
 
-               // default test
-               // testSubject = createTestSubject();
                result = testSubject.mergeComponentInstanceCapabilities(currentComponent, origInstanceCmpt, instanceId,
                                prevInstanceCapabilities);