diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle')
6 files changed, 58 insertions, 65 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransitionTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransitionTest.java index 72c58c02f0..31c795478a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransitionTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransitionTest.java @@ -22,23 +22,16 @@ package org.openecomp.sdc.be.components.lifecycle; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.when; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.mockito.Mockito; -import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic; -import org.openecomp.sdc.be.components.lifecycle.CertificationChangeTransition; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.impl.ComponentsUtils; -import org.openecomp.sdc.be.model.Component; import org.openecomp.sdc.be.model.LifeCycleTransitionEnum; import org.openecomp.sdc.be.model.LifecycleStateEnum; import org.openecomp.sdc.be.model.Resource; import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.openecomp.sdc.be.user.Role; import org.openecomp.sdc.exception.ResponseFormat; @@ -51,11 +44,8 @@ public class CertificationChangeTransitionTest extends LifecycleTestBase { private CertificationChangeTransition certificationFailObj = null; private ComponentsUtils componentsUtils = new ComponentsUtils(); - private String resourceName = "myResource"; private User owner = null; - protected ArtifactsBusinessLogic artifactsManager = Mockito.mock(ArtifactsBusinessLogic.class); - Resource resource; @SuppressWarnings("unchecked") @@ -79,8 +69,7 @@ public class CertificationChangeTransitionTest extends LifecycleTestBase { owner = new User("cs0008", "Carlos", "Santana", "cs@sdc.com", "DESIGNER", null); - when(artifactsManager.deleteAllComponentArtifactsIfNotOnGraph(Mockito.anyList())).thenReturn(StorageOperationStatus.OK); - resource = createResourceObject(false); + resource = createResourceObject(); } @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTest.java index 6bfd64be41..5530d4c0f5 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTest.java @@ -20,13 +20,20 @@ package org.openecomp.sdc.be.components.lifecycle; -import fj.data.Either; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + import org.apache.http.HttpStatus; import org.junit.Before; import org.junit.Test; -import org.mockito.InjectMocks; +import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; import org.openecomp.sdc.be.components.distribution.engine.ServiceDistributionArtifactsBuilder; import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic; import org.openecomp.sdc.be.dao.api.ActionStatus; @@ -44,46 +51,40 @@ import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement; import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter; import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.openecomp.sdc.be.model.operations.impl.CapabilityOperation; -import org.openecomp.sdc.be.tosca.ToscaError; import org.openecomp.sdc.be.tosca.ToscaExportHandler; -import org.openecomp.sdc.be.tosca.ToscaRepresentation; import org.openecomp.sdc.be.user.Role; import org.openecomp.sdc.exception.ResponseFormat; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.when; +import fj.data.Either; +@RunWith(MockitoJUnitRunner.Silent.class) public class CertificationRequestTest extends LifecycleTestBase { private ComponentsUtils componentsUtils = new ComponentsUtils(); + @Mock + private ServiceDistributionArtifactsBuilder serviceDistributionArtifactsBuilder; + @Mock + private ServiceBusinessLogic serviceBusinessLogic; + @Mock + private CapabilityOperation capabilityOperation; + @Mock + private ToscaExportHandler toscaExportUtils; - protected ServiceDistributionArtifactsBuilder serviceDistributionArtifactsBuilder = Mockito.mock(ServiceDistributionArtifactsBuilder.class); - protected ServiceBusinessLogic serviceBusinessLogic = Mockito.mock(ServiceBusinessLogic.class); - protected CapabilityOperation capabilityOperation = Mockito.mock(CapabilityOperation.class); - protected ToscaExportHandler toscaExportUtils = Mockito.mock(ToscaExportHandler.class); - @InjectMocks - private CertificationRequestTransition rfcObj = new CertificationRequestTransition(componentsUtils, toscaElementLifecycleOperation, serviceDistributionArtifactsBuilder, serviceBusinessLogic, capabilityOperation, toscaExportUtils, toscaOperationFacade, titanDao); + private CertificationRequestTransition rfcObj; - protected ToscaRepresentation toscaRepresentation = Mockito.mock(ToscaRepresentation.class); @Before public void setup() { - MockitoAnnotations.initMocks(this); super.setup(); - + rfcObj = new CertificationRequestTransition(componentsUtils, toscaElementLifecycleOperation, serviceDistributionArtifactsBuilder, serviceBusinessLogic, capabilityOperation, toscaExportUtils, toscaOperationFacade, titanDao); // checkout transition object - rfcObj.setLifeCycleOperation(toscaElementLifecycleOperation); +// rfcObj.setLifeCycleOperation(toscaElementLifecycleOperation); // checkoutObj.setAuditingManager(iAuditingManager); rfcObj.setConfigurationManager(configurationManager); componentsUtils.Init(); - Either<ToscaRepresentation, ToscaError> either = Either.left(toscaRepresentation); - when(toscaExportUtils.exportComponent(Mockito.anyObject())).thenReturn(either); - +// Either<ToscaRepresentation, ToscaError> either = Either.left(toscaRepresentation); +// when(toscaExportUtils.exportComponent(Mockito.any())).thenReturn(either); } @Test @@ -109,7 +110,7 @@ public class CertificationRequestTest extends LifecycleTestBase { @Test public void testCheckoutStateValidation() { Either<? extends Component, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); Either<User, ResponseFormat> ownerResponse = rfcObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -130,7 +131,7 @@ public class CertificationRequestTest extends LifecycleTestBase { @Test public void testAlreadyRfc() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.READY_FOR_CERTIFICATION); Either<User, ResponseFormat> ownerResponse = rfcObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -146,7 +147,7 @@ public class CertificationRequestTest extends LifecycleTestBase { @Test public void testCertificationInProgress() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); Either<User, ResponseFormat> ownerResponse = rfcObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -162,7 +163,7 @@ public class CertificationRequestTest extends LifecycleTestBase { @Test public void testAlreadyCertified() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.CERTIFIED); Either<User, ResponseFormat> ownerResponse = rfcObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckinTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckinTest.java index 6a009d06c5..21111ef59e 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckinTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckinTest.java @@ -25,9 +25,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.openecomp.sdc.be.components.lifecycle.CheckinTransition; import org.openecomp.sdc.be.dao.api.ActionStatus; -import org.openecomp.sdc.be.dao.jsongraph.TitanDao; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.impl.ComponentsUtils; import org.openecomp.sdc.be.model.LifecycleStateEnum; @@ -59,7 +57,7 @@ public class CheckinTest extends LifecycleTestBase { @Test public void testSimpleCheckin() { Either<Boolean, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT); Either<User, ResponseFormat> ownerResponse = checkinObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -87,7 +85,7 @@ public class CheckinTest extends LifecycleTestBase { @Test public void testCheckinTwiceValidation() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); Either<User, ResponseFormat> owner = checkinObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -122,7 +120,7 @@ public class CheckinTest extends LifecycleTestBase { @Test public void testCheckoutByAnotherUserValidation() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); User modifier = new User(); modifier.setUserId("modifier"); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTest.java index 4a10bbfba4..1e3f6f6ce8 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTest.java @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic; -import org.openecomp.sdc.be.components.lifecycle.CheckoutTransition; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.impl.ComponentsUtils; @@ -57,13 +56,15 @@ public class CheckoutTest extends LifecycleTestBase { checkoutObj.setLifeCycleOperation(toscaElementLifecycleOperation); checkoutObj.setConfigurationManager(configurationManager); componentsUtils.Init(); + bl.setToscaOperationFacade(toscaOperationFacade); + bl.setComponentsUtils(componentsUtils); } @Test public void testCheckoutStateValidation() { Either<? extends Component, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); Either<User, ResponseFormat> ownerResponse = checkoutObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -81,7 +82,7 @@ public class CheckoutTest extends LifecycleTestBase { @Test public void testAlreadyCheckout() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT); Either<User, ResponseFormat> ownerResponse = checkoutObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -99,7 +100,7 @@ public class CheckoutTest extends LifecycleTestBase { @Test public void testCertificationInProgress() { Either<? extends Component, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); Either<User, ResponseFormat> ownerResponse = checkoutObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -119,7 +120,7 @@ public class CheckoutTest extends LifecycleTestBase { @Test public void testReadyForCertification() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.READY_FOR_CERTIFICATION); @@ -159,7 +160,7 @@ public class CheckoutTest extends LifecycleTestBase { @Test public void testRoles() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/LifecycleTestBase.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/LifecycleTestBase.java index ff5c618138..bc131ff39a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/LifecycleTestBase.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/LifecycleTestBase.java @@ -27,6 +27,7 @@ import java.util.List; import javax.servlet.ServletContext; +import org.junit.BeforeClass; import org.mockito.InjectMocks; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -39,7 +40,6 @@ import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.dao.jsongraph.TitanDao; import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition; -import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.be.impl.WebAppContextWrapper; import org.openecomp.sdc.be.model.ArtifactDefinition; @@ -67,11 +67,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.context.WebApplicationContext; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - import fj.data.Either; -import junit.framework.Assert; public class LifecycleTestBase { private static Logger log = LoggerFactory.getLogger(LifecycleTestBase.class.getName()); @@ -86,19 +82,22 @@ public class LifecycleTestBase { protected User user = null; protected Resource resourceResponse; protected Service serviceResponse; - protected ConfigurationManager configurationManager = null; + protected static ConfigurationManager configurationManager = null; protected ResponseFormatManager responseManager = null; protected TitanDao titanDao = Mockito.mock(TitanDao.class); protected ToscaOperationFacade toscaOperationFacade = Mockito.mock(ToscaOperationFacade.class); - public void setup() { - + @BeforeClass + public static void setupClass() { ExternalConfiguration.setAppName("catalog-be"); // Init Configuration String appConfigDir = "src/test/resources/config/catalog-be"; ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir); configurationManager = new ConfigurationManager(configurationSource); + } + + public void setup() { // Auditing iAuditingManager = new AuditingMockManager("lll"); @@ -124,7 +123,7 @@ public class LifecycleTestBase { // getCount // createResource - resourceResponse = createResourceObject(true); + resourceResponse = createResourceObject(); Either<ToscaElement, StorageOperationStatus> eitherComponent = Either.left(ModelConverter.convertToToscaElement(resourceResponse)); when(toscaElementLifecycleOperation.checkoutToscaElement(Mockito.any(String.class), Mockito.any(String.class), Mockito.any(String.class))) .thenAnswer(createAnswer(eitherComponent)); @@ -137,7 +136,10 @@ public class LifecycleTestBase { Either<User, StorageOperationStatus> getOwnerResult = Either.left(user); when(toscaElementLifecycleOperation.getToscaElementOwner(Mockito.anyString())).thenReturn(getOwnerResult); - + + Either<Component, StorageOperationStatus> eitherlatestDerived = Either.right(StorageOperationStatus.OK); + when(toscaOperationFacade.shouldUpgradeToLatestDerived(Mockito.any(Resource.class))).thenReturn(eitherlatestDerived); + responseManager = ResponseFormatManager.getInstance(); } @@ -153,9 +155,10 @@ public class LifecycleTestBase { return dummy; } - protected Resource createResourceObject(boolean afterCreate) { + protected Resource createResourceObject() { Resource resource = new Resource(); resource.setName("MyResourceName"); + resource.setUniqueId("uid"); resource.addCategory("VoIP", "INfra"); resource.setDescription("My short description"); List<String> tgs = new ArrayList<String>(); @@ -179,6 +182,7 @@ public class LifecycleTestBase { ComponentMetadataDefinition cMetadataDataDefinition = new ComponentMetadataDefinition(rMetadataDataDefinition) ; Resource resource = new Resource(cMetadataDataDefinition); + resource.setUniqueId("rid"); resource.setName("MyResourceVFCMTName"); resource.addCategory("VoIP", "INfra"); resource.setDescription("My short description"); @@ -200,6 +204,7 @@ public class LifecycleTestBase { protected Service createServiceObject(boolean b) { Service service = new Service(); service.setName("MyServiceName"); + service.setUniqueId("sid"); service.addCategory("VoIP", null); service.setDescription("My short description"); List<String> tgs = new ArrayList<String>(); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTest.java index 6761721636..11913ad31a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.openecomp.sdc.be.components.lifecycle.UndoCheckoutTransition; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.impl.ComponentsUtils; @@ -58,7 +57,7 @@ public class UndoCheckoutTest extends LifecycleTestBase { @Test public void testResourceNotCheckedOutValidation() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); Either<User, ResponseFormat> ownerResponse = undoCheckoutObj.getComponentOwner(resource, ComponentTypeEnum.RESOURCE); @@ -102,7 +101,7 @@ public class UndoCheckoutTest extends LifecycleTestBase { @Test public void testDifferentResourceOwnerValidation() { Either<Resource, ResponseFormat> changeStateResult; - Resource resource = createResourceObject(false); + Resource resource = createResourceObject(); resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT); User modifier = new User(); |