From b9858f2e7c8a86da872f05bc6bca210a51cf42e5 Mon Sep 17 00:00:00 2001 From: Chris <Christopher.Happe@uni-duesseldorf.de> Date: Wed, 3 Feb 2021 11:37:13 +0100 Subject: [PATCH] Update Tests to match installation and method signature of assertEquals. --- src/test/java/de/hhu/stups/codegenerator/cpp/TestCpp.java | 4 ++-- src/test/java/de/hhu/stups/codegenerator/java/TestJava.java | 4 ++-- .../java/de/hhu/stups/codegenerator/python/TestPython.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/de/hhu/stups/codegenerator/cpp/TestCpp.java b/src/test/java/de/hhu/stups/codegenerator/cpp/TestCpp.java index 554831ec4..66f5d54a3 100644 --- a/src/test/java/de/hhu/stups/codegenerator/cpp/TestCpp.java +++ b/src/test/java/de/hhu/stups/codegenerator/cpp/TestCpp.java @@ -70,7 +70,7 @@ public class TestCpp { Path mainPath = cppFilePaths.get(cppFilePaths.size() - 1); Process compileProcess = runtime - .exec("g++ -std=c++14 -O2 -flto -march=native -g -DIMMER_NO_THREAD_SAFETY -o " + machineName + ".exec" + " out/test/resources/de/hhu/stups/codegenerator/" + machine + ".cpp"); + .exec("g++ -std=c++14 -O2 -flto -march=native -g -DIMMER_NO_THREAD_SAFETY -o " + machineName + ".exec" + " build/resources/test/de/hhu/stups/codegenerator/" + machine + ".cpp"); compileProcess.waitFor(); String error = streamToString(compileProcess.getErrorStream()); @@ -95,7 +95,7 @@ public class TestCpp { System.out.println("Assert: " + result + " = " + expectedOutput); - assertEquals(result, expectedOutput); + assertEquals(expectedOutput, result); cleanUp(mainPath.toString()); } diff --git a/src/test/java/de/hhu/stups/codegenerator/java/TestJava.java b/src/test/java/de/hhu/stups/codegenerator/java/TestJava.java index e9098d512..be55a3b26 100644 --- a/src/test/java/de/hhu/stups/codegenerator/java/TestJava.java +++ b/src/test/java/de/hhu/stups/codegenerator/java/TestJava.java @@ -89,7 +89,7 @@ public class TestJava { return; } - Process executeProcess = runtime.exec("java -cp btypes_persistent.jar:out/test/resources/de/hhu/stups/codegenerator/" + machinePath.substring(0, machinePath.length() - machineName.length()) + " " + machineName); + Process executeProcess = runtime.exec("java -cp btypes_persistent.jar:build/resources/test/de/hhu/stups/codegenerator/" + machinePath.substring(0, machinePath.length() - machineName.length()) + " " + machineName); executeProcess.waitFor(); error = streamToString(executeProcess.getErrorStream()); @@ -102,7 +102,7 @@ public class TestJava { System.out.println("Assert: " + result + " = " + expectedOutput); - assertEquals(result, expectedOutput); + assertEquals(expectedOutput, result); Set<File> classFiles = javaFilePaths.stream() .map(path -> new File(path.getParent().toFile(), machinePath + ".class")) diff --git a/src/test/java/de/hhu/stups/codegenerator/python/TestPython.java b/src/test/java/de/hhu/stups/codegenerator/python/TestPython.java index c3df84a78..01a3ecc2e 100644 --- a/src/test/java/de/hhu/stups/codegenerator/python/TestPython.java +++ b/src/test/java/de/hhu/stups/codegenerator/python/TestPython.java @@ -64,7 +64,7 @@ public class TestPython { } ProcessBuilder processBuilder = new ProcessBuilder(); - processBuilder.environment().put("PYTHONPATH", "btypes_persistent.jar"); + processBuilder.environment().put("PYTHONPATH", "btypes_primitives/src/main/python"); processBuilder.command("python", "build/resources/test/de/hhu/stups/codegenerator/" + machinePath.substring(0, machinePath.length() - machineName.length()) + machineName + ".py"); Process executeProcess = processBuilder.start(); executeProcess.waitFor(); @@ -79,7 +79,7 @@ public class TestPython { System.out.println("Assert: " + result + " = " + expectedOutput); - assertEquals(result, expectedOutput); + assertEquals(expectedOutput, result); /*Set<File> classFiles = pythonFilePaths.stream() .map(path -> new File(path.getParent().toFile(), machinePath + ".class")) -- GitLab