aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-23 07:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix checkstyle

Browse Source
This commit is contained in:
danielbroll
2022-05-10 12:31:11 +02:00
committed by Carsten Otto
parent 647de17c17
commit e7e7bcf374
14 changed files with 150 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerTest.java
View File

@@ -1,13 +1,13 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.controller.ChannelIdConverter;
import de.cotto.lndmanagej.ui.dto.StatusModel;
import de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture;
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.page.general.DashboardPage;
import de.cotto.lndmanagej.ui.dto.StatusModel;
import de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture;
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;
@@ -36,7 +36,9 @@ class DashboardControllerTest {
@Test
void testEmptyDashboard() throws Exception {
given(this.pageService.dashboard()).willReturn(new DashboardPage(List.of(), List.of(), new StatusModel(true, 1, NONE)));
given(this.pageService.dashboard()).willReturn(
new DashboardPage(List.of(), List.of(), new StatusModel(true, 1, NONE))
);
mockMvc.perform(MockMvcRequestBuilders.get("/")).andExpect(status().isOk());
}
@@ -44,7 +46,9 @@ class DashboardControllerTest {
void testDashboard() throws Exception {
OpenChannelDto channel = OpenChannelDtoFixture.OPEN_CHANNEL_DTO;
NodeDto node = new NodeDto(channel.remotePubkey().toString(), channel.remoteAlias(), true);
given(this.pageService.dashboard()).willReturn(new DashboardPage(List.of(channel), List.of(node), new StatusModel(true, 1, NONE)));
given(this.pageService.dashboard()).willReturn(
new DashboardPage(List.of(channel), List.of(node), new StatusModel(true, 1, NONE))
);
mockMvc.perform(MockMvcRequestBuilders.get("/")).andExpect(status().isOk());
}
}

2
web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerTest.java
View File

@@ -32,7 +32,7 @@ class NodeDetailsControllerTest {
@Test
void testNodeDetailsPage() throws Exception {
given(this.pageService.nodeDetails(any())).willReturn(new NodeDetailsPage(NODE_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/node/027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc121"))
mockMvc.perform(MockMvcRequestBuilders.get("/node/" + NODE_DETAILS_DTO.node().toString()))
.andExpect(status().isOk());
}
}

30
web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java
View File

@@ -1,9 +1,10 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.controller.ChannelIdConverter;
import de.cotto.lndmanagej.ui.controller.SearchController;
import de.cotto.lndmanagej.ui.dto.OpenChannelDto;
import de.cotto.lndmanagej.ui.model.NodeDtoFixture;
import de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture;
import de.cotto.lndmanagej.ui.controller.SearchController;
import de.cotto.lndmanagej.ui.page.PageService;
import de.cotto.lndmanagej.ui.page.channel.ChannelDetailsPage;
import de.cotto.lndmanagej.ui.page.general.ErrorPage;
@@ -25,7 +26,9 @@ import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.WOS;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
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 SearchControllerTest {
@@ -55,9 +58,11 @@ class SearchControllerTest {
@Test
void searchForChannelId_viaShortChannelId_found() throws Exception {
given(this.dataService.getOpenChannels()).willReturn(List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO)));
given(this.dataService.getOpenChannels()).willReturn(
List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO))
);
given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=783231610496155649") )
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=783231610496155649"))
.andExpect(status().isOk())
.andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId())))
.andExpect(view().name("channel-details"));
@@ -65,9 +70,11 @@ class SearchControllerTest {
@Test
void searchForChannelId_viaCompactChannelId_found() throws Exception {
given(this.dataService.getOpenChannels()).willReturn(List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO)));
given(this.dataService.getOpenChannels()).willReturn(
List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO))
);
given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=712345x123x1") )
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=712345x123x1"))
.andExpect(status().isOk())
.andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId())))
.andExpect(view().name("channel-details"));
@@ -77,7 +84,7 @@ class SearchControllerTest {
void searchForPubkey_found() throws Exception {
given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO));
given(this.pageService.nodeDetails(any())).willReturn(new NodeDetailsPage(NODE_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc121"))
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + NODE_DETAILS_DTO.node().toString()))
.andExpect(status().isOk())
.andExpect(model().attribute("pubkey", is(OPEN_CHANNEL_DTO.remotePubkey())))
.andExpect(view().name("node-details"));
@@ -95,12 +102,17 @@ class SearchControllerTest {
@Test
void searchForAlias_TwoNodesFound() throws Exception {
given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO, WOS)); //ALbert, wALletofsatotoshi
given(this.pageService.nodes(any())).willReturn(new NodesPage(List.of(NodeDtoFixture.createFrom(OPEN_CHANNEL_DTO), NodeDtoFixture.createFrom(WOS))));
given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO, WOS));
given(this.pageService.nodes(any())).willReturn(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 channel1, OpenChannelDto channel2) {
return new NodesPage(List.of(NodeDtoFixture.createFrom(channel1), NodeDtoFixture.createFrom(channel2)));
}
}