From f4f79484fa56bd10d5c2b7dfb744c66ea37b6d30 Mon Sep 17 00:00:00 2001 From: cugurlu Date: Sun, 31 Mar 2019 15:27:07 +0200 Subject: [PATCH] Test all new methods --- src/Client/src/test/java/UserServiceTest.java | 13 +++++++++++++ .../greenify/server/rest/UserControllerTest.java | 13 +++++++++++++ .../greenify/server/service/UserServiceTest.java | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/Client/src/test/java/UserServiceTest.java b/src/Client/src/test/java/UserServiceTest.java index d46c4f2..d101f86 100644 --- a/src/Client/src/test/java/UserServiceTest.java +++ b/src/Client/src/test/java/UserServiceTest.java @@ -11,7 +11,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.web.client.RestTemplate; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RunWith(MockitoJUnitRunner.class) public class UserServiceTest { @@ -86,6 +88,17 @@ public class UserServiceTest { Assert.assertEquals(estimate, result); } + @Test + public void getInputsTest() throws Exception { + Map estimate = new HashMap<>(); + estimate.put("Eric", "3"); + Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/getInputs?name=Eric"), + Map.class)) + .thenReturn(estimate); + Map result = userService.getInputs("Eric"); + Assert.assertEquals(estimate, result); + } + @Test public void setInputTest() throws Exception { userService.updateInput("Eric", "input_size", "5"); diff --git a/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java b/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java index 101bf6f..b56376f 100644 --- a/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java +++ b/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java @@ -94,6 +94,19 @@ public class UserControllerTest { assertEquals("merel", arg2Captor.getValue()); } + @Test + public void getInputMapTest() throws Exception { + ArgumentCaptor arg1Captor = ArgumentCaptor.forClass(String.class); + mvc.perform(get("/getInputs") + .param("name", "ceren") + .accept(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(status().isOk()); + verify(userService, times(1)) + .getInputMap(arg1Captor.capture()); + assertEquals("ceren", arg1Captor.getValue()); + } + @Test public void getAllUsersTest() throws Exception { mvc.perform(get("/getAllUsers") diff --git a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java index 89a7d61..c6847c9 100644 --- a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java +++ b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java @@ -20,7 +20,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.test.context.junit4.SpringRunner; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RunWith(SpringRunner.class) public class UserServiceTest { @@ -136,6 +138,17 @@ public class UserServiceTest { .getInput("alex", "input_footprint_shopping_food_dairy_default")); } + @Test + public void getInputMapTest() { + Map map = new HashMap<>(); + User alex = new User(1L, "alex", "password"); + when(userRepository.findByName(alex.getName())) + .thenReturn(alex); + alex.setFootPrintInputs(map); + assertEquals(map, userService + .getInputMap("alex")); + } + @Test public void getInputExceptionTest() { assertThrows(ApplicationException.class, () -> userService.getInput("alex", "hello"));