Start migration to junit 6

Author: rien

examples/junit4/config.json

@@ -0,0 +1,12 @@
+{
+  "description": {
+    "names": {
+      "nl": "Simpel voorbeeld",
+      "en": "Simple example"
+    }
+  },
+  "evaluation": {
+    "filename": "Simple.java",
+    "handler": "java"
+  }
+}

examples/junit4/description/description.nl.md

@@ -0,0 +1,3 @@
+Implementeer [deze interface](media/workdir/SimpleInterface.java).
+
+Je kan deze [eenvoudige testen](media/SimpleTest.java) lokaal uitvoeren.

examples/junit4/description/media/SimpleTest.java

@@ -0,0 +1 @@
+../../evaluation/SimpleTest.java

examples/junit4/description/media/workdir

@@ -0,0 +1 @@
+../../workdir

examples/junit4/evaluation/GeneratedTest.java

@@ -0,0 +1,50 @@
+import java.util.Random;
+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;
+
+/**
+ * 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.
+public class GeneratedTest {
+
+    public static final int TEST_COUNT = 50;
+    public static final long SEED = 42; // Fixed random seed to get the same tests for every student.
+    public static final int TEST_MAX = 10000;
+
+    /** 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);
+        for(int i = 0; i < TEST_COUNT; i++) {
+            int testNumber = random.nextInt(TEST_MAX);
+            data.add(new Object[] { testNumber, testNumber + 1 });
+        }
+        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));
+    }
+
+}

examples/junit4/evaluation/SimpleTest.java

@@ -0,0 +1,20 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SimpleTest {
+
+    private SimpleInterface solution;
+        
+    @Test
+    public void testZero() {
+        if(solution == null) solution = new Simple();
+        Assert.assertEquals(1, solution.addOne(0));
+    }
+
+    @Test
+    public void testOne() {
+        if(solution == null) solution = new Simple();
+        Assert.assertEquals(2, solution.addOne(1));
+    }
+
+}

examples/junit4/evaluation/TestSuite.java

@@ -0,0 +1,11 @@
+
+import org.junit.runners.Suite;
+import org.junit.runner.RunWith;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    // List of tests to run.
+    SimpleTest.class,
+    GeneratedTest.class,
+})
+public class TestSuite {}

examples/junit4/solution/Simple.java

@@ -0,0 +1,7 @@
+public class Simple implements SimpleInterface {
+
+    public int addOne(int i) {
+        return i + 1;
+    }
+
+}

examples/junit4/workdir/SimpleInterface.java

@@ -0,0 +1,5 @@
+public interface SimpleInterface {
+
+    int addOne(int i);
+
+}

examples/simple/evaluation/GeneratedTest.java

@@ -1,20 +1,21 @@
-import java.util.Random;
-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.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 
 /**
  * A more complex test class.
  *
  * Runs a larger number of generated tests.
  */
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("data")
 @TabTitle("Random Tests") // Giving a name other than 'Test' to the tab in Dodona.
 public class GeneratedTest {
 
@@ -24,7 +25,7 @@ public class GeneratedTest {
 
     /** This method generates a number of tests. */
 
-    @Parameterized.Parameters(name = "{index} | addOne({0}) == {1}")
+    //@Parameters(name = "{index} | addOne({0}) == {1}")
     public static Iterable<Object[]> data() {
         List<Object[]> data = new ArrayList<>();
         Random random = new Random(SEED);
@@ -36,15 +37,15 @@ public static Iterable<Object[]> 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;
+    @Parameter(value=0) public int testNumber;
+    @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));
     }
 
 }