Fix tests that broke during the junit 5 update (#9757)

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>

patches/api/0001-Convert-project-to-Gradle.patch

@@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..1e8a4a87f963a8cf0e61e3c06925b864b437f8f5
+index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105dab208df2
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,91 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -118,6 +118,10 @@ index 0000000000000000000000000000000000000000..1e8a4a87f963a8cf0e61e3c06925b864
 +        }
 +    }
 +}
++
++tasks.test {
++    useJUnitPlatform()
++}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
 index e31246ebbe2af2950d63ad413460ea7c0c6baa36..0000000000000000000000000000000000000000

patches/api/0002-Build-system-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1e8a4a87f963a8cf0e61e3c06925b864b437f8f5..048dc1ffa90672a00f61da0271a550f9e877e8cd 100644
+index 41e77b687df6480adf8f5e21daad105dab208df2..d86ee6acb78d249424c5df98a851178c0f62eec1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,15 +18,27 @@ dependencies {
@@ -51,9 +51,9 @@ index 1e8a4a87f963a8cf0e61e3c06925b864b437f8f5..048dc1ffa90672a00f61da0271a550f9
      )
      options.tags("apiNote:a:API Note:")
  
-@@ -85,3 +101,14 @@ tasks.withType<Javadoc> {
-         }
-     }
+@@ -89,3 +105,14 @@ tasks.withType<Javadoc> {
+ tasks.test {
+     useJUnitPlatform()
  }
 +
 +// Paper start

patches/api/0003-Test-changes.patch

@@ -3,7 +3,6 @@ From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 17 Mar 2019 23:04:30 +0000
 Subject: [PATCH] Test changes
 
-- convert to mockito for mocking of types
 - Allow use of TYPE_USE annotations
 - Ignore package-private methods for nullability annotations
 - Add excludes for classes which don't pass
@@ -12,6 +11,23 @@ Subject: [PATCH] Test changes
 Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
+diff --git a/build.gradle.kts b/build.gradle.kts
+index d86ee6acb78d249424c5df98a851178c0f62eec1..75bfb0ab8049ebbb52240abf661d469de5526767 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -106,6 +106,12 @@ tasks.test {
+     useJUnitPlatform()
+ }
+ 
++// Paper start - compile tests with -parameters for better junit parameterized test names
++tasks.compileTestJava {
++    options.compilerArgs.add("-parameters")
++}
++// Paper end
++
+ // Paper start
+ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
+     badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
 diff --git a/src/test/java/io/papermc/paper/testing/EmptyTag.java b/src/test/java/io/papermc/paper/testing/EmptyTag.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f559ebc18
@@ -205,17 +221,46 @@ index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242
              return false;
          }
 diff --git a/src/test/java/org/bukkit/BukkitMirrorTest.java b/src/test/java/org/bukkit/BukkitMirrorTest.java
-index 89ca06ebecdaadd5dfc7bc74473ca15ad36f6eff..a07d35a6615e788361ac4c8b8954a2876d1306b2 100644
+index 89ca06ebecdaadd5dfc7bc74473ca15ad36f6eff..0970bcdf094a2026168b574848e4f7045e80db74 100644
 --- a/src/test/java/org/bukkit/BukkitMirrorTest.java
 +++ b/src/test/java/org/bukkit/BukkitMirrorTest.java
