diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters')
3 files changed, 36 insertions, 76 deletions
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 64ad87df1e..22c8b94190 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 @@ -25,8 +25,20 @@ 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.*; -import org.openecomp.sdc.be.model.*; +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.model.operations.api.StorageOperationStatus; import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; import org.openecomp.sdc.exception.ResponseFormat; @@ -63,7 +75,7 @@ public class AssetMetadataConverterTest { String serverBaseURL = ""; boolean detailed = false; Either<? extends AssetMetadata, ResponseFormat> result; - component.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + component.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); component.setComponentType(ComponentTypeEnum.RESOURCE); // default test testSubject = createTestSubject(); @@ -77,7 +89,7 @@ public class AssetMetadataConverterTest { boolean detailed = false; Resource curr = new Resource(); Either<? extends AssetMetadata, ResponseFormat> result; - curr.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + curr.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); curr.setComponentType(ComponentTypeEnum.RESOURCE); // default test testSubject = createTestSubject(); @@ -91,7 +103,7 @@ public class AssetMetadataConverterTest { String serverBaseURL = ""; Resource curr = new Resource(); Either<? extends AssetMetadata, ResponseFormat> result; - curr.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + curr.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); curr.setComponentType(ComponentTypeEnum.RESOURCE); // default test testSubject = createTestSubject(); @@ -114,7 +126,7 @@ public class AssetMetadataConverterTest { String serverBaseURL = ""; boolean detailed = false; Service curr = new Service(); - curr.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + curr.setLifecycleState(LifecycleStateEnum.CERTIFIED); curr.setDistributionStatus(DistributionStatusEnum.DISTRIBUTED); Either<? extends AssetMetadata, ResponseFormat> result; @@ -145,7 +157,7 @@ public class AssetMetadataConverterTest { String serverBaseURL = ""; boolean detailed = false; ResourceAssetMetadata result; - resource.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN); // default test testSubject = createTestSubject(); @@ -158,7 +170,7 @@ public class AssetMetadataConverterTest { AssetMetadataConverter testSubject; ServiceAssetMetadata assetToPopulate = new ServiceAssetMetadata(); Service service = new Service(); - service.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + service.setLifecycleState(LifecycleStateEnum.CERTIFIED); service.setDistributionStatus(DistributionStatusEnum.DISTRIBUTED); String serverBaseURL = ""; boolean detailed = false; @@ -216,7 +228,7 @@ public class AssetMetadataConverterTest { Service service = new Service(); Map<String, ArtifactDefinition> artifacts = new HashMap<>(); ServiceAssetDetailedMetadata result; - service.setLifecycleState(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS); + service.setLifecycleState(LifecycleStateEnum.CERTIFIED); service.setDistributionStatus(DistributionStatusEnum.DISTRIBUTED); // default test testSubject = createTestSubject(); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java index c800c44275..ea4b085e5a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java @@ -33,7 +33,7 @@ public class EcompRoleConverterTest { // test 1 for (Role iterable_element : Role.values()) { - ecompRole.setId(new Long(iterable_element.ordinal())); + ecompRole.setName(iterable_element.name()); EcompRoleConverter.convertEcompRoleToRole(ecompRole); } 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 a8aed72591..74fe5205a6 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 @@ -21,79 +21,27 @@ package org.openecomp.sdc.be.ecomp.converters; import fj.data.Either; -import org.junit.Assert; import org.junit.Test; -import org.onap.portalsdk.core.restful.domain.EcompRole; import org.onap.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"; - private static final String USER_ID = "sample id"; - private static final String EMAIL_ADDRESS = "sample@sample.com"; - private static final String ROLE = "ADMIN"; - - private static final Long LAST_LOGIN_TIME = 12345L; - private static final User TEST_USER = new User(FIRST_NAME, LAST_NAME, USER_ID, EMAIL_ADDRESS, ROLE, LAST_LOGIN_TIME); - - - @Test - public void shouldProperlyConvertEcompUserToUser() { - Either<EcompUser, String> convertedUser = EcompUserConverter.convertUserToEcompUser(TEST_USER); - - assertThat(convertedUser.isLeft()).isTrue(); - - EcompUser user = convertedUser.left().value(); - - assertThat(EMAIL_ADDRESS).isEqualTo(user.getEmail()); - assertThat(FIRST_NAME).isEqualTo(user.getFirstName()); - assertThat(LAST_NAME).isEqualTo(user.getLastName()); - assertThat(USER_ID).isEqualTo(user.getLoginId()); - assertThat(user.getRoles().stream().anyMatch((x) -> ROLE.equals(x.getName()))).isTrue(); - } - - @Test - public void shouldNotCrashWhenUserIsNotProvided() { - Either<EcompUser, String> convertedUser = EcompUserConverter.convertUserToEcompUser(null); - - assertThat(convertedUser.isRight()).isTrue(); - } - - @Test - public void shouldNotCrashWhenEcompUserIsNotProvided() { - User convertedUser = EcompUserConverter.convertEcompUserToUser(null); - - Assert.assertTrue(convertedUser != null); - } - - @Test - public void shouldProperlyConvertUserToEcompUser() { - User convertedUser = EcompUserConverter.convertEcompUserToUser(createEcompUser()); - - assertThat(EMAIL_ADDRESS).isEqualTo(convertedUser.getEmail()); - assertThat(FIRST_NAME).isEqualTo(convertedUser.getFirstName()); - assertThat(LAST_NAME).isEqualTo(convertedUser.getLastName()); - assertThat(USER_ID).isEqualTo(convertedUser.getUserId()); - assertThat(ROLE).isEqualTo(convertedUser.getRole()); - } - private EcompUser createEcompUser() { - EcompUser user = new EcompUser(); + @Test + public void testConvertUserToEcompUser() throws Exception { + User asdcUser = new User(); + Either<EcompUser, String> result; - EcompRole role = new EcompRole(); + // test 1 + result = EcompUserConverter.convertUserToEcompUser(asdcUser); + } - role.setName(ROLE); - role.setId(0L); + @Test + public void testConvertEcompUserToUser() throws Exception { + EcompUser ecompUser = new EcompUser(); + User result; - user.setRoles(Collections.singleton(role)); - user.setEmail(EMAIL_ADDRESS); - user.setLastName(LAST_NAME); - user.setFirstName(FIRST_NAME); - user.setOrgUserId(USER_ID); - return user; - } + // test 1 + result = EcompUserConverter.convertEcompUserToUser(ecompUser); + } } |