Add JUnit 5 support

bin/run.sh

@@ -5,7 +5,8 @@ cp /root/pom.xml $2
 
 # Temporarily un-ignore tests
 find $2/src/test/kotlin -type f -name '*Test.kt' -execdir cp {} {}.bak \;
-find $2/src/test/kotlin -type f -name '*Test.kt' -exec sed -i "s/@Ignore(.*)//g;s/@Ignore//g;" {} \;
+find $2/src/test/kotlin -type f -name '*Test.kt' -exec sed -i "s/@Ignore(.*)//g;s/@Ignore//g;" {} \; # for JUnit 4
+find $2/src/test/kotlin -type f -name '*Test.kt' -exec sed -i "s/@Disabled(.*)//g;s/@Disabled//g;" {} \; # for JUnit 5
 
 # See Dockerfile for details
 java -jar /opt/test-runner/autotest-runner.jar $1 $2 $3

examples/template/pom.xml

@@ -39,6 +39,24 @@
       <version>${kotlin.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -57,7 +75,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>

tests/example-all-fail-junit5/build.gradle.kts

@@ -0,0 +1,22 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
+plugins {
+    kotlin("jvm") version "1.9.0"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+        events("passed", "failed", "skipped")
+    }
+}

tests/example-all-fail-junit5/expected_results.json

@@ -0,0 +1,61 @@
+{
+  "version": 2,
+  "status": "fail",
+  "message": "",
+  "tests": [
+    {
+      "name": "divisible by 400 but not by 125",
+      "status": "fail",
+      "message": "expected: <true> but was: <false>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 100, not divisible by 400",
+      "status": "fail",
+      "message": "expected: <false> but was: <true>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 400",
+      "status": "fail",
+      "message": "expected: <true> but was: <false>",
+      "output": ""
+    },
+    {
+      "name": "not divisible by 4",
+      "status": "fail",
+      "message": "expected: <false> but was: <true>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 2, not divisible by 4",
+      "status": "fail",
+      "message": "expected: <false> but was: <true>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 4 and 5",
+      "status": "fail",
+      "message": "expected: <true> but was: <false>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 4, not divisible by 100",
+      "status": "fail",
+      "message": "expected: <true> but was: <false>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 200, not divisible by 400",
+      "status": "fail",
+      "message": "expected: <false> but was: <true>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 100 but not by 3",
+      "status": "fail",
+      "message": "expected: <false> but was: <true>",
+      "output": ""
+    }
+  ]
+}

tests/example-all-fail-junit5/src/main/kotlin/Leap.kt

@@ -0,0 +1,5 @@
+data class Year(private val year: Int) {
+    val isLeap: Boolean by lazy { ! (divisibleBy(4) && (divisibleBy(400) || !divisibleBy(100))) }
+
+    private fun divisibleBy(i: Int) = year % i == 0
+}

tests/example-all-fail-junit5/src/test/kotlin/LeapTest.kt

@@ -0,0 +1,45 @@
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+
+class LeapTest {
+    @Test
+    fun `not divisible by 4`() = assertYearIsCommon(2015)
+
+    @Disabled
+    @Test
+    fun `divisible by 2, not divisible by 4`() = assertYearIsCommon(1970)
+
+    @Disabled
+    @Test
+    fun `divisible by 4, not divisible by 100`() = assertYearIsLeap(1996)
+
+    @Disabled
+    @Test
+    fun `divisible by 4 and 5`() = assertYearIsLeap(1960)
+
+    @Disabled
+    @Test
+    fun `divisible by 100, not divisible by 400`() = assertYearIsCommon(2100)
+
+    @Disabled
+    @Test
+    fun `divisible by 100 but not by 3`() = assertYearIsCommon(1900)
+
+    @Disabled
+    @Test
+    fun `divisible by 400`() = assertYearIsLeap(2000)
+
+    @Disabled
+    @Test
+    fun `divisible by 400 but not by 125`() = assertYearIsLeap(2400)
+
+    @Disabled
+    @Test
+    fun `divisible by 200, not divisible by 400`() = assertYearIsCommon(1800)
+}
+
+private fun assertYearIsLeap(year: Int) = assertTrue(Year(year).isLeap)
+
+private fun assertYearIsCommon(year: Int) = assertFalse(Year(year).isLeap)

tests/example-empty-file-junit5/build.gradle.kts

