diff options
| author | Nassim Jahnke <[email protected]> | 2023-09-24 17:16:58 +1000 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2023-09-24 18:25:25 +1000 |
| commit | e284bb12156fad92767ceadf3d5e57cbc71e5b21 (patch) | |
| tree | 8729234f3b355b10c44a7f6b87cbb85f435bd611 /patches/api/0003-Test-changes.patch | |
| parent | 7a00758b1b952c308041d87632b84a48dc18535f (diff) | |
| download | Paper-e284bb12156fad92767ceadf3d5e57cbc71e5b21.tar.gz Paper-e284bb12156fad92767ceadf3d5e57cbc71e5b21.zip | |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
fb23cbb3 Define surefire plugin version
d022084a Define ordering for MetadataStoreTest
99a7f6f0 PR-910: Match generic max absorption attribute name style with the rest
c7390d71 PR-909: Update tests to JUnit 5
CraftBukkit Changes:
f0661c351 PR-1230: Move unstructured PDC NBT serialisation to SNBT
452fcb599 PR-1256: Update tests to JUnit 5
Diffstat (limited to 'patches/api/0003-Test-changes.patch')
| -rw-r--r-- | patches/api/0003-Test-changes.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch index 2c4b2010b8..a0c783657f 100644 --- a/patches/api/0003-Test-changes.patch +++ b/patches/api/0003-Test-changes.patch @@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f + } +} diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 4ac3dd977e75cd8464163351d306e037ee32cb48..c26ea217927ba77611e6ae93f8df50a83bceb3dd 100644 +index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242b6bd4fb0 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -29,7 +29,13 @@ public class AnnotationTest { @@ -146,8 +146,8 @@ index 4ac3dd977e75cd8464163351d306e037ee32cb48..c26ea217927ba77611e6ae93f8df50a8 + builder.append("\t").append(message).append("\n"); } -- Assert.fail("There " + errors.size() + " are missing annotation(s)"); -+ Assert.fail(builder.toString()); +- fail("There " + errors.size() + " are missing annotation(s)"); ++ fail(builder.toString()); } private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException { @@ -205,17 +205,17 @@ index 4ac3dd977e75cd8464163351d306e037ee32cb48..c26ea217927ba77611e6ae93f8df50a8 return false; } diff --git a/src/test/java/org/bukkit/BukkitMirrorTest.java b/src/test/java/org/bukkit/BukkitMirrorTest.java -index 2dfada66067d79b84cd490eadbe0178e8cd8c260..06d66512c91c680130132b79e34fbf32245ff9ee 100644 +index 89ca06ebecdaadd5dfc7bc74473ca15ad36f6eff..a07d35a6615e788361ac4c8b8954a2876d1306b2 100644 --- a/src/test/java/org/bukkit/BukkitMirrorTest.java +++ b/src/test/java/org/bukkit/BukkitMirrorTest.java -@@ -20,6 +20,7 @@ public class BukkitMirrorTest { - - @Parameters(name = "{index}: {1}") - public static List<Object[]> data() { -+ if (true) return List.of(); // Paper - return Lists.transform(Arrays.asList(Server.class.getDeclaredMethods()), new Function<Method, Object[]>() { - @Override - public Object[] apply(Method input) { +@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource; + public class BukkitMirrorTest { + + public static Stream<Arguments> data() { ++ if (true) return Stream.of(); // Paper + return Stream.of(Server.class.getDeclaredMethods()) + .map(method -> { + try { 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 |