Extract the JUnit5 part of PlugHarness into its own thing.

Author: nedtwigg

atplug-test-harness/src/main/java/com/diffplug/atplug/AtPlugJUnit5.kt

@@ -0,0 +1,19 @@
+package com.diffplug.atplug
+
+import org.junit.jupiter.api.extension.AfterEachCallback
+import org.junit.jupiter.api.extension.BeforeEachCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+
+class AtPlugJUnit5(private val harness: PlugHarness) : BeforeEachCallback, AfterEachCallback {
+	private var openHarness: AutoCloseable? = null
+
+	override fun beforeEach(context: ExtensionContext) {
+		assert(openHarness == null)
+		openHarness = harness.start()
+	}
+
+	override fun afterEach(context: ExtensionContext) {
+		openHarness!!.close()
+		openHarness = null
+	}
+}

atplug-test-harness/src/main/java/com/diffplug/atplug/PlugHarness.kt

@@ -7,12 +7,9 @@
 package com.diffplug.atplug
 
 import java.lang.AutoCloseable
-import org.junit.jupiter.api.extension.AfterEachCallback
-import org.junit.jupiter.api.extension.BeforeEachCallback
-import org.junit.jupiter.api.extension.ExtensionContext
 
 /** Creates a harness for local plugin setup. */
-class PlugHarness : BeforeEachCallback, AfterEachCallback {
+class PlugHarness {
 	var map = PlugInstanceMap()
 
 	fun <T> add(clazz: Class<T>, instance: T): PlugHarness {
@@ -26,22 +23,5 @@ class PlugHarness : BeforeEachCallback, AfterEachCallback {
 		return AutoCloseable { PlugRegistry.setHarness(null) }
 	}
 
-	private var openHarness: AutoCloseable? = null
-
-	override fun beforeEach(context: ExtensionContext) {
-		assert(openHarness == null)
-		openHarness = start()
-	}
-
-	override fun afterEach(context: ExtensionContext) {
-		openHarness!!.close()
-		openHarness = null
-	}
-
-	companion object {
-		@JvmStatic
-		fun create(): PlugHarness {
-			return PlugHarness()
-		}
-	}
+	fun junit5beforeAfterEach() = AtPlugJUnit5(this)
 }

build.gradle

@@ -12,7 +12,7 @@ allprojects {
 apply from: 干.file('spotless/freshmark.gradle')
 apply from: 干.file('base/sonatype.gradle')
 
-String VER_JUNIT_JUPITER = '5.8.2'
+String VER_JUNIT_JUPITER = '5.0.0'
 subprojects {
 	apply from: 干.file('base/java8.gradle')
 	apply from: 干.file('base/kotlin.gradle')
@@ -36,7 +36,7 @@ subprojects {
 	} else if (it.name == 'atplug-test-harness') {
 		ext.maven_name='AtPlug test harness'
 		dependencies {
-			api "org.junit.jupiter:junit-jupiter-api:${VER_JUNIT_JUPITER}"
+			compileOnly "org.junit.jupiter:junit-jupiter-api:${VER_JUNIT_JUPITER}"
 			implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.10"
 			implementation project(':atplug-runtime')
 		}