aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-22 15:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

extract ui into dedicated module

Browse Source
This commit is contained in:
Carsten Otto
2022-05-11 08:17:54 +02:00
parent 14f70219b4
commit 5959ee5b38
64 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java
View File

@@ -1,39 +0,0 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.model.ChannelIdResolver;
import de.cotto.lndmanagej.ui.controller.ChannelDetailsController;
import de.cotto.lndmanagej.ui.page.PageService;
import de.cotto.lndmanagej.ui.page.channel.ChannelDetailsPage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.web.servlet.MockMvc;
import static de.cotto.lndmanagej.controller.dto.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO;
import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@WebMvcTest(controllers = ChannelDetailsController.class)
class ChannelDetailsControllerIT {
@Autowired
private MockMvc mockMvc;
@MockBean
private PageService pageService;
@MockBean
@SuppressWarnings("unused")
private ChannelIdResolver channelIdResolver;
@Test
void node_details_page() throws Exception {
when(pageService.channelDetails(any())).thenReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO));
mockMvc.perform(get("/channel/" + CHANNEL_ID))
.andExpect(status().isOk());
}
}

54
web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java
View File

@@ -1,54 +0,0 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.model.ChannelIdResolver;
import de.cotto.lndmanagej.ui.controller.DashboardController;
import de.cotto.lndmanagej.ui.dto.NodeDto;
import de.cotto.lndmanagej.ui.dto.OpenChannelDto;
import de.cotto.lndmanagej.ui.dto.StatusModel;
import de.cotto.lndmanagej.ui.page.PageService;
import de.cotto.lndmanagej.ui.page.general.DashboardPage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.web.servlet.MockMvc;
import java.util.List;
import static de.cotto.lndmanagej.controller.dto.NodesAndChannelsWithWarningsDto.NONE;
import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHANNEL_DTO;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@WebMvcTest(controllers = DashboardController.class)
class DashboardControllerIT {
@Autowired
private MockMvc mockMvc;
@MockBean
private PageService pageService;
@MockBean
@SuppressWarnings("unused")
private ChannelIdResolver channelIdResolver;
@Test
void empty_dashboard() throws Exception {
when(pageService.dashboard()).thenReturn(
new DashboardPage(List.of(), List.of(), new StatusModel(true, 1, NONE))
);
mockMvc.perform(get("/")).andExpect(status().isOk());
}
@Test
void dashboard() throws Exception {
OpenChannelDto channel = OPEN_CHANNEL_DTO;
NodeDto node = new NodeDto(channel.remotePubkey().toString(), channel.remoteAlias(), true);
when(pageService.dashboard()).thenReturn(
new DashboardPage(List.of(channel), List.of(node), new StatusModel(true, 1, NONE))
);
mockMvc.perform(get("/")).andExpect(status().isOk());
}
}

38
web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java
View File

@@ -1,38 +0,0 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.model.ChannelIdResolver;
import de.cotto.lndmanagej.ui.controller.NodeDetailsController;
import de.cotto.lndmanagej.ui.page.PageService;
import de.cotto.lndmanagej.ui.page.node.NodeDetailsPage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.web.servlet.MockMvc;
import static de.cotto.lndmanagej.controller.dto.NodeDetailsDtoFixture.NODE_DETAILS_DTO;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@WebMvcTest(controllers = NodeDetailsController.class)
class NodeDetailsControllerIT {
@Autowired
private MockMvc mockMvc;
@MockBean
private PageService pageService;
@MockBean
@SuppressWarnings("unused")
private ChannelIdResolver channelIdResolver;
@Test
void testNodeDetailsPage() throws Exception {
when(pageService.nodeDetails(any())).thenReturn(new NodeDetailsPage(NODE_DETAILS_DTO));
mockMvc.perform(get("/node/" + NODE_DETAILS_DTO.node().toString()))
.andExpect(status().isOk());
}
}

136
web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java
View File

