From 6057bdcfe3bb16f9be564fe0fad44ff8dd4f838d Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Wed, 11 May 2022 09:41:57 +0200 Subject: [PATCH] fix tests --- .../de/cotto/lndmanagej/SpringBootConfiguration.java | 7 +++++++ .../de/cotto/lndmanagej/ui/DashboardControllerIT.java | 11 ----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java index 7b1634de..b6e766d6 100644 --- a/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java +++ b/ui/src/integrationTest/java/de/cotto/lndmanagej/SpringBootConfiguration.java @@ -1,10 +1,17 @@ package de.cotto.lndmanagej; +import de.cotto.lndmanagej.ui.formatting.Formatter; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; @SpringBootApplication public class SpringBootConfiguration { public SpringBootConfiguration() { // default constructor } + + @Bean + public Formatter formatter() { + return new Formatter(); + } } diff --git a/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java index 9b5a9a20..0965ad92 100644 --- a/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java +++ b/ui/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java @@ -5,15 +5,12 @@ 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.formatting.Formatter; 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.context.TestConfiguration; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Bean; import org.springframework.test.web.servlet.MockMvc; import java.util.List; @@ -54,12 +51,4 @@ class DashboardControllerIT { ); mockMvc.perform(get("/")).andExpect(status().isOk()); } - - @TestConfiguration - static class AdditionalConfiguration { - @Bean - public Formatter formatter() { - return new Formatter(); - } - } }