1 files changed, 14 insertions, 66 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 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);
+	}
 }