Breaking release

README.md

@@ -91,3 +91,11 @@ Since the tests are mostly just jUnit tests, IntelliJ and other IDE's provide su
 Per exercise, create a new project. The `config.json` file should be in the project root. Mark (or create) the `workdir`, `evaluation` and `solution` directories as "sources root". Add jUnit 4 as a dependency of the project.
 
 If your exercises use some Dodona-specific features, such as the `TabTitle` or the `AssertionStubber`, add the Judge as a dependency. Opening this repository as an IntelliJ project should allow you to create a JAR.
+
+## Developing the judge
+
+While developing, you can use `./integration-tests/run` to validate whether the judge is working properly. It checks the judge's output JSON against previous results (stored as `result.json`) and monitors whether something has changed.
+
+You can also use `./integration-tests/run <path-to-repo>` to run the same checks on an exercise repository, which is useful to validate a larger set op exercises.
+
+With `---overwrite`, you can overwrite previous `result.json` files with the current output, and with `-v` you can check for judge error output and view the exact changes when output differs.

examples/diffing-testwriter/evaluation/TestSuite.java

@@ -1,9 +1,9 @@
 
-import org.junit.runners.Suite;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     TestWriterTest.class,
 })
 public class TestSuite {}

examples/diffing-testwriter/evaluation/TestWriterTest.java

@@ -1,16 +1,17 @@
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.Before;
+
 
 import dodona.reflection.AssertionStubber;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestWriterTest {
 
     private static dodona.junit.TestWriter testWriter = new dodona.junit.TestWriter();
 
     private TestWriterInterface solution;
 
-    @Before public void initialize() {
+    @BeforeEach
+    public void initialize() {
         solution = new AssertionStubber().stub(TestWriterInterface.class, TestWriter.class);
     }
 

examples/simple/evaluation/GeneratedTest.java

@@ -2,29 +2,35 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import dodona.junit.TabTitle;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * A more complex test class.
  *
  * Runs a larger number of generated tests.
  */
-@RunWith(Parameterized.class)
-@TabTitle("Random Tests") // Giving a name other than 'Test' to the tab in Dodona.
+@DisplayName("Random Tests") // Giving a name other than 'Test' to the tab in Dodona.
+@ParameterizedClass
+@MethodSource("data")
 public class GeneratedTest {
 
-    public static final int TEST_COUNT = 50;
+    public static final int TEST_COUNT = 2;
     public static final long SEED = 42; // Fixed random seed to get the same tests for every student.
-    public static final int TEST_MAX = 10000;
+    public static final int TEST_MAX = 100;
+
+
+    @Parameter(0)
+    int testNumber;
+    @Parameter(1)
+    int expected;
 
     /** This method generates a number of tests. */
 
-    @Parameterized.Parameters(name = "{index} | addOne({0}) == {1}")
     public static Iterable<Object[]> data() {
         List<Object[]> data = new ArrayList<>();
         Random random = new Random(SEED);
@@ -35,16 +41,12 @@ public static Iterable<Object[]> data() {
         return data;
     }
 
-    /* Each test, in order, is filled in here and run. */
-    @Parameterized.Parameter(value=0) public int testNumber;
-    @Parameterized.Parameter(value=1) public int expected;
-
     private static SimpleInterface studentSolution;
 
     @Test
     public void test() {
         if(studentSolution == null) studentSolution = new Simple();
-        Assert.assertEquals(expected, studentSolution.addOne(testNumber));
+        Assertions.assertEquals(expected, studentSolution.addOne(testNumber));
     }
 
 }

examples/simple/evaluation/SimpleTest.java

@@ -1,5 +1,5 @@
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class SimpleTest {
 
@@ -8,13 +8,13 @@ public class SimpleTest {
     @Test
     public void testZero() {
         if(solution == null) solution = new Simple();
-        Assert.assertEquals(1, solution.addOne(0));
+        Assertions.assertEquals(1, solution.addOne(0));
     }
 
     @Test
     public void testOne() {
         if(solution == null) solution = new Simple();
-        Assert.assertEquals(2, solution.addOne(1));
+        Assertions.assertEquals(2, solution.addOne(1));
     }
 
 }

examples/simple/evaluation/TestSuite.java

@@ -1,9 +1,9 @@
 
-import org.junit.runners.Suite;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     // List of tests to run.
     SimpleTest.class,
     GeneratedTest.class,

examples/stubber/evaluation/StubberTest.java

@@ -1,20 +1,23 @@
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.Before;
+
 
 import dodona.reflection.AssertionStubber;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 public class StubberTest {
 
     private StubberInterface solution;
 
-    @Before public void initialize() {
+    @BeforeEach
+    public void initialize() {
         solution = new AssertionStubber().stub(StubberInterface.class, Stubber.class);
     }
 
     @Test
     public void test() {
-        Assert.assertTrue(solution.isStubbed());
+        Assertions.assertTrue(solution.isStubbed());
     }
 
 }

examples/stubber/evaluation/TestSuite.java

@@ -1,9 +1,9 @@
 
-import org.junit.runners.Suite;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     StubberTest.class,
 })
 public class TestSuite {}