htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update JUnit to v14.13.2

Browse Source
This commit is contained in:
Sebastian Serth
2022-08-02 10:54:09 +02:00
committed by Sebastian Serth
parent 9d54a40340
commit a7b4b25e61
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/aws/java11Exec/pom.xml
View File

@ -35,7 +35,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest-core -->
<dependency>

4
deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
View File

@ -71,8 +71,8 @@ class SimpleMakefile {
.map(s -> s.startsWith("@") ? s.substring(1) : s)
.map(s -> s.contains("#") ? s.substring(0, s.indexOf("#")) : s)
.filter(s -> !s.isEmpty())
.map(s -> s.replaceAll("/usr/java/lib/hamcrest-core-1.3.jar", "/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar"))
.map(s -> s.replaceAll("/usr/java/lib/junit-4.11.jar", "/var/task/lib/junit.junit-4.11.jar"))
.map(s -> s.replaceAll("/usr/java/lib/hamcrest-core-1\\.3\\.jar", "/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar"))
.map(s -> s.replaceAll("/usr/java/lib/junit-4\\.13\\.jar", "/var/task/lib/junit.junit-4.13.2.jar"))
.toArray(String[]::new);
rules.put(ruleName, trimmedCommands);

8
deploy/aws/java11Exec/src/test/java/poseidon/SimpleMakefileTest.java
View File

@ -39,8 +39,8 @@ public class SimpleMakefileTest {
static final String SuccessfulMakefileWithAssignments = Base64.getEncoder().encodeToString(
("test:\n" +
"\tjavac -encoding utf8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.11.jar ${FILENAME}\n" +
"\tjava -Dfile.encoding=UTF8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.11.jar org.junit.runner.JUnitCore ${CLASS_NAME}\n"
"\tjavac -encoding utf8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.13.jar ${FILENAME}\n" +
"\tjava -Dfile.encoding=UTF8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.13.jar org.junit.runner.JUnitCore ${CLASS_NAME}\n"
).getBytes(StandardCharsets.UTF_8));
static final String SuccessfulMakefileWithComment = Base64.getEncoder().encodeToString(
@ -126,8 +126,8 @@ public class SimpleMakefileTest {
SimpleMakefile make = new SimpleMakefile(files);
String cmd = make.parseCommand(command);
assertEquals("javac -encoding utf8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.11.jar RecursiveMath-Test.java && " +
"java -Dfile.encoding=UTF8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.11.jar org.junit.runner.JUnitCore RecursiveMath", cmd);
assertEquals("javac -encoding utf8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.13.2.jar RecursiveMath-Test.java && " +
"java -Dfile.encoding=UTF8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.13.2.jar org.junit.runner.JUnitCore RecursiveMath", cmd);
} catch (NoMakefileFoundException | InvalidMakefileException | NoMakeCommandException ignored) {
fail();
}