From 73104850fe7fe9800a0391702697a38863714193 Mon Sep 17 00:00:00 2001 From: Filip Izydorczyk Date: Mon, 5 Oct 2020 16:52:52 +0200 Subject: [PATCH] Assignments Controller test + authj test fix --- .../plannaplan/services/CommisionService.java | 2 +- .../AssignmentsControllerTest.java | 36 +++++++++++++++---- .../controllers/ConfigControllerTest.java | 4 +-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/CommisionService.java b/buisnesslogic/src/main/java/com/plannaplan/services/CommisionService.java index b6562e2..e650a31 100755 --- a/buisnesslogic/src/main/java/com/plannaplan/services/CommisionService.java +++ b/buisnesslogic/src/main/java/com/plannaplan/services/CommisionService.java @@ -30,7 +30,7 @@ public class CommisionService { } public Optional getNewestCommision(User user) { - return Optional.of(this.repo.getNewestCommision(user.getId()).get(0)); + return this.repo.getNewestCommision(user.getId()).stream().findFirst(); } public long getCommisionsAmmount() { diff --git a/restservice/src/test/java/com/plannaplan/controllers/AssignmentsControllerTest.java b/restservice/src/test/java/com/plannaplan/controllers/AssignmentsControllerTest.java index 77532f3..5e7e578 100755 --- a/restservice/src/test/java/com/plannaplan/controllers/AssignmentsControllerTest.java +++ b/restservice/src/test/java/com/plannaplan/controllers/AssignmentsControllerTest.java @@ -1,27 +1,51 @@ package com.plannaplan.controllers; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.plannaplan.entities.User; +import com.plannaplan.services.UserService; +import com.plannaplan.types.UserRoles; import org.junit.Test; import org.junit.runner.RunWith; - +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringRunner.class) @SpringBootTest @ContextConfiguration public class AssignmentsControllerTest { + private static final String ASSIGFNMENTS_ENDPOINT = "/api/v1/assignments/getCurrentAssignments"; + private static final String TEST_MAIL = "notexistingassignmentuser@mail.domain"; + + @Autowired + private WebApplicationContext webApplicationContext; + + @Autowired + private UserService service; + @Test - public void shouldReturn4xx() { - assertTrue(false); + public void shouldReturn4xx() throws Exception { + MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build(); + mockMvc.perform(get(ASSIGFNMENTS_ENDPOINT)).andExpect(status().is4xxClientError()); } @Test - public void shouldReturnOk() { - assertTrue(false); + public void shouldReturnOk() throws Exception { + this.service.save(new User(null, null, TEST_MAIL, UserRoles.TEST_USER)); + final String token = this.service.login(TEST_MAIL); + + MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build(); + mockMvc.perform(get(ASSIGFNMENTS_ENDPOINT).header("Authorization", "Bearer " + token)) + .andExpect(status().isOk()); } } diff --git a/restservice/src/test/java/com/plannaplan/controllers/ConfigControllerTest.java b/restservice/src/test/java/com/plannaplan/controllers/ConfigControllerTest.java index 2e2d644..6fbab62 100755 --- a/restservice/src/test/java/com/plannaplan/controllers/ConfigControllerTest.java +++ b/restservice/src/test/java/com/plannaplan/controllers/ConfigControllerTest.java @@ -67,8 +67,8 @@ public class ConfigControllerTest { final String token = this.service.login(TEST_MAIL); MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).apply(springSecurity()).build(); - mockMvc.perform(multipart(CONFIG_ENDPOINT).file(file).header("Bearer ", token)) - .andExpect(status().is4xxClientError()); + mockMvc.perform(multipart(CONFIG_ENDPOINT).file(file).header("Authorization", "Bearer " + token)) + .andExpect(status().isOk()); }