Skip to content

Commit 2184324

Browse files
committed
Actually enable paper tests
1 parent d94d0d6 commit 2184324

2 files changed

Lines changed: 81 additions & 2 deletions

File tree

patches/server/0004-Test-changes.patch

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,3 +452,81 @@ index 5781c2fab2d407b4a22d5fc80e1c03e907617316..68ae998b30bbcacae3604fb6581ceca3
452452
RegistryHelper.registry = layers.compositeAccess().freeze();
453453
// Register vanilla pack
454454
RegistryHelper.dataPack = ReloadableServerResources.loadResources(ireloadableresourcemanager, layers, list, featureFlagSet, Commands.CommandSelection.DEDICATED, 0, MoreExecutors.directExecutor(), MoreExecutors.directExecutor()).join();
455+
diff --git a/src/test/java/org/bukkit/support/suite/AllFeaturesTestSuite.java b/src/test/java/org/bukkit/support/suite/AllFeaturesTestSuite.java
456+
index d78661198815b78d041288eb62076514926428ad..2d268498b545db48efa106d2c7afca7f7b74c76d 100644
457+
--- a/src/test/java/org/bukkit/support/suite/AllFeaturesTestSuite.java
458+
+++ b/src/test/java/org/bukkit/support/suite/AllFeaturesTestSuite.java
459+
@@ -14,7 +14,7 @@ import org.junit.platform.suite.api.SuiteDisplayName;
460+
@Suite(failIfNoTests = false)
461+
@SuiteDisplayName("Test suite for test which need registry values present, with all feature flags set")
462+
@IncludeTags("AllFeatures")
463+
-@SelectPackages("org.bukkit")
464+
+@SelectPackages({"org.bukkit", "io.papermc"})
465+
@SelectClasses({RegistryClassTest.class, PerRegistryTest.class, RegistryConversionTest.class}) // Make sure general registry tests are run first
466+
@ExcludeClassNamePatterns("org.bukkit.craftbukkit.inventory.ItemStack.*Test")
467+
@ConfigurationParameter(key = "TestSuite", value = "AllFeatures")
468+
diff --git a/src/test/java/org/bukkit/support/suite/BundleFeatureTestSuite.java b/src/test/java/org/bukkit/support/suite/BundleFeatureTestSuite.java
469+
index 8faaffd16fb05bd3d976b6a63835cfa547ec2445..c1ee709083276acb14b474993800dd4894febc47 100644
470+
--- a/src/test/java/org/bukkit/support/suite/BundleFeatureTestSuite.java
471+
+++ b/src/test/java/org/bukkit/support/suite/BundleFeatureTestSuite.java
472+
@@ -9,7 +9,7 @@ import org.junit.platform.suite.api.SuiteDisplayName;
473+
@Suite(failIfNoTests = false)
474+
@SuiteDisplayName("Test suite for test which need registry values present, with the bundle feature flag set")
475+
@IncludeTags("BundleFeature")
476+
-@SelectPackages("org.bukkit")
477+
+@SelectPackages({"org.bukkit", "io.papermc"})
478+
@ConfigurationParameter(key = "TestSuite", value = "BundleFeature")
479+
public class BundleFeatureTestSuite {
480+
}
481+
diff --git a/src/test/java/org/bukkit/support/suite/LegacyTestSuite.java b/src/test/java/org/bukkit/support/suite/LegacyTestSuite.java
482+
index 576c35e086345c96325628cf1a048599f9ed6950..ac3c1c88ce5de4b623d17ab0af11a7d04caec869 100644
483+
--- a/src/test/java/org/bukkit/support/suite/LegacyTestSuite.java
484+
+++ b/src/test/java/org/bukkit/support/suite/LegacyTestSuite.java
485+
@@ -9,7 +9,7 @@ import org.junit.platform.suite.api.SuiteDisplayName;
486+
@Suite(failIfNoTests = false)
487+
@SuiteDisplayName("Test suite for legacy tests")
488+
@IncludeTags("Legacy")
489+
-@SelectPackages("org.bukkit")
490+
+@SelectPackages({"org.bukkit", "io.papermc"})
491+
@ConfigurationParameter(key = "TestSuite", value = "Legacy")
492+
public class LegacyTestSuite {
493+
}
494+
diff --git a/src/test/java/org/bukkit/support/suite/NormalTestSuite.java b/src/test/java/org/bukkit/support/suite/NormalTestSuite.java
495+
index 661c49c83b9a81512cf181b50f6353dc76e9f0bc..76f61fb60612160477b7da0b095f1c7e4822d4fb 100644
496+
--- a/src/test/java/org/bukkit/support/suite/NormalTestSuite.java
497+
+++ b/src/test/java/org/bukkit/support/suite/NormalTestSuite.java
498+
@@ -9,7 +9,7 @@ import org.junit.platform.suite.api.SuiteDisplayName;
499+
@Suite(failIfNoTests = false)
500+
@SuiteDisplayName("Test suite for standalone tests, which don't need any registry values present")
501+
@IncludeTags("Normal")
502+
-@SelectPackages("org.bukkit")
503+
+@SelectPackages({"org.bukkit", "io.papermc"})
504+
@ConfigurationParameter(key = "TestSuite", value = "Normal")
505+
public class NormalTestSuite {
506+
}
507+
diff --git a/src/test/java/org/bukkit/support/suite/SlowTestSuite.java b/src/test/java/org/bukkit/support/suite/SlowTestSuite.java
508+
index f95ff2e9930f4fd0ff284f714fc39afb6b7789ca..60be4c20101bbae8cf027270ff0e1e138d2fe9d2 100644
509+
--- a/src/test/java/org/bukkit/support/suite/SlowTestSuite.java
510+
+++ b/src/test/java/org/bukkit/support/suite/SlowTestSuite.java
511+
@@ -9,7 +9,7 @@ import org.junit.platform.suite.api.SuiteDisplayName;
512+
@Suite(failIfNoTests = false)
513+
@SuiteDisplayName("Test suite for slow tests, which don't need to run every time")
514+
@IncludeTags("Slow")
515+
-@SelectPackages("org.bukkit")
516+
+@SelectPackages({"org.bukkit", "io.papermc"})
517+
@ConfigurationParameter(key = "TestSuite", value = "Slow")
518+
public class SlowTestSuite {
519+
}
520+
diff --git a/src/test/java/org/bukkit/support/suite/VanillaFeatureTestSuite.java b/src/test/java/org/bukkit/support/suite/VanillaFeatureTestSuite.java
521+
index 5ee48e92d2b5134a4ba15802087f6afe58c1cb8d..d0e2eacfcd487e2852eff4b1828031dd3649e41a 100644
522+
--- a/src/test/java/org/bukkit/support/suite/VanillaFeatureTestSuite.java
523+
+++ b/src/test/java/org/bukkit/support/suite/VanillaFeatureTestSuite.java
524+
@@ -9,7 +9,7 @@ import org.junit.platform.suite.api.SuiteDisplayName;
525+
@Suite(failIfNoTests = false)
526+
@SuiteDisplayName("Test suite for test which need vanilla registry values present")
527+
@IncludeTags("VanillaFeature")
528+
-@SelectPackages("org.bukkit")
529+
+@SelectPackages({"org.bukkit", "io.papermc"})
530+
@ConfigurationParameter(key = "TestSuite", value = "VanillaFeature")
531+
public class VanillaFeatureTestSuite {
532+
}