@@ -0,0 +1,22 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
+plugins {
+    kotlin("jvm") version "1.9.0"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+        events("passed", "failed", "skipped")
+    }
+}

tests/example-empty-file-junit5/expected_results.json

@@ -0,0 +1,6 @@
+{
+  "version": 2,
+  "status": "error",
+  "message": "[ERROR] src/test/kotlin/LeapTest.kt:[43,54] Unresolved reference: Year\n[ERROR] src/test/kotlin/LeapTest.kt:[45,57] Unresolved reference: Year",
+  "tests": []
+}

tests/example-empty-file-junit5/src/test/kotlin/LeapTest.kt

@@ -0,0 +1,45 @@
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+
+class LeapTest {
+    @Test
+    fun `not divisible by 4`() = assertYearIsCommon(2015)
+
+    @Disabled
+    @Test
+    fun `divisible by 2, not divisible by 4`() = assertYearIsCommon(1970)
+
+    @Disabled
+    @Test
+    fun `divisible by 4, not divisible by 100`() = assertYearIsLeap(1996)
+
+    @Disabled
+    @Test
+    fun `divisible by 4 and 5`() = assertYearIsLeap(1960)
+
+    @Disabled
+    @Test
+    fun `divisible by 100, not divisible by 400`() = assertYearIsCommon(2100)
+
+    @Disabled
+    @Test
+    fun `divisible by 100 but not by 3`() = assertYearIsCommon(1900)
+
+    @Disabled
+    @Test
+    fun `divisible by 400`() = assertYearIsLeap(2000)
+
+    @Disabled
+    @Test
+    fun `divisible by 400 but not by 125`() = assertYearIsLeap(2400)
+
+    @Disabled
+    @Test
+    fun `divisible by 200, not divisible by 400`() = assertYearIsCommon(1800)
+}
+
+private fun assertYearIsLeap(year: Int) = assertTrue(Year(year).isLeap)
+
+private fun assertYearIsCommon(year: Int) = assertFalse(Year(year).isLeap)

tests/example-partial-fail-junit5/.meta/config.json

@@ -0,0 +1,23 @@
+{
+  "blurb": "Given a year, report if it is a leap year.",
+  "authors": ["sdavids13"],
+  "contributors": [
+    "dector",
+    "eparovyshnaya",
+    "jtigger",
+    "lihofm",
+    "mdowds",
+    "nithia",
+    "sjwarner-bp",
+    "SleeplessByte",
+    "stkent",
+    "uzilan"
+  ],
+  "files": {
+    "solution": ["src/main/kotlin/Leap.kt"],
+    "test": ["src/test/kotlin/LeapTest.kt"],
+    "example": [".meta/src/reference/kotlin/Leap.kt"]
+  },
+  "source": "JavaRanch Cattle Drive, exercise 3",
+  "source_url": "http://www.javaranch.com/leap.jsp"
+}

tests/example-partial-fail-junit5/.meta/version

@@ -0,0 +1 @@
+1.6.0

tests/example-partial-fail-junit5/build.gradle.kts

@@ -0,0 +1,22 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
+plugins {
+    kotlin("jvm") version "1.9.0"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+        events("passed", "failed", "skipped")
+    }
+}

tests/example-partial-fail-junit5/expected_results.json

@@ -0,0 +1,61 @@
+{
+  "version": 2,
+  "status": "fail",
+  "message": "",
+  "tests": [
+    {
+      "name": "divisible by 400 but not by 125",
+      "status": "fail",
+      "message": "expected: <true> but was: <false>",
+      "output": ""
+    },
+    {
+      "name": "divisible by 100, not divisible by 400",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    },
+    {
+      "name": "divisible by 400",
+      "status": "fail",
+      "message": "expected: <true> but was: <false>",
+      "output": ""
+    },
+    {
+      "name": "not divisible by 4",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    },
+    {
+      "name": "divisible by 2, not divisible by 4",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    },
+    {
+      "name": "divisible by 4 and 5",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    },
+    {
+      "name": "divisible by 4, not divisible by 100",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    },
+    {
+      "name": "divisible by 200, not divisible by 400",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    },
+    {
+      "name": "divisible by 100 but not by 3",
+      "status": "pass",
+      "message": "",
+      "output": ""
+    }
+  ]
+}

tests/example-partial-fail-junit5/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists