1 files changed, 71 insertions, 15 deletions

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 fa16003792..20fa4d1bc2 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,28 +1,84 @@
 package org.openecomp.sdc.be.ecomp.converters;
 
+
+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 fj.data.Either;
+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() {
+        Either<User, String> convertedUser = EcompUserConverter.convertEcompUserToUser(null);
+
+        assertThat(convertedUser.isRight()).isTrue();
+    }
+
+    @Test
+    public void shouldProperlyConvertUserToEcompUser() {
+        Either<User, String> convertedUser = EcompUserConverter.convertEcompUserToUser(createEcompUser());
+
+        assertThat(convertedUser.isLeft()).isTrue();
+
+        User 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.getUserId());
+        assertThat(ROLE).isEqualTo(user.getRole());
+    }
 
-	@Test
-	public void testConvertUserToEcompUser() throws Exception {
-		User asdcUser = new User();
-		Either<EcompUser, String> result;
+    private EcompUser createEcompUser() {
+        EcompUser user = new EcompUser();
 
-		// test 1
-		result = EcompUserConverter.convertUserToEcompUser(asdcUser);
-	}
+        EcompRole role = new EcompRole();
 
-	@Test
-	public void testConvertEcompUserToUser() throws Exception {
-		EcompUser ecompUser = new EcompUser();
-		Either<User, String> result;
+        role.setName(ROLE);
+        role.setId(0L);
 
-		// test 1
-		result = EcompUserConverter.convertEcompUserToUser(ecompUser);
-	}
+        user.setRoles(Collections.singleton(role));
+        user.setEmail(EMAIL_ADDRESS);
+        user.setLastName(LAST_NAME);
+        user.setFirstName(FIRST_NAME);
+        user.setOrgUserId(USER_ID);
+        return user;
+    }
 }
\ No newline at end of file