-@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;
- public class BukkitMirrorTest {
+@@ -28,18 +28,21 @@ public class BukkitMirrorTest {
  
-     public static Stream<Arguments> data() {
-+        if (true) return Stream.of(); // Paper
-         return Stream.of(Server.class.getDeclaredMethods())
-                 .map(method -> {
-                     try {
+     @ParameterizedTest
+     @MethodSource("data")
++    @org.junit.jupiter.api.Disabled // Paper
+     public void isStatic(Method server, String name, Method bukkit) throws Throwable {
+         assertThat(Modifier.isStatic(bukkit.getModifiers()), is(true));
+     }
+ 
+     @ParameterizedTest
+     @MethodSource("data")
++    @org.junit.jupiter.api.Disabled // Paper
+     public void isDeprecated(Method server, String name, Method bukkit) throws Throwable {
+         assertThat(bukkit.isAnnotationPresent(Deprecated.class), is(server.isAnnotationPresent(Deprecated.class)));
+     }
+ 
+     @ParameterizedTest
+     @MethodSource("data")
++    @org.junit.jupiter.api.Disabled // Paper
+     public void returnType(Method server, String name, Method bukkit) throws Throwable {
+         assertThat(bukkit.getReturnType(), is((Object) server.getReturnType()));
+         // assertThat(bukkit.getGenericReturnType(), is(server.getGenericReturnType())); // too strict on <T> type generics
+@@ -47,12 +50,14 @@ public class BukkitMirrorTest {
+ 
+     @ParameterizedTest
+     @MethodSource("data")
++    @org.junit.jupiter.api.Disabled // Paper
+     public void parameterTypes(Method server, String name, Method bukkit) throws Throwable {
+         // assertThat(bukkit.getGenericParameterTypes(), is(server.getGenericParameterTypes())); // too strict on <T> type generics
+     }
+ 
+     @ParameterizedTest
+     @MethodSource("data")
++    @org.junit.jupiter.api.Disabled // Paper
+     public void declaredException(Method server, String name, Method bukkit) throws Throwable {
+         assertThat(bukkit.getGenericExceptionTypes(), is(server.getGenericExceptionTypes()));
+     }
 diff --git a/src/test/java/org/bukkit/support/TestServer.java b/src/test/java/org/bukkit/support/TestServer.java
 index 79173d6ed844f1e640e3aa745a9b560ec5e6a2bc..73ec679ac0d1f398b417bd174b47f9af93351e27 100644
 --- a/src/test/java/org/bukkit/support/TestServer.java

patches/api/0004-Add-FastUtil-to-Bukkit.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 048dc1ffa90672a00f61da0271a550f9e877e8cd..98d7bca03ee3805a1d32f3eb7dc520d88cb1787a 100644
+index 75bfb0ab8049ebbb52240abf661d469de5526767..ecba866b84bc5f86a442bf220ab24ed8706aadf9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -22,6 +22,7 @@ dependencies {

patches/api/0005-Adventure.patch

@@ -7,7 +7,7 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 98d7bca03ee3805a1d32f3eb7dc520d88cb1787a..b649f81d11c043649fa3e6e65ebd5dd70d2e9469 100644
+index ecba866b84bc5f86a442bf220ab24ed8706aadf9..2377d476aee8c88d26ca715fdb756dc97749aac8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -10,12 +10,24 @@ java {

patches/api/0007-Use-ASM-for-event-executors.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b649f81d11c043649fa3e6e65ebd5dd70d2e9469..df783fda358889a23e9219b364181c626ff3dfea 100644
+index 2377d476aee8c88d26ca715fdb756dc97749aac8..0c6e0bb90fe5ea29c467323a179a47ec122ba0f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -42,6 +42,9 @@ dependencies {

patches/api/0008-Paper-Plugins.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index df783fda358889a23e9219b364181c626ff3dfea..d3a55d64623b2421740da4eb6ebb08cca56a05e8 100644
+index 0c6e0bb90fe5ea29c467323a179a47ec122ba0f6..145f6209a984e74da2d2de03cf725c06c77ef8da 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -47,7 +47,7 @@ dependencies {

patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d3a55d64623b2421740da4eb6ebb08cca56a05e8..afe9e9b08499ac504f4198ffb8da34cd286a6b44 100644
+index 145f6209a984e74da2d2de03cf725c06c77ef8da..639651972fddce4dff63a0f0a7e566a15b9e2dd6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,6 +11,8 @@ java {