From 515b45bc6e5624dbf2be1d068b4d2acaa4403f73 Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Mon, 23 Mar 2020 13:45:59 +0100 Subject: [PATCH] (chore) reduce test objects, reuse simple stuff --- .../cmd/ExtractHtmlActionTest.java | 23 ++++++++-------- .../cmd/SerializeReportActionTest.java | 26 +++++++++---------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java b/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java index 9c308a1..75c0449 100644 --- a/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java @@ -22,7 +22,6 @@ package de.kosit.validationtool.cmd; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.util.stream.Collectors; @@ -34,6 +33,7 @@ import org.junit.Test; import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.impl.Helper; +import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.tasks.CheckAction; /** @@ -43,7 +43,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction; */ public class ExtractHtmlActionTest { - private static final URL REPORT = SerializeReportActionTest.class.getResource("/examples/results/report.xml"); private ExtractHtmlContentAction action; @@ -51,24 +50,24 @@ public class ExtractHtmlActionTest { @Before public void setup() throws IOException { - tmpDirectory = Files.createTempDirectory("checktool"); - action = new ExtractHtmlContentAction(Helper.loadTestRepository(), tmpDirectory); + this.tmpDirectory = Files.createTempDirectory("checktool"); + this.action = new ExtractHtmlContentAction(Helper.loadTestRepository(), this.tmpDirectory); } @After public void tearDown() throws IOException { - FileUtils.deleteDirectory(tmpDirectory.toFile()); + FileUtils.deleteDirectory(this.tmpDirectory.toFile()); } @Test public void testSimple() throws IOException { - CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(REPORT)); - assertThat(action.isSkipped(b)).isTrue(); - b.setReport(Helper.load(REPORT)); - action.check(b); - assertThat(action.isSkipped(b)).isFalse(); - action.check(b); + final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID)); + assertThat(this.action.isSkipped(b)).isTrue(); + b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL())); + this.action.check(b); + assertThat(this.action.isSkipped(b)).isFalse(); + this.action.check(b); assertThat(b.isStopped()).isFalse(); - assertThat(Files.list(tmpDirectory).collect(Collectors.toList())).hasSize(1); + assertThat(Files.list(this.tmpDirectory).collect(Collectors.toList())).hasSize(1); } } diff --git a/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java b/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java index 12960c3..d0373f2 100644 --- a/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java @@ -22,7 +22,7 @@ package de.kosit.validationtool.cmd; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import java.net.URL; +import java.net.MalformedURLException; import java.nio.file.Files; import java.nio.file.Path; @@ -33,6 +33,7 @@ import org.junit.Test; import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.impl.Helper; +import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.tasks.CheckAction; /** @@ -40,7 +41,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction; */ public class SerializeReportActionTest { - private static final URL REPORT = SerializeReportActionTest.class.getResource("/examples/results/report.xml"); private Path tmpDirectory; @@ -48,31 +48,31 @@ public class SerializeReportActionTest { @Before public void setup() throws IOException { - tmpDirectory = Files.createTempDirectory("checktool"); - action = new SerializeReportAction(tmpDirectory); + this.tmpDirectory = Files.createTempDirectory("checktool"); + this.action = new SerializeReportAction(this.tmpDirectory); } @After public void tearDown() throws IOException { - FileUtils.deleteDirectory(tmpDirectory.toFile()); + FileUtils.deleteDirectory(this.tmpDirectory.toFile()); } @Test - public void testSimpleSerialize() { - CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(REPORT)); - assertThat(action.isSkipped(b)).isTrue(); - b.setReport(Helper.load(REPORT)); - assertThat(action.isSkipped(b)).isFalse(); - action.check(b); + public void testSimpleSerialize() throws MalformedURLException { + final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID)); + assertThat(this.action.isSkipped(b)).isTrue(); + b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL())); + assertThat(this.action.isSkipped(b)).isFalse(); + this.action.check(b); assertThat(b.isStopped()).isFalse(); - assertThat(tmpDirectory.toFile().listFiles()).hasSize(1); + assertThat(this.tmpDirectory.toFile().listFiles()).hasSize(1); } //ERPT-83 @Test public void testName(){ final String name = "some.name.with.dots"; - CheckAction.Bag b = new CheckAction.Bag(InputFactory.read("ega".getBytes(), name + ".xml")); + final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read("ega".getBytes(), name + ".xml")); assertThat(b.getName()).isEqualTo(name); }