X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=blobdiff_plain;f=portal-BE%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Ffn%2FFnUserServiceTest.java;h=3f242fb4b368545c3521c6d251a96a179e0255d2;hp=fef9187fd0918ee582a7e1aa35edc6989dac7114;hb=682a90dad9795a3fa9aaffbf43c488057b8529e7;hpb=8c6ccfe62953f28f704891c76258d595dc9d0b03 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 fef9187f..3f242fb4 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 @@ -48,6 +48,7 @@ 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; @@ -72,13 +73,13 @@ class FnUserServiceTest { void saveUser(){ FnUser actual = fnUserService.getUser(1L).get(); - FnUser expected = new FnUser(); + FnUser expected = new FnUserBuilder().createFnUser(); expected.setUserId(123L); expected.setFirstName("Demo"); expected.setLastName("User"); expected.setEmail("demo@openecomp.org"); expected.setOrgUserId("demo"); - expected.setTimezone(fnLuTimezoneService.getById(10).orElse(new FnLuTimezone())); + expected.setTimezone(fnLuTimezoneService.getById(10L).orElse(new FnLuTimezone())); expected.setLoginId("demo"); expected.setLoginPwd("4Gl6WL1bmwviYm+XZa6pS1vC0qKXWtn9wcZWdLx61L0="); expected.setLastLoginDate(LocalDateTime.parse("2019-08-08T12:18:17")); @@ -102,7 +103,7 @@ class FnUserServiceTest { FnUser actual = fnUserService.getUser(1L).get(); - FnUser expected = new FnUser(); + FnUser expected = new FnUserBuilder().createFnUser(); expected.setUserId(1L); expected.setFirstName("Demo"); expected.setLastName("User"); @@ -118,7 +119,7 @@ class FnUserServiceTest { expected.setIsInternalYn("N"); expected.setStateCd("NJ"); expected.setCountryCd("US"); - expected.setTimezone(fnLuTimezoneService.getById(10).orElse(new FnLuTimezone())); + expected.setTimezone(fnLuTimezoneService.getById(10L).orElse(new FnLuTimezone())); expected.setLanguageId(fnLanguageService.findById(1L).orElse(new FnLanguage()));