X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=blobdiff_plain;f=portal-BE%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportal%2Fcontroller%2FLanguageControllerTest.java;h=0977f286766c6c85ac69e17376de21d261ab9c09;hp=5d89cd0c62244737f8c248636e0975fb31a396d4;hb=e977510f26b63b1955bae683bbf348dbbc157f80;hpb=8c6ccfe62953f28f704891c76258d595dc9d0b03

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..0977f286 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
@@ -41,6 +41,7 @@
 package org.onap.portal.controller;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
@@ -49,6 +50,7 @@ import org.onap.portal.domain.db.fn.FnLanguage;
 import org.onap.portal.domain.db.fn.FnUser;
 import org.onap.portal.domain.dto.PortalRestResponse;
 import org.onap.portal.domain.dto.PortalRestStatusEnum;
+import org.onap.portal.domain.dto.fn.FnLanguageDto;
 import org.onap.portal.service.fn.FnUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -80,12 +82,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 +106,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,17 +129,62 @@ 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
               fnLanguageDao.delete(fnLanguage);
        }
 
+       @Test
+       void setUpUserLanguageWrongUserId(){
+              //Given
+              FnLanguage fnLanguage = new FnLanguage();
+              fnLanguage.setLanguageName("Polish");
+              fnLanguage.setLanguageAlias("PL");
+
+              PortalRestResponse<String> expected = new PortalRestResponse<>();
+              expected.setMessage("FAILURE");
+              expected.setStatus(PortalRestStatusEnum.ERROR);
+              expected.setResponse("User for id: 345 do not exist");
 
+              languageController.saveLanguage(principal, fnLanguage);
+              PortalRestResponse<String> actual = languageController.setUpUserLanguage(principal, fnLanguage, 345L);
 
+              assertEquals(expected.getMessage(), actual.getMessage());
+              assertEquals(expected.getStatus(), actual.getStatus());
+              assertEquals(expected.getResponse(), actual.getResponse());
+
+
+              //Clean up
+              fnLanguageDao.delete(fnLanguage);
+       }
+
+
+       @Test
+       void getUserLanguage() {
+              FnLanguageDto expected = new FnLanguageDto();
+              expected.setLanguageAlias("EN");
+              expected.setLanguageName("English");
+
+              FnLanguageDto actual = languageController.getUserLanguage(principal, 1L);
+
+              assertEquals(expected.getLanguageAlias(), actual.getLanguageAlias());
+              assertEquals(expected.getLanguageName(), actual.getLanguageName());
+       }
+
+       @Test
+       void getUserLanguageNotExistingUser() {
+              FnLanguageDto expected = new FnLanguageDto();
+
+              FnLanguageDto actual = languageController.getUserLanguage(principal, 456L);
+
+              assertNull(actual.getLanguageAlias());
+              assertNull(actual.getLanguageName());
+       }
 }
\ No newline at end of file