diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java similarity index 74% rename from clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java rename to clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java index c675c958a..29842b5c2 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java @@ -9,11 +9,11 @@ import java.time.LocalDate; import static org.junit.jupiter.api.Assertions.assertEquals; -class ReportDataCollectorTest extends ReportWithPeriodCollector { +class AbstractReportCollectorTest extends AbstractReportCollector { @Test void testToString() { - ReportDataCollectorTest instance = new ReportDataCollectorTest(); + AbstractReportCollectorTest instance = new AbstractReportCollectorTest(); assertEquals(null, instance.toString((Long) null)); assertEquals("1", instance.toString((Long) 1L)); assertEquals("1230", instance.toString((Long) 1230L)); @@ -22,7 +22,7 @@ class ReportDataCollectorTest extends ReportWithPeriodCollector { @Test void testToString1() { - ReportDataCollectorTest instance = new ReportDataCollectorTest(); + AbstractReportCollectorTest instance = new AbstractReportCollectorTest(); assertEquals(null, instance.toString((Instant) null)); Instant val = Instant.ofEpochMilli(1672058774338L); assertEquals("26.12.2022T15:46:14", instance.toString(val)); // msk timezone @@ -30,14 +30,14 @@ class ReportDataCollectorTest extends ReportWithPeriodCollector { @Test void testToString2() { - ReportDataCollectorTest instance = new ReportDataCollectorTest(); + AbstractReportCollectorTest instance = new AbstractReportCollectorTest(); LocalDate val = LocalDate.of(2022, 12, 26); assertEquals("26.12.2022", instance.toString(val)); } @Test void testToString3() { - ReportDataCollectorTest instance = new ReportDataCollectorTest(); + AbstractReportCollectorTest instance = new AbstractReportCollectorTest(); assertEquals(null, instance.toString((BigDecimal)null)); assertEquals("0.00", instance.toString(BigDecimal.ZERO)); assertEquals("1.10", instance.toString(BigDecimal.valueOf(1.10))); @@ -48,7 +48,7 @@ class ReportDataCollectorTest extends ReportWithPeriodCollector { @Test void testToString4() { - ReportDataCollectorTest instance = new ReportDataCollectorTest(); + AbstractReportCollectorTest instance = new AbstractReportCollectorTest(); assertEquals(null, instance.toString((Double) null)); assertEquals("0.00", instance.toString(0.0)); assertEquals("1.10", instance.toString(1.10)); @@ -57,10 +57,6 @@ class ReportDataCollectorTest extends ReportWithPeriodCollector { assertEquals("100.13", instance.toString(100.125012)); } - @Override - public AbstractReport collectReportWithPeriod(LocalDate startDate, LocalDate endDate) { - throw new IllegalStateException("test"); - } @Override public Class getReportClass() {