diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/ecomp')
4 files changed, 36 insertions, 38 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java index 0700a19aa7..d781eb72c3 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java @@ -1,5 +1,15 @@ package org.openecomp.sdc.be.ecomp; +import org.junit.Test; +import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; +import org.openecomp.portalsdk.core.restful.domain.EcompRole; +import org.openecomp.portalsdk.core.restful.domain.EcompUser; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.io.BufferedReader; import java.security.Principal; import java.util.Collection; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/GenerateEcompErrorFileTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/GenerateEcompErrorFileTest.java index f0ec613a27..5133cb2f25 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/GenerateEcompErrorFileTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/GenerateEcompErrorFileTest.java @@ -20,18 +20,19 @@ package org.openecomp.sdc.be.ecomp; -import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.openecomp.sdc.common.config.EcompClassification; +import org.openecomp.sdc.common.config.EcompErrorCode; +import org.openecomp.sdc.common.config.EcompErrorEnum; +import org.openecomp.sdc.common.config.generation.GenerateEcompErrorsCsv; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.openecomp.sdc.common.config.EcompClassification; -import org.openecomp.sdc.common.config.EcompErrorCode; -import org.openecomp.sdc.common.config.EcompErrorEnum; -import org.openecomp.sdc.common.config.generation.GenerateEcompErrorsCsv; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class GenerateEcompErrorFileTest { @@ -40,7 +41,7 @@ public class GenerateEcompErrorFileTest { EcompErrorEnum[] ecompErrorEnums = EcompErrorEnum.values(); - Map<EcompErrorCode, List<EcompClassification>> map = new HashMap<EcompErrorCode, List<EcompClassification>>(); + Map<EcompErrorCode, List<EcompClassification>> map = new HashMap<>(); for (EcompErrorEnum ecompErrorEnum : ecompErrorEnums) { List<EcompClassification> list = map.get(ecompErrorEnum.getEcompErrorCode()); @@ -52,7 +53,8 @@ public class GenerateEcompErrorFileTest { map.put(ecompErrorEnum.getEcompErrorCode(), list); } else { if (list.contains(ecompErrorEnum.getClassification())) { - assertTrue(ecompErrorEnum.getEcompErrorCode() + " already defined with ecomp classification " + ecompErrorEnum.getClassification(), false); + fail(ecompErrorEnum.getEcompErrorCode() + " already defined with ecomp classification " + ecompErrorEnum + .getClassification()); } else { list.add(ecompErrorEnum.getClassification()); } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverterTest.java index a47447b4c7..bfc5fa6b84 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverterTest.java @@ -1,33 +1,20 @@ package org.openecomp.sdc.be.ecomp.converters; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - +import fj.data.Either; +import mockit.Deencapsulation; import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; -import org.openecomp.sdc.be.externalapi.servlet.representation.ArtifactMetadata; -import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata; -import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceAssetDetailedMetadata; -import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceAssetMetadata; -import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceInstanceMetadata; -import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceAssetDetailedMetadata; -import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceAssetMetadata; -import org.openecomp.sdc.be.model.ArtifactDefinition; -import org.openecomp.sdc.be.model.Component; -import org.openecomp.sdc.be.model.ComponentInstance; -import org.openecomp.sdc.be.model.DistributionStatusEnum; -import org.openecomp.sdc.be.model.LifecycleStateEnum; -import org.openecomp.sdc.be.model.Resource; -import org.openecomp.sdc.be.model.Service; +import org.openecomp.sdc.be.externalapi.servlet.representation.*; +import org.openecomp.sdc.be.model.*; import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; import org.openecomp.sdc.exception.ResponseFormat; -import fj.data.Either; -import mockit.Deencapsulation; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; public class AssetMetadataConverterTest { @@ -57,7 +44,7 @@ public class AssetMetadataConverterTest { boolean detailed = false; Either<? extends AssetMetadata, ResponseFormat> result; component.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); - + component.setComponentType(ComponentTypeEnum.RESOURCE); // default test testSubject = createTestSubject(); result = testSubject.convertToSingleAssetMetadata(component, serverBaseURL, detailed); @@ -71,6 +58,7 @@ public class AssetMetadataConverterTest { Resource curr = new Resource(); Either<? extends AssetMetadata, ResponseFormat> result; curr.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + curr.setComponentType(ComponentTypeEnum.RESOURCE); // default test testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "convertToMetadata", ComponentTypeEnum.RESOURCE, serverBaseURL, @@ -84,6 +72,7 @@ public class AssetMetadataConverterTest { Resource curr = new Resource(); Either<? extends AssetMetadata, ResponseFormat> result; curr.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + curr.setComponentType(ComponentTypeEnum.RESOURCE); // default test testSubject = createTestSubject(); result = Deencapsulation.invoke(testSubject, "generateResourceMeatdata", serverBaseURL, true, curr); @@ -107,6 +96,7 @@ public class AssetMetadataConverterTest { Service curr = new Service(); curr.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); curr.setDistributionStatus(DistributionStatusEnum.DISTRIBUTED); + Either<? extends AssetMetadata, ResponseFormat> result; // default test @@ -179,13 +169,11 @@ public class AssetMetadataConverterTest { AssetMetadataConverter testSubject; ServiceAssetDetailedMetadata assetToPopulate = new ServiceAssetDetailedMetadata(); Service service = new Service(); - String serverBaseURL = ""; Either<ServiceAssetDetailedMetadata, StorageOperationStatus> result; // default test testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "convertToServiceDetailedMetadata", assetToPopulate, service, - serverBaseURL); + result = Deencapsulation.invoke(testSubject, "convertToServiceDetailedMetadata", assetToPopulate, service); } @Test @@ -193,14 +181,12 @@ public class AssetMetadataConverterTest { AssetMetadataConverter testSubject; ResourceAssetDetailedMetadata asset = new ResourceAssetDetailedMetadata(); Resource resource = new Resource(); - String serverBaseURL = ""; Map<String, ArtifactDefinition> artifacts = new HashMap<>(); ResourceAssetDetailedMetadata result; // default test testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "populateResourceWithArtifacts", asset, resource, serverBaseURL, - artifacts); + result = Deencapsulation.invoke(testSubject, "populateResourceWithArtifacts", asset, resource, artifacts); } @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverterTest.java index 20fa4d1bc2..91cf1417dd 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverterTest.java @@ -1,16 +1,16 @@ package org.openecomp.sdc.be.ecomp.converters; - +import fj.data.Either; import fj.data.Either; import org.junit.Test; import org.openecomp.portalsdk.core.restful.domain.EcompRole; import org.openecomp.portalsdk.core.restful.domain.EcompUser; import org.openecomp.sdc.be.model.User; + import java.util.Collections; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; - public class EcompUserConverterTest { private static final String FIRST_NAME = "firstname"; private static final String LAST_NAME = "lastname"; |