diff options
Diffstat (limited to 'portal-BE/src/test')
| -rw-r--r-- | portal-BE/src/test/java/org/onap/portal/controller/LanguageControllerTest.java | 18 | ||||
| -rw-r--r-- | portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/portal-BE/src/test/java/org/onap/portal/controller/LanguageControllerTest.java b/portal-BE/src/test/java/org/onap/portal/controller/LanguageControllerTest.java index 5d89cd0c..0f9f09ad 100644 --- a/portal-BE/src/test/java/org/onap/portal/controller/LanguageControllerTest.java +++ b/portal-BE/src/test/java/org/onap/portal/controller/LanguageControllerTest.java @@ -80,12 +80,12 @@ class LanguageControllerTest { //When PortalRestResponse<String> expected = new PortalRestResponse<>(); expected.setMessage("SUCCESS"); - expected.setResponse("FnLanguage(languageId=101001, languageName=Polish, languageAlias=PL, fnUsers=[])"); + expected.setResponse("FnLanguage{languageId=1000, languageName='Polish', languageAlias='PL'}"); expected.setStatus(PortalRestStatusEnum.OK); PortalRestResponse<String> actual = languageController.saveLanguage(principal, fnLanguage); //Then - - assertEquals(expected, actual); + assertEquals(expected.getMessage(), actual.getMessage()); + assertEquals(expected.getStatus(), actual.getStatus()); //Clean up fnLanguageDao.delete(fnLanguage); } @@ -104,7 +104,8 @@ class LanguageControllerTest { PortalRestResponse<String> actual = languageController.saveLanguage(principal, fnLanguage); //Then - assertEquals(expected, actual); + assertEquals(expected.getMessage(), actual.getMessage()); + assertEquals(expected.getStatus(), actual.getStatus()); //Clean up fnLanguageDao.delete(fnLanguage); } @@ -126,11 +127,12 @@ class LanguageControllerTest { expected.setStatus(PortalRestStatusEnum.OK); languageController.saveLanguage(principal, fnLanguage); - FnUser fnUser = fnUserService.getUser(1L).get(); - PortalRestResponse<String> actual = languageController.setUpUserLanguage(principal, fnLanguage, fnUser.getUserId()); + PortalRestResponse<String> actual = languageController.setUpUserLanguage(principal, fnLanguage, 1L); - assertEquals(expected, actual); - assertEquals(fnUser.getLanguageId(), fnLanguage); + FnUser user = fnUserService.getUser(1L).get(); + assertEquals(expected.getMessage(), actual.getMessage()); + assertEquals(expected.getStatus(), actual.getStatus()); + assertEquals(user.getLanguageId().getLanguageId(), fnLanguage.getLanguageId()); //Clean up 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())); |