From dce814d7a0a8ac601f0c2f6d9338f6e14b8a82c4 Mon Sep 17 00:00:00 2001 From: Jaco de Groot Date: Tue, 24 Sep 2024 12:28:40 +0200 Subject: [PATCH] Fix TestRerun doesn't create dir for data/file-storage/ladybug.tts --- .../testtool/test/junit/rerun/TestRerun.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/test/java/nl/nn/testtool/test/junit/rerun/TestRerun.java b/src/test/java/nl/nn/testtool/test/junit/rerun/TestRerun.java index d9e44357..71c56052 100644 --- a/src/test/java/nl/nn/testtool/test/junit/rerun/TestRerun.java +++ b/src/test/java/nl/nn/testtool/test/junit/rerun/TestRerun.java @@ -19,20 +19,13 @@ import static org.junit.Assert.assertNull; import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestName; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameter; -import org.junit.runners.Parameterized.Parameters; import lombok.SneakyThrows; -import nl.nn.testtool.Checkpoint; import nl.nn.testtool.Report; import nl.nn.testtool.Rerunner; import nl.nn.testtool.SecurityContext; @@ -40,40 +33,19 @@ import nl.nn.testtool.run.ReportRunner; import nl.nn.testtool.storage.Storage; import nl.nn.testtool.storage.StorageException; -import nl.nn.testtool.test.junit.Common; import nl.nn.testtool.test.junit.ReportRelatedTestCase; /** * @author Jaco de Groot */ @RunWith(Parameterized.class) -public class TestRerun { - @Parameters(name = "{0}") - public static Collection data() { - return Arrays.asList(new Object[][] { - {"File storage", (TestTool) Common.CONTEXT_FILE_STORAGE.getBean("testTool")}, - {"Memory storage", (TestTool) Common.CONTEXT_MEM_STORAGE.getBean("testTool")}, - {"Database storage", (TestTool) Common.CONTEXT_DB_STORAGE.getBean("testTool")} - }); - } - - @Parameter(0) - public String storageDescription; - - @Parameter(1) - public TestTool testTool; - - private String reportName; - +public class TestRerun extends ReportRelatedTestCase { public static final String RESOURCE_PATH = "nl/nn/testtool/test/junit/rerun/"; private static Integer i; - @Rule - public TestName name = new TestName(); - @Before public void setUp() { - reportName = Common.methodNameWithoutTestParameter(name.getMethodName()); + super.setUp(); i = 0; }