X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Ffn%2FFnUserServiceTest.java;h=2e16a4fbac7352df418750784fac7cf255185b72;hb=refs%2Fchanges%2F01%2F98501%2F2;hp=26731eacb041ea17a2a93a7ec9a220a3b0b7a681;hpb=e977510f26b63b1955bae683bbf348dbbc157f80;p=portal.git

diff --git a/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java b/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java
index 26731eac..2e16a4fb 100644
--- a/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java
+++ b/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java
@@ -45,14 +45,12 @@ import static org.junit.jupiter.api.Assertions.*;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.onap.portal.domain.db.fn.FnLanguage;
 import org.onap.portal.domain.db.fn.FnLuTimezone;
 import org.onap.portal.domain.db.fn.FnUser;
-import org.onap.portal.domain.builder.FnUserBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -75,29 +73,38 @@ class FnUserServiceTest {
 
        @Test
        void saveUser(){
-              FnUser actual = fnUserService.getUser(1L).get();
+              //Given
+              //FnLuTimezone fnLuTimezone = fnLuTimezoneService.getById(10L).get();
+              FnLanguage language = fnLanguageService.findById(1L).get();
 
-              FnUser expected = new FnUserBuilder().createFnUser();
-              expected.setUserId(123L);
+              FnUser expected = FnUser.builder().build();
               expected.setFirstName("Demo");
               expected.setLastName("User");
               expected.setEmail("demo@openecomp.org");
               expected.setOrgUserId("demo");
-              expected.setTimezone(fnLuTimezoneService.getById(10L).orElse(new FnLuTimezone()));
-              expected.setLoginId("demo");
-              expected.setLoginPwd("4Gl6WL1bmwviYm+XZa6pS1vC0qKXWtn9wcZWdLx61L0=");
+              //expected.setTimezone(fnLuTimezone);
+              expected.setLoginId("demoTest");
+              expected.setLoginPwd("demo123");
               expected.setLastLoginDate(LocalDateTime.parse("2019-08-08T12:18:17"));
-              expected.setActiveYn("Y");
+              expected.setActiveYn(true);
               expected.setCreatedDate(LocalDateTime.parse("2016-10-14T21:00"));
-              expected.setModifiedId(actual);
               expected.setModifiedDate(LocalDateTime.parse("2019-08-08T12:18:17"));
-              expected.setIsInternalYn("N");
+              expected.setIsInternalYn(false);
               expected.setStateCd("NJ");
+              expected.setIsSystemUser(true);
               expected.setCountryCd("US");
-              expected.setLanguageId(fnLanguageService.findById(1L).orElse(new FnLanguage()));
+              expected.setLanguageId(language);
+              expected.setGuest(false);
 
-              fnUserService.saveFnUser(principal, expected);
+              //fnLuTimezone.getFnUsers().add(expected);
+              language.getFnUsers().add(expected);
 
+              //When
+              fnUserService.saveFnUser(expected);
+              FnUser actual = fnUserService.getUser(expected.getUserId()).get();
+              //Then
+              assertEquals(expected.getUserId(), actual.getUserId());
+              assertEquals(expected.getLoginPwd(), actual.getLoginPwd());
               //Clean up
               fnUserService.deleteUser(expected);
        }
@@ -107,20 +114,20 @@ class FnUserServiceTest {
               FnUser actual = fnUserService.getUser(1L).get();
 
 
-              FnUser expected = new FnUserBuilder().createFnUser();
+              FnUser expected = FnUser.builder().build();
               expected.setUserId(1L);
               expected.setFirstName("Demo");
               expected.setLastName("User");
               expected.setEmail("demo@openecomp.org");
               expected.setOrgUserId("demo");
               expected.setLoginId("demo");
-              expected.setLoginPwd("4Gl6WL1bmwviYm+XZa6pS1vC0qKXWtn9wcZWdLx61L0=");
+              expected.setLoginPwd("demo123");
               expected.setLastLoginDate(LocalDateTime.parse("2019-08-08T12:18:17"));
-              expected.setActiveYn("Y");
+              expected.setActiveYn(true);
               expected.setCreatedDate(LocalDateTime.parse("2016-10-14T21:00"));
               expected.setModifiedId(actual);
               expected.setModifiedDate(LocalDateTime.parse("2019-08-08T12:18:17"));
-              expected.setIsInternalYn("N");
+              expected.setIsInternalYn(false);
               expected.setStateCd("NJ");
               expected.setCountryCd("US");
               expected.setTimezone(fnLuTimezoneService.getById(10L).orElse(new FnLuTimezone()));
@@ -148,7 +155,6 @@ class FnUserServiceTest {
               assertEquals(expected.getActiveYn(), actual.getActiveYn());
               assertEquals(expected.getCreatedId(), actual.getCreatedId());
               assertEquals(expected.getCreatedDate(), actual.getCreatedDate());
-              assertEquals(expected.getModifiedId(), actual.getModifiedId());
               assertEquals(expected.getModifiedDate(), actual.getModifiedDate());
               assertEquals(expected.getIsInternalYn(), actual.getIsInternalYn());
               assertEquals(expected.getAddressLine1(), actual.getAddressLine1());