diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/ecomp')
5 files changed, 302 insertions, 201 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 88be8cbd5d..c32768b85b 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 @@ -31,91 +31,103 @@ import java.util.List; public class EcompIntImplTest { - private EcompIntImpl createTestSubject() { - return new EcompIntImpl(); - } - - @Test(expected=PortalAPIException.class) - public void testPushUser() throws Exception { - EcompIntImpl testSubject; - EcompUser user = null; - - // default test - testSubject = createTestSubject(); - testSubject.pushUser(user); - } - - @Test(expected=PortalAPIException.class) - public void testEditUser() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - EcompUser user = null; - - // default test - testSubject = createTestSubject(); - testSubject.editUser(loginId, user); - } - - @Test(expected=PortalAPIException.class) - public void testGetUser() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - EcompUser result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUser(loginId); - } - - @Test(expected=PortalAPIException.class) - public void testGetUsers() throws Exception { - EcompIntImpl testSubject; - List<EcompUser> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUsers(); - } - - @Test - public void testGetAvailableRoles() throws Exception { - EcompIntImpl testSubject; - List<EcompRole> result; - - // default test - testSubject = createTestSubject(); + private EcompIntImpl createTestSubject() { + return new EcompIntImpl(); + } + + @Test(expected=PortalAPIException.class) + public void testPushUser() throws Exception { + EcompIntImpl testSubject; + EcompUser user = null; + + // default test + testSubject = createTestSubject(); + testSubject.pushUser(user); + } + + @Test(expected=PortalAPIException.class) + public void testEditUser() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + EcompUser user = null; + + // default test + testSubject = createTestSubject(); + testSubject.editUser(loginId, user); + } + + @Test(expected=PortalAPIException.class) + public void testGetUser() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + EcompUser result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUser(loginId); + } + + @Test(expected=PortalAPIException.class) + public void testGetUsers() throws Exception { + EcompIntImpl testSubject; + List<EcompUser> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUsers(); + } + + @Test + public void testGetAvailableRoles() throws Exception { + EcompIntImpl testSubject; + List<EcompRole> result; + + // default test + testSubject = createTestSubject(); result = testSubject.getAvailableRoles("Mock"); - } + } + + /*@Test + public void testPushUserRole() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + List<EcompRole> roles = null; + + // test 1 + testSubject = createTestSubject(); + roles = null; + testSubject.pushUserRole(loginId, roles); + }*/ @Test(expected= PortalAPIException.class) - public void testGetUserRoles() throws Exception { - EcompIntImpl testSubject; - String loginId = ""; - List<EcompRole> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getUserRoles(loginId); - } - - @Test - public void testIsAppAuthenticated() throws Exception { - EcompIntImpl testSubject; - boolean result; + public void testGetUserRoles() throws Exception { + EcompIntImpl testSubject; + String loginId = ""; + List<EcompRole> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUserRoles(loginId); + } + + @Test + public void testIsAppAuthenticated() throws Exception { + EcompIntImpl testSubject; + boolean result; HttpServletRequest httpServletRequestImpl = Mockito.mock(HttpServletRequest.class); - // default test - testSubject = createTestSubject(); - result = testSubject.isAppAuthenticated(httpServletRequestImpl); - } - - @Test - public void testGetUserId() throws Exception { - EcompIntImpl testSubject; + // default test + testSubject = createTestSubject(); + result = testSubject.isAppAuthenticated(httpServletRequestImpl); + } + + @Test + public void testGetUserId() throws Exception { + EcompIntImpl testSubject; HttpServletRequest httpServletRequestImpl = Mockito.mock(HttpServletRequest.class); - String result; + String result; - // default test - testSubject = createTestSubject(); - result = testSubject.getUserId(httpServletRequestImpl); - } + // default test + testSubject = createTestSubject(); + result = testSubject.getUserId(httpServletRequestImpl); + } } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/PortalRestAPICentralServiceImplTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/PortalRestAPICentralServiceImplTest.java index d364bf1b21..964e6258df 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/PortalRestAPICentralServiceImplTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/PortalRestAPICentralServiceImplTest.java @@ -30,36 +30,38 @@ import org.onap.portalsdk.core.restful.domain.EcompRole; import org.onap.portalsdk.core.restful.domain.EcompUser; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.user.UserBusinessLogic; +import org.openecomp.sdc.be.user.UserBusinessLogicExt; import org.openecomp.sdc.exception.ResponseFormat; +import javax.servlet.http.HttpServletRequest; import java.util.HashSet; import java.util.Map; import java.util.Set; public class PortalRestAPICentralServiceImplTest { - PortalRestAPICentralServiceImpl testSubject; - UserBusinessLogic ubl; + private PortalRestAPICentralServiceImpl testSubject; + private UserBusinessLogic ubl; + private UserBusinessLogicExt uble; @Before - public void setUp() throws Exception { + public void createTestSubject() { ubl = Mockito.mock(UserBusinessLogic.class); - testSubject = new PortalRestAPICentralServiceImpl(ubl); + uble = Mockito.mock(UserBusinessLogicExt.class); + testSubject = new PortalRestAPICentralServiceImpl(ubl, uble); + } @Test public void testGetAppCredentials() throws Exception { Map<String, String> appCredentials = testSubject.getAppCredentials(); - Assert.assertTrue(appCredentials.get(PortalRestAPICentralServiceImpl.PortalPropertiesEnum.PORTAL_APP_NAME.value()).equals("sdc")); - Assert.assertTrue(appCredentials.get(PortalRestAPICentralServiceImpl.PortalPropertiesEnum.PORTAL_USER.value()).equals("sdc")); - Assert.assertTrue(appCredentials.get(PortalRestAPICentralServiceImpl.PortalPropertiesEnum.PORTAL_PASS.value()).equals("asdc")); + Assert.assertTrue(appCredentials.get("appName").equals("sdc")); + Assert.assertTrue(appCredentials.get("username").equals("sdc")); + Assert.assertTrue(appCredentials.get("password").equals("asdc")); } @Test - public void testPushUserGeneralError() throws Exception { - ResponseFormat responseFormat = Mockito.mock(ResponseFormat.class); - Mockito.when(responseFormat.getMessageId()).thenReturn("mock"); - Mockito.when(ubl.createUser(Mockito.any(), Mockito.any())).thenReturn(Either.right(responseFormat)); + public void testPushUser() { EcompUser user = new EcompUser(); Set<EcompRole> roleSet = new HashSet<>(); EcompRole role = new EcompRole(); @@ -67,79 +69,206 @@ public class PortalRestAPICentralServiceImplTest { role.setName("Designer"); roleSet.add(role); user.setRoles(roleSet); - try{ + try { testSubject.pushUser(user); - }catch (PortalAPIException e) { - System.out.println(e); - Assert.assertTrue(e.getMessage().startsWith("Failed to create user {}")); + } catch (PortalAPIException e) { + Assert.fail(); } + } + @Test + public void testPushUserUBLError() { + Mockito.when(ubl.createUser(Mockito.anyString(), Mockito.any(User.class))).thenThrow(RuntimeException.class); + EcompUser user = new EcompUser(); + Set<EcompRole> roleSet = new HashSet<>(); + EcompRole role = new EcompRole(); + role.setId(1L); + role.setName("Designer"); + roleSet.add(role); + user.setRoles(roleSet); + try { + testSubject.pushUser(user); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().startsWith("Failed to create user")); + return; + } + Assert.fail(); } @Test - public void testPushUserSuccess() throws Exception { - ResponseFormat responseFormat = Mockito.mock(ResponseFormat.class); - Mockito.when(responseFormat.getMessageId()).thenReturn("SVC4006"); - Mockito.when(ubl.createUser(Mockito.any(), Mockito.any())).thenReturn(Either.left(new User())); + public void testPushUserMultipleRoles() { EcompUser user = new EcompUser(); Set<EcompRole> roleSet = new HashSet<>(); EcompRole role = new EcompRole(); role.setId(1L); role.setName("Designer"); roleSet.add(role); + EcompRole role1 = new EcompRole(); + role.setId(2L); + roleSet.add(role1); + role.setName("Tester"); user.setRoles(roleSet); - testSubject.pushUser(user); + try { + testSubject.pushUser(user); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().startsWith("Received multiple roles for user")); + return; + } + Assert.fail(); } @Test - public void testPushUserNullRoles() throws Exception { + public void testPushUserNullRoles() { EcompUser user = new EcompUser(); try{ testSubject.pushUser(user); } catch (PortalAPIException e){ Assert.assertTrue(e.getMessage().equals("Received null roles for user" + user)); + return; } - + Assert.fail(); } @Test - public void testPushUserUserNull() throws Exception { + public void testPushUserUserNull() { try { testSubject.pushUser(null); } catch (PortalAPIException e) { Assert.assertTrue(e.getMessage().equals("Received null for argument user")); + return; + } + Assert.fail(); + } + + @Test + public void testEditUserUserNull() { + try { + testSubject.editUser(null, null); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().equals("Received null for argument user")); + return; + } + Assert.fail(); + } + + @Test + public void testEditUserIdNull() { + try { + testSubject.editUser(null, new EcompUser()); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().equals("Received null for argument loginId")); + return; + } + Assert.fail(); + } + + @Test + public void testEditUserFailOnUpdate() { + Mockito.when(ubl.updateUserCredentials(Mockito.any(User.class))).thenReturn(Either.right(new ResponseFormat())); + Mockito.when(ubl.verifyNewUserForPortal(Mockito.anyString())).thenReturn(Either.left(new User())); + EcompUser user = new EcompUser(); + Set<EcompRole> roleSet = new HashSet<>(); + EcompRole role = new EcompRole(); + role.setId(1L); + role.setName("Designer"); + roleSet.add(role); + user.setRoles(roleSet); + try { + testSubject.editUser("mock_id", user); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().startsWith("Failed to edit user")); } + } + @Test + public void testEditUserDeactivate() { + Mockito.when(ubl.updateUserCredentials(Mockito.any(User.class))).thenReturn(Either.left(new User())); + Mockito.when(ubl.verifyNewUserForPortal(Mockito.anyString())).thenReturn(Either.left(new User())); + EcompUser user = new EcompUser(); + try { + testSubject.editUser("mock_id", user); + } catch (PortalAPIException e) { + Assert.fail(); + } } - /** - * - * Method: editUser(String loginId, EcompUser user) - * - */ @Test - public void testEditUser() throws Exception { - //TODO: Test goes here... + public void testEditUserFailUpdate() { + Mockito.when(ubl.updateUserCredentials(Mockito.any(User.class))).thenReturn(Either.left(new User())); + Mockito.when(ubl.updateUserRole(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenThrow(new RuntimeException()); + Mockito.when(ubl.verifyNewUserForPortal(Mockito.anyString())).thenReturn(Either.left(new User())); + EcompUser user = new EcompUser(); + Set<EcompRole> roleSet = new HashSet<>(); + EcompRole role = new EcompRole(); + role.setId(1L); + role.setName("Designer"); + roleSet.add(role); + user.setRoles(roleSet); + try { + testSubject.editUser("mock_id", user); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().startsWith("Error: Failed to update user role")); + return; + } + Assert.fail(); } - /** - * - * Method: getUserId(HttpServletRequest request) - * - */ @Test - public void testGetUserId() throws Exception { - //TODO: Test goes here... + public void testEditUserFailDeactivate() { + Mockito.when(ubl.updateUserCredentials(Mockito.any(User.class))).thenReturn(Either.left(new User())); + Mockito.when(uble.deActivateUser(Mockito.anyString(), Mockito.anyString())).thenThrow(new RuntimeException()); + Mockito.when(ubl.verifyNewUserForPortal(Mockito.anyString())).thenReturn(Either.left(new User())); + EcompUser user = new EcompUser(); + try { + testSubject.editUser("mock_id", user); + } catch (PortalAPIException e) { + Assert.assertTrue(e.getMessage().startsWith("Error: Failed to deactivate user")); + return; + } + Assert.fail(); } - /** - * - * Method: value() - * - */ @Test - public void testValue() throws Exception { - //TODO: Test goes here... + public void testEditUser() { + Mockito.when(ubl.updateUserCredentials(Mockito.any(User.class))).thenReturn(Either.left(new User())); + Mockito.when(ubl.verifyNewUserForPortal(Mockito.anyString())).thenReturn(Either.left(new User())); + EcompUser user = new EcompUser(); + Set<EcompRole> roleSet = new HashSet<>(); + EcompRole role = new EcompRole(); + role.setId(1L); + role.setName("Designer"); + roleSet.add(role); + user.setRoles(roleSet); + try { + testSubject.editUser("mock_id", user); + } catch (PortalAPIException e) { + Assert.fail(); + } + } + + @Test + public void testGetUserId() { + HttpServletRequest httpServletRequestMock = Mockito.mock(HttpServletRequest.class); + String mockHeader = "MockHeader"; + Mockito.when(httpServletRequestMock.getHeader(Mockito.anyString())).thenReturn(mockHeader); + try { + String userId = testSubject.getUserId(httpServletRequestMock); + Assert.assertTrue(userId.equals(mockHeader)); + } catch (PortalAPIException e){ + Assert.fail(); + } + } + @Test + public void testGetUserIdException() { + HttpServletRequest httpServletRequestMock = Mockito.mock(HttpServletRequest.class); + try { + testSubject.getUserId(httpServletRequestMock); + } catch (PortalAPIException e){ + Assert.assertTrue(e.getMessage().equals("Failed to get user_id header")); + return; + } + Assert.fail(); + } } 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); + } } |