R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link connected

Browse Source
This commit is contained in:
Gabriel Modzelewski
2021-01-20 08:49:10 +01:00
parent f8e988a449
commit 2ee3c41d6d
6 changed files with 20 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/release11/klaus/controller/EventController.java
View File

@@ -64,10 +64,6 @@ public class EventController {
.build();
}
@GetMapping("/new/mock")
public String getNewMock(Model model){
return "mock";
}
@ModelAttribute("eventList")
public List<Event> eventList() {

14
src/main/java/com/release11/klaus/controller/KlausMvcController.java
View File

@@ -44,7 +44,7 @@ public class KlausMvcController {
if (clientUUID != null) mockedMessageDto.setClientUUID(clientUUID);
else mockedMessageDto.setClientUUID(UUID.randomUUID());
populateModelVars(model, mockedMessageDto,true);
return "index";
return "mock";
}
@PostMapping("/mock/{uuid}")
@@ -60,7 +60,7 @@ public class KlausMvcController {
populateModelVars(model, mockedMessageDto,true);
model.addAttribute("mockSaved", "true");
model.addAttribute("canTest", "true");
return "index";
return "mock";
}
@PostMapping(value="/mock/{uuid}", params={"newMessage"})
@@ -68,7 +68,7 @@ public class KlausMvcController {
MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, new LinkedHashMap<>());
populateModelVars(model, mockedMessageDto, true);
model.addAttribute("mockedMessageDto", mockedMessageDto);
return "index";
return "mock";
}
@GetMapping("/mock/getMockedResponse")
@@ -86,14 +86,14 @@ public class KlausMvcController {
@RequestParam String headerValue, final Model model) {
populateModelVars(model, mockedMessageDto,false);
mockedMessageDto.getHttpHeaders().put(headerKey, headerValue);
return "index";
return "mock";
}
@PostMapping(value="/mock/{uuid}", params={"removeHeader"})
public String removeHeader(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
populateModelVars(model, mockedMessageDto,false);
mockedMessageDto.getHttpHeaders().remove(req.getParameter("removeHeader"));
return "index";
return "mock";
}
@PostMapping(value="/mock/{uuid}", params={"updateMessage"})
@@ -102,7 +102,7 @@ public class KlausMvcController {
model.addAttribute("mockedMessageDto", klausService.getMockedResponse(mockedMessageDto.getClientUUID(),
Integer.parseInt(req.getParameter("updateMessage"))));
model.addAttribute("canTest", "true");
return "index";
return "mock";
}
@PostMapping(value="/mock/{uuid}", params={"removeMessage"})
@@ -113,7 +113,7 @@ public class KlausMvcController {
klausService.deleteMockedResponse(mockedMessageDto.getClientUUID(),
Integer.parseInt(req.getParameter("removeMessage")));
populateModelVars(model, mockedMessageDto, true);
return "index";
return "mock";
}
@SneakyThrows

4
src/main/resources/templates/mock.html
View File

@@ -26,9 +26,7 @@
<div id="itemDataHead" class="articleHead">Your message</div>
<div id="link">
<p class="label">Your link</p>
<div id="messageLink" class="borderStyle">
https://www.release11.com/tools/mock/1238715-hjdf7/1
</div>
<div id="messageLink" class="borderStyle">http://<span id="pubhost">localhost</span>:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/[[${mockedMessageDto.mockedResponseId}]]</div>
</div>
<div id="msgBody">
<div id="typeSelection">

104
src/test/java/com/release11/klaus/controller/EventControllerTest.java
View File

