aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-30 11:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename "chan" to "channel"

Browse Source
This commit is contained in:
Carsten Otto
2022-05-10 19:25:58 +02:00
committed by Carsten Otto
parent cf03cf259e
commit 1c9595483b
10 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java → web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerTest.java
View File

@@ -1,7 +1,7 @@
package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.model.ChannelIdResolver;
import de.cotto.lndmanagej.ui.controller.ChanDetailsController;
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;
@@ -11,14 +11,14 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.web.servlet.MockMvc;
import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
import static de.cotto.lndmanagej.ui.model.ChanDetailsDtoFixture.CHAN_DETAILS_DTO;
import static de.cotto.lndmanagej.ui.model.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@WebMvcTest(controllers = ChanDetailsController.class)
class ChanDetailsControllerTest {
@WebMvcTest(controllers = ChannelDetailsController.class)
class ChannelDetailsControllerTest {
@Autowired
private MockMvc mockMvc;
@@ -32,7 +32,7 @@ class ChanDetailsControllerTest {
@Test
void testNodeDetailsPage() throws Exception {
given(pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
given(pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO));
mockMvc.perform(get("/channel/" + CHANNEL_ID))
.andExpect(status().isOk());
}

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

@@ -2,7 +2,7 @@ package de.cotto.lndmanagej.ui;
import de.cotto.lndmanagej.controller.ChannelIdConverter;
import de.cotto.lndmanagej.ui.controller.SearchController;
import de.cotto.lndmanagej.ui.dto.ChanDetailsDto;
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;
@@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import java.util.List;
import static de.cotto.lndmanagej.ui.model.ChanDetailsDtoFixture.CHAN_DETAILS_DTO;
import static de.cotto.lndmanagej.ui.model.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO;
import static de.cotto.lndmanagej.ui.model.NodeDetailsDtoFixture.NODE_DETAILS_DTO;
import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.OPEN_CHANNEL_DTO;
import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.WOS;
@@ -68,12 +68,12 @@ class SearchControllerTest {
private void searchForChannelId(String query) throws Exception {
given(this.dataService.getOpenChannels()).willReturn(
List.of(create(CHAN_DETAILS_DTO))
List.of(create(CHANNEL_DETAILS_DTO))
);
given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO));
mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + query))
.andExpect(status().isOk())
.andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId())))
.andExpect(model().attribute("id", is(CHANNEL_DETAILS_DTO.channelId())))
.andExpect(view().name("channel-details"));
}
@@ -111,7 +111,7 @@ class SearchControllerTest {
return new NodesPage(List.of(create(channel1), create(channel2)));
}
public static OpenChannelDto create(ChanDetailsDto channelDetails) {
public static OpenChannelDto create(ChannelDetailsDto channelDetails) {
return new OpenChannelDto(
channelDetails.channelId(),
channelDetails.remoteAlias(),