@@ -1,136 +0,0 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.model.ChannelIdResolver;
import de.cotto.lndmanagej.ui.controller.SearchController;
import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto;
import de.cotto.lndmanagej.ui.dto.NodeDto;
import de.cotto.lndmanagej.ui.dto.OpenChannelDto;
import de.cotto.lndmanagej.ui.page.PageService;
import de.cotto.lndmanagej.ui.page.channel.ChannelDetailsPage;
import de.cotto.lndmanagej.ui.page.general.ErrorPage;
import de.cotto.lndmanagej.ui.page.node.NodeDetailsPage;
import de.cotto.lndmanagej.ui.page.node.NodesPage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import static de.cotto.lndmanagej.controller.dto.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO;
import static de.cotto.lndmanagej.controller.dto.NodeDetailsDtoFixture.NODE_DETAILS_DTO;
import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHANNEL_DTO;
import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.WOS;
import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
import static de.cotto.lndmanagej.model.ChannelPointFixtures.CHANNEL_POINT;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.when;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
@WebMvcTest(controllers = SearchController.class)
class SearchControllerIT {
@Autowired
private MockMvc mockMvc;
@MockBean
private UiDataService dataService;
@MockBean
private PageService pageService;
@MockBean
@SuppressWarnings("unused")
private ChannelIdResolver channelIdResolver;
@Test
void search_noOpenChannels_errorPage() throws Exception {
when(dataService.getOpenChannels()).thenReturn(List.of());
when(pageService.error(any())).thenReturn(new ErrorPage("myErrorMessage"));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + CHANNEL_ID))
.andExpect(status().isOk())
.andExpect(model().attribute("error", "myErrorMessage"))
.andExpect(view().name("error"));
}
@Test
void searchForChannelId_viaShortChannelId_found() throws Exception {
searchForChannelId(CHANNEL_ID.getShortChannelId());
}
@Test
void searchForChannelId_viaCompactChannelId_found() throws Exception {
searchForChannelId(CHANNEL_ID);
}
@Test
void searchForChannelId_viaChannelPoint_found() throws Exception {
when(channelIdResolver.resolveFromChannelPoint(CHANNEL_POINT)).thenReturn(Optional.of(CHANNEL_ID));
searchForChannelId(CHANNEL_POINT.toString());
}
private void searchForChannelId(Object query) throws Exception {
when(dataService.getOpenChannels()).thenReturn(
List.of(openChannelDto(CHANNEL_DETAILS_DTO))
);
when(pageService.channelDetails(any())).thenReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + query))
.andExpect(status().isOk())
.andExpect(model().attribute("id", is(CHANNEL_DETAILS_DTO.channelId())))
.andExpect(view().name("channel-details"));
}
@Test
void searchForPubkey_found() throws Exception {
searchAndExpectSingleNode(NODE_DETAILS_DTO.node().toString());
}
@Test
void searchForAlias_found() throws Exception {
searchAndExpectSingleNode("albert");
}
private void searchAndExpectSingleNode(String query) throws Exception {
when(dataService.getOpenChannels()).thenReturn(List.of(OPEN_CHANNEL_DTO));
when(pageService.nodeDetails(any())).thenReturn(new NodeDetailsPage(NODE_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + query))
.andExpect(status().isOk())
.andExpect(model().attribute("pubkey", is(OPEN_CHANNEL_DTO.remotePubkey())))
.andExpect(view().name("node-details"));
}
@Test
void searchForAlias_TwoNodesFound() throws Exception {
when(dataService.getOpenChannels()).thenReturn(List.of(OPEN_CHANNEL_DTO, WOS));
when(pageService.nodes(any())).thenReturn(nodesPage(OPEN_CHANNEL_DTO, WOS));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=al"))
.andExpect(status().isOk())
.andExpect(model().attributeExists("nodes"))
.andExpect(view().name("nodes"));
}
private NodesPage nodesPage(OpenChannelDto... channels) {
return new NodesPage(Arrays.stream(channels).map(this::nodeDto).toList());
}
public OpenChannelDto openChannelDto(ChannelDetailsDto channelDetails) {
return new OpenChannelDto(
channelDetails.channelId(),
channelDetails.remoteAlias(),
channelDetails.remotePubkey(),
channelDetails.policies(),
channelDetails.balanceInformation());
}
public NodeDto nodeDto(OpenChannelDto channel) {
return new NodeDto(channel.remotePubkey().toString(), channel.remoteAlias(), true);
}
}