@@ -1,104 +0,0 @@
//package com.release11.klaus.controller;
//
//import com.release11.klaus.model.Event;
//import com.release11.klaus.model.EventRequestDto;
//import com.release11.klaus.service.EtrackService;
//import org.junit.jupiter.api.BeforeEach;
//import org.junit.jupiter.api.Test;
//import org.junit.jupiter.api.extension.ExtendWith;
//import org.mockito.InjectMocks;
//import org.mockito.Mock;
//import org.mockito.junit.jupiter.MockitoExtension;
//import org.springframework.test.web.servlet.MockMvc;
//import org.springframework.test.web.servlet.setup.MockMvcBuilders;
//
//import java.time.LocalDateTime;
//import java.util.LinkedList;
//import java.util.List;
//import java.util.UUID;
//
//import static org.mockito.ArgumentMatchers.any;
//import static org.mockito.Mockito.verify;
//import static org.mockito.Mockito.when;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
//
//@ExtendWith(MockitoExtension.class)
//class EventControllerTest {
//
// @Mock
// EtrackService etrackService;
//
// MockMvc mockMvc;
// EventRequestDto eventRequestDto;
// UUID uuid;
// List<Event> eventList = new LinkedList<>();
//
// @InjectMocks
// EventController eventController;
//
// @BeforeEach
// void beforeEach() {
// uuid = UUID.randomUUID();
// eventRequestDto = EventRequestDto.builder()
// .clientUUID(uuid)
// .localDateTimeFrom(LocalDateTime.now().minusDays(5))
// .localDateTimeTo(LocalDateTime.now())
// .mockedResponseId(372)
// .build();
// eventList.add(Event.builder()
// .dateTimeStamp(LocalDateTime.now())
// .interfaceName("deleteMockedResponse")
// .clientUUID(uuid.toString())
// .messageId(372)
// .thread("the best thread")
// .level("the highest level")
// .message("Message 372 has been removed.")
// .build());
//
// mockMvc = MockMvcBuilders.standaloneSetup(eventController).build();
// }
//
// @Test
// void showEtrack() throws Exception {
// mockMvc.perform(get("/etrack/" + uuid)
// .param("clientUUID", String.valueOf(uuid))
// .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6)))
// .param("localDateTimeTo", String.valueOf(LocalDateTime.now()))
// .param("mockedResponseId", "332"))
// .andExpect(status().isOk())
// .andExpect(view().name("etrack"))
// .andExpect(model().attribute("clientUUID", uuid))
// .andExpect(model().attributeExists("eventRequestDto"));
// }
//
// @Test
// void getLogs() throws Exception {
// when(etrackService.getEventsByDateTimeAndBusinessKeys(any()))
// .thenReturn(eventList);
//
// mockMvc.perform(post("/etrack/" + uuid)
// .param("clientUUID", String.valueOf(uuid))
// .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6)))
// .param("localDateTimeTo", String.valueOf(LocalDateTime.now()))
// .param("mockedResponseId", "332"))
// .andExpect(status().isOk())
// .andExpect(view().name("etrack"))
// .andExpect(model().attribute("clientUUID", uuid))
// .andExpect(model().attributeExists("eventRequestDto"))
// .andExpect(model().attributeExists("eventList"));
//
// verify(etrackService).getEventsByDateTimeAndBusinessKeys(any());
// }
//
// @Test
// void eventRequestDto() {
// assert eventController.eventRequestDto() != null;
// }
//
// @Test
// void eventList() {
// assert eventController.eventList() != null;
// }
//}

16
src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
View File

@@ -61,7 +61,7 @@ class KlausMvcControllerTest {
mockMvc.perform(get("/mock/" + uuid))
.andExpect(status().isOk())
.andExpect(view().name("index"))
.andExpect(view().name("mock"))
.andExpect(model().attributeExists("mockedMessageDtoList"));
verify(klausService).getAllMockedResponses(any());
@@ -77,7 +77,7 @@ class KlausMvcControllerTest {
.param("httpStatus", "200"))
.andExpect(status().isOk())
.andExpect(model().attributeExists("mockedMessageDtoList"))
.andExpect(view().name("index"));
.andExpect(view().name("mock"));
verify(klausService).setMockedResponse(any());
}
@@ -93,7 +93,7 @@ class KlausMvcControllerTest {
// .andExpect(status().isOk())
// .andExpect(model().attributeHasErrors("mockedMessageDto"))
// .andExpect(model().attributeHasFieldErrors("mockedMessageDto", "mockedResponseId"))
// .andExpect(view().name("index"));
// .andExpect(view().name("mock"));
}
@Test
@@ -106,7 +106,7 @@ class KlausMvcControllerTest {
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
.andExpect(status().isOk())
.andExpect(model().attributeExists("mockedMessageDtoList"))
.andExpect(view().name("index"));
.andExpect(view().name("mock"));
verify(klausService).getAllMockedResponses(any());
}
@@ -138,7 +138,7 @@ class KlausMvcControllerTest {
// .param("headerValue", "myValue")
// .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
// .andExpect(status().isOk())
// .andExpect(view().name("index"))
// .andExpect(view().name("mock"))
// .andExpect(model().attributeExists("mockedMessageDtoList"));
//
// verify(klausService, times(0)).getAllMockedResponses(any());
@@ -153,7 +153,7 @@ class KlausMvcControllerTest {
// .param("removeHeader", "removeHeader")
// .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
// .andExpect(status().isOk())
// .andExpect(view().name("index"))
// .andExpect(view().name("mock"))
// .andExpect(model().attributeExists("mockedMessageDtoList"));
//
// verify(klausService, times(0)).getAllMockedResponses(any());
@@ -169,7 +169,7 @@ class KlausMvcControllerTest {
mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("updateMessage", "323"))
.andExpect(status().isOk())
.andExpect(view().name("index"))
.andExpect(view().name("mock"))
.andExpect(model().attributeExists("canTest"))
.andExpect(model().attributeExists("mockedMessageDtoList"));
@@ -185,7 +185,7 @@ class KlausMvcControllerTest {
mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("removeMessage", "323"))
.andExpect(status().isOk())
.andExpect(view().name("index"))
.andExpect(view().name("mock"))
.andExpect(model().attributeDoesNotExist("canTest"))
.andExpect(model().attributeExists("mockedMessageDtoList"));