diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyReadTest.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyReadTest.java
index 39945ea5a45895e12b02b82df96a9132ed8bc947..3594cfd1a946ba42f65def205aa821354dba50e2 100644
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyReadTest.java
+++ b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyReadTest.java
@@ -11,8 +11,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test case "defaultOnlyRead".
diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyWriteTest.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyWriteTest.java
index 893e16c7cf305d1a2a1d640ce8e6d72424e21457..df4a22f5835df09a407595392a4969e7af9ee6f2 100644
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyWriteTest.java
+++ b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/DefaultOnlyWriteTest.java
@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Test case "defaultOnlyRead".
diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Errors.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Errors.java
index 3335c8d8db388ff8483833ccf14798f8382e5c50..a0fd5e7682f1accef3333eaf72261a6593e1c4d6 100644
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Errors.java
+++ b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Errors.java
@@ -4,6 +4,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jastadd.ros2rag.compiler.Compiler;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -16,6 +17,7 @@ import java.util.stream.Collectors;
import static org.jastadd.ros2rag.tests.TestUtils.exec;
import static org.jastadd.ros2rag.tests.TestUtils.readFile;
+import static org.junit.jupiter.api.Assertions.assertTrue;
class Errors {
@@ -24,6 +26,12 @@ class Errors {
private static final String INPUT_DIRECTORY = "./src/test/01-input/errors/";
private static final String OUTPUT_DIRECTORY = "./src/test/02-after-ros2rag/errors/";
+ @BeforeAll
+ public static void createOutputDirectory() {
+ File outputDirectory = new File(OUTPUT_DIRECTORY);
+ assertTrue((outputDirectory.exists() && outputDirectory.isDirectory()) || outputDirectory.mkdir());
+ }
+
@Test
void testStandardErrors() throws IOException {
test("Errors", "A");
diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/ExampleTest.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/ExampleTest.java
index af958fae3feb8ec50aee6f85917e6fe5f2139263..c22861e996826eaf720a33fe9e0c02f7b110978e 100644
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/ExampleTest.java
+++ b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/ExampleTest.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Test case "example".
diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read1Write2Test.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read1Write2Test.java
index bb5cb17b6b35a22f9e3a3a4a5061be609f869ec9..9c151da32e5ca12c1dea1ec4e23e4c3168ca4910 100644
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read1Write2Test.java
+++ b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read1Write2Test.java
@@ -7,8 +7,8 @@ import read1write2.ast.*;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test case "read-1-write-2".
diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read2Write1Test.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read2Write1Test.java
index a094b671f21c3bf168ebec37a829ec981f45b5d1..6c2b37b83629b245add25fd35659b7ce0ea0185a 100644
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read2Write1Test.java
+++ b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/Read2Write1Test.java
@@ -7,8 +7,8 @@ import read2write1.ast.*;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test case "read-1-write-2".
diff --git a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/RosToRagTest.java b/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/RosToRagTest.java
deleted file mode 100644
index adf19335a371d70a3b30efaf0d08a91a60360571..0000000000000000000000000000000000000000
--- a/ros2rag.tests/src/test/java/org/jastadd/ros2rag/tests/RosToRagTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.jastadd.ros2rag.tests;
-
-import org.jastadd.ros2rag.compiler.Compiler;
-import org.jastadd.ros2rag.compiler.options.CommandLine;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.nio.file.Paths;
-import java.util.Objects;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Disabled("migrating build logic from test to build, this test is disabled for now")
-public class RosToRagTest {
-
- void transform(String inputGrammar, String inputRos2Rag, String rootNode, String outputDir) throws CommandLine.CommandLineException, Compiler.CompilerException {
-
- System.out.println(Paths.get(".").toAbsolutePath());
- assertTrue(Paths.get(inputGrammar).toFile().exists(), "input grammar does not exist");
-
- File outputDirFile = Paths.get(outputDir).toFile();
- if (outputDirFile.exists()) {
- assertTrue(outputDirFile.isDirectory());
- if (Objects.requireNonNull(outputDirFile.list(), "Could not read output directory").length != 0) {
- System.out.println("output directory is not empty!");
- }
- } else {
- assertTrue(outputDirFile.mkdir());
- }
-
- String[] args = {
- "--outputDir=" + outputDir,
- "--inputGrammar=" + inputGrammar,
- "--inputRos2Rag=" + inputRos2Rag,
- "--rootNode=" + rootNode
- };
-
- new Compiler().run(args);
- }
-
- @Test
- void transformMinimalExample() throws CommandLine.CommandLineException, Compiler.CompilerException {
- transform("src/test/resources/Example.relast",
- "src/test/resources/Example.ros2rag",
- "Model",
- "src/test/resources/out");
- }
-}