Catalog alignment

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / upgrade / UpgradeBusinessLogicTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogicTest.java
index c23bb1c..dd16d1a 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogicTest.java
@@ -58,6 +58,7 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.operations.UpgradeOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.exception.ResponseFormat;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -131,7 +132,7 @@ public class UpgradeBusinessLogicTest {
         resource = new Resource(resourceMetadataDefinition);
         service = new Service(serviceMetadataDefinition);
 
-        when(userValidations.validateUserExists(eq(user.getUserId()), anyString(), anyBoolean()))
+        when(userValidations.validateUserExists(eq(user.getUserId())))
                 .thenReturn(user);
     }
 
@@ -277,7 +278,7 @@ public class UpgradeBusinessLogicTest {
         when(toscaOperationFacade.updateComponentInstancePropsToComponent(any(Map.class), any()))
                 .thenReturn(Either.left(stubComponentInstanceProperties));
         when(componentInstanceBusinessLogic.changeInstanceVersion(any(Component.class), any(ComponentInstance.class), any(ComponentInstance.class), any(User.class), any(ComponentTypeEnum.class)))
-                .thenReturn(Either.left(componentInstance));
+                .thenReturn(componentInstance);
 
         UpgradeStatus status = upgradeBusinessLogic.automatedUpgrade(COMPONENT_ID, getRequests(), user.getUserId());
         Assert.assertEquals(ActionStatus.OK, status.getStatus());