(chore) reduce test objects, reuse simple stuff

This commit is contained in:
Andreas Penski (init) 2020-03-23 13:45:59 +01:00
parent d7f4a78fbc
commit 515b45bc6e
2 changed files with 24 additions and 25 deletions

View file

@ -22,7 +22,6 @@ package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException; import java.io.IOException;
import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -34,6 +33,7 @@ import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
/** /**
@ -43,7 +43,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction;
*/ */
public class ExtractHtmlActionTest { public class ExtractHtmlActionTest {
private static final URL REPORT = SerializeReportActionTest.class.getResource("/examples/results/report.xml");
private ExtractHtmlContentAction action; private ExtractHtmlContentAction action;
@ -51,24 +50,24 @@ public class ExtractHtmlActionTest {
@Before @Before
public void setup() throws IOException { public void setup() throws IOException {
tmpDirectory = Files.createTempDirectory("checktool"); this.tmpDirectory = Files.createTempDirectory("checktool");
action = new ExtractHtmlContentAction(Helper.loadTestRepository(), tmpDirectory); this.action = new ExtractHtmlContentAction(Helper.loadTestRepository(), this.tmpDirectory);
} }
@After @After
public void tearDown() throws IOException { public void tearDown() throws IOException {
FileUtils.deleteDirectory(tmpDirectory.toFile()); FileUtils.deleteDirectory(this.tmpDirectory.toFile());
} }
@Test @Test
public void testSimple() throws IOException { public void testSimple() throws IOException {
CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(REPORT)); final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID));
assertThat(action.isSkipped(b)).isTrue(); assertThat(this.action.isSkipped(b)).isTrue();
b.setReport(Helper.load(REPORT)); b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL()));
action.check(b); this.action.check(b);
assertThat(action.isSkipped(b)).isFalse(); assertThat(this.action.isSkipped(b)).isFalse();
action.check(b); this.action.check(b);
assertThat(b.isStopped()).isFalse(); assertThat(b.isStopped()).isFalse();
assertThat(Files.list(tmpDirectory).collect(Collectors.toList())).hasSize(1); assertThat(Files.list(this.tmpDirectory).collect(Collectors.toList())).hasSize(1);
} }
} }

View file

@ -22,7 +22,7 @@ package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.MalformedURLException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -33,6 +33,7 @@ import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
/** /**
@ -40,7 +41,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction;
*/ */
public class SerializeReportActionTest { public class SerializeReportActionTest {
private static final URL REPORT = SerializeReportActionTest.class.getResource("/examples/results/report.xml");
private Path tmpDirectory; private Path tmpDirectory;
@ -48,31 +48,31 @@ public class SerializeReportActionTest {
@Before @Before
public void setup() throws IOException { public void setup() throws IOException {
tmpDirectory = Files.createTempDirectory("checktool"); this.tmpDirectory = Files.createTempDirectory("checktool");
action = new SerializeReportAction(tmpDirectory); this.action = new SerializeReportAction(this.tmpDirectory);
} }
@After @After
public void tearDown() throws IOException { public void tearDown() throws IOException {
FileUtils.deleteDirectory(tmpDirectory.toFile()); FileUtils.deleteDirectory(this.tmpDirectory.toFile());
} }
@Test @Test
public void testSimpleSerialize() { public void testSimpleSerialize() throws MalformedURLException {
CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(REPORT)); final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID));
assertThat(action.isSkipped(b)).isTrue(); assertThat(this.action.isSkipped(b)).isTrue();
b.setReport(Helper.load(REPORT)); b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL()));
assertThat(action.isSkipped(b)).isFalse(); assertThat(this.action.isSkipped(b)).isFalse();
action.check(b); this.action.check(b);
assertThat(b.isStopped()).isFalse(); assertThat(b.isStopped()).isFalse();
assertThat(tmpDirectory.toFile().listFiles()).hasSize(1); assertThat(this.tmpDirectory.toFile().listFiles()).hasSize(1);
} }
//ERPT-83 //ERPT-83
@Test @Test
public void testName(){ public void testName(){
final String name = "some.name.with.dots"; 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); assertThat(b.getName()).isEqualTo(name);
} }