patches/server/0436-Add-missing-default-perms-for-commands.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing default perms for commands
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
8-
index a9ea2e38e4673686c9994a58c94ad19e59fd423c..52649f82351ab4f675c3cc3cd6640956b0f76b91 100644
8+
index a9ea2e38e4673686c9994a58c94ad19e59fd423c..b3169c551b8410f5861f9db0543c785439ecba7c 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
11-
@@ -24,13 +24,75 @@ public final class CommandPermissions {
11+
@@ -24,13 +24,76 @@ public final class CommandPermissions {
1212
DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "stop", "Allows the user to stop the server", PermissionDefault.OP, commands);
1313
DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands);
1414
DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "gamemode", "Allows the user to change the gamemode of another player", PermissionDefault.OP, commands);
@@ -82,6 +82,7 @@ index a9ea2e38e4673686c9994a58c94ad19e59fd423c..52649f82351ab4f675c3cc3cd6640956
8282
+ DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "place", "Allows the user to place features and structures", PermissionDefault.OP, commands);
8383
+ DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "return", "Allows the user to use the /return command", PermissionDefault.OP, commands);
8484
+ DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "random", "Allows the user to generate a random number", PermissionDefault.OP, commands);
85+
+ DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "rotate", "Allows the user to change the rotation of entities", PermissionDefault.OP, commands);
8586
+ // Paper end
8687

8788
DefaultPermissions.registerPermission("minecraft.admin.command_feedback", "Receive command broadcasts when sendCommandFeedback is true", PermissionDefault.OP, commands);

0 commit comments

Comments
 (0)