From 0b0dc83ffed1a452fef0baecd21bb45c3d0b462a Mon Sep 17 00:00:00 2001 From: TheMode Date: Mon, 10 Oct 2022 20:44:50 +0200 Subject: [PATCH] Make separate module for testing framework (#1428) --- build.gradle.kts | 8 +--- settings.gradle.kts | 3 +- .../AdvancementIntegrationTest.java | 4 +- .../net/minestom/server/api/EnvBefore.java | 11 ----- .../net/minestom/server/api/EnvCleaner.java | 16 ------- .../server/api/EnvParameterResolver.java | 15 ------- .../java/net/minestom/server/api/EnvTest.java | 16 ------- .../EntityBlockPhysicsIntegrationTest.java | 4 +- .../EntityBlockTouchTickIntegrationTest.java | 4 +- ...ityProjectileCollisionIntegrationTest.java | 4 +- .../PlacementCollisionIntegrationTest.java | 4 +- .../CommandSuggestionIntegrationTest.java | 4 +- .../EntityBoundingBoxIntegrationTest.java | 4 +- .../entity/EntityInstanceIntegrationTest.java | 4 +- .../EntityLineOfSightIntegrationTest.java | 4 +- .../entity/EntityMetaIntegrationTest.java | 4 +- .../EntityProjectileIntegrationTest.java | 4 +- .../entity/EntityRemovalIntegrationTest.java | 6 +-- .../entity/EntityTeleportIntegrationTest.java | 4 +- .../entity/EntityVelocityIntegrationTest.java | 4 +- .../EntityViewDirectionIntegrationTest.java | 4 +- .../entity/EntityViewIntegrationTest.java | 4 +- .../EntityViewerRuleIntegrationTest.java | 4 +- .../entity/PassengerIntegrationTest.java | 4 +- .../entity/PlayerHeldIntegrationTest.java | 4 +- .../entity/ai/ClosestEntityTargetTest.java | 4 +- .../PlayerBlockPlacementIntegrationTest.java | 4 +- .../entity/player/PlayerIntegrationTest.java | 6 +-- .../player/PlayerMovementIntegrationTest.java | 10 ++--- .../server/event/EventNodeMapTest.java | 2 +- .../instance/AnvilLoaderIntegrationTest.java | 4 +- .../instance/ChunkViewerIntegrationTest.java | 4 +- .../EntityTrackerIntegrationTest.java | 4 +- .../GeneratorForkConsumerIntegrationTest.java | 4 +- .../GeneratorForkIntegrationTest.java | 4 +- .../instance/GeneratorIntegrationTest.java | 4 +- .../InstanceBlockIntegrationTest.java | 4 +- .../InstanceBlockPacketIntegrationTest.java | 4 +- .../InstanceUnregisterIntegrationTest.java | 6 +-- .../instance/WorldBorderIntegrationTest.java | 4 +- .../inventory/InventoryIntegrationTest.java | 4 +- .../PlayerInventoryIntegrationTest.java | 4 +- .../integration/HeldClickIntegrationTest.java | 4 +- .../integration/LeftClickIntegrationTest.java | 4 +- .../RightClickIntegrationTest.java | 4 +- .../server/item/ItemAttributeTest.java | 2 +- .../minestom/server/item/ItemBlockTest.java | 2 +- .../ChunkSnapshotIntegrationTest.java | 4 +- .../EntitySnapshotIntegrationTest.java | 4 +- .../InstanceSnapshotIntegrationTest.java | 4 +- .../server/tag/TagHandlerCopyTest.java | 2 +- .../tag/TagHandlerReadableCopyTest.java | 2 +- .../net/minestom/server/tag/TagItemTest.java | 4 +- .../net/minestom/server/tag/TagListTest.java | 2 +- .../net/minestom/server/tag/TagNbtTest.java | 2 +- .../net/minestom/server/tag/TagPathTest.java | 2 +- .../minestom/server/tag/TagRecordTest.java | 2 +- .../minestom/server/tag/TagStructureTest.java | 2 +- .../minestom/server/tag/TagUpdateTest.java | 2 +- .../net/minestom/server/tag/TagViewTest.java | 2 +- .../utils/TranslationIntegrationTest.java | 4 +- testing/build.gradle.kts | 26 +++++++++++ .../java/net/minestom/testing}/Collector.java | 2 +- .../main/java/net/minestom/testing}/Env.java | 2 +- .../java/net/minestom/testing}/EnvImpl.java | 2 +- .../java/net/minestom/testing/EnvTest.java | 43 +++++++++++++++++++ .../minestom/testing}/FlexibleListener.java | 2 +- .../net/minestom/testing}/TestConnection.java | 2 +- .../minestom/testing}/TestConnectionImpl.java | 2 +- .../java/net/minestom/testing}/TestUtils.java | 2 +- 70 files changed, 183 insertions(+), 177 deletions(-) delete mode 100644 src/test/java/net/minestom/server/api/EnvBefore.java delete mode 100644 src/test/java/net/minestom/server/api/EnvCleaner.java delete mode 100644 src/test/java/net/minestom/server/api/EnvParameterResolver.java delete mode 100644 src/test/java/net/minestom/server/api/EnvTest.java create mode 100644 testing/build.gradle.kts rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/Collector.java (97%) rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/Env.java (98%) rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/EnvImpl.java (99%) create mode 100644 testing/src/main/java/net/minestom/testing/EnvTest.java rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/FlexibleListener.java (94%) rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/TestConnection.java (95%) rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/TestConnectionImpl.java (99%) rename {src/test/java/net/minestom/server/api => testing/src/main/java/net/minestom/testing}/TestUtils.java (98%) diff --git a/build.gradle.kts b/build.gradle.kts index 2d01fa83b1f..5c8299fcc97 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,12 +42,8 @@ tasks { } dependencies { - // Junit Testing Framework - testImplementation(libs.junit.api) - testImplementation(libs.junit.params) - testRuntimeOnly(libs.junit.engine) - testImplementation(libs.junit.suite.api) - testRuntimeOnly(libs.junit.suite.engine) + // Testing Framework + testImplementation(project(mapOf("path" to ":testing"))) // Only here to ensure J9 module support for extensions and our classloaders testCompileOnly(libs.mockito.core) diff --git a/settings.gradle.kts b/settings.gradle.kts index 491db1ddd44..2230bb02892 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,4 +20,5 @@ rootProject.name = "Minestom" include("code-generators") include("jmh-benchmarks") include("jcstress-tests") -include("demo") \ No newline at end of file +include("demo") +include("testing") diff --git a/src/test/java/net/minestom/server/advancements/AdvancementIntegrationTest.java b/src/test/java/net/minestom/server/advancements/AdvancementIntegrationTest.java index e68bcd1689a..d74d97e8b82 100644 --- a/src/test/java/net/minestom/server/advancements/AdvancementIntegrationTest.java +++ b/src/test/java/net/minestom/server/advancements/AdvancementIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.advancements; import net.kyori.adventure.text.Component; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.item.Material; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/api/EnvBefore.java b/src/test/java/net/minestom/server/api/EnvBefore.java deleted file mode 100644 index cf673fee8fd..00000000000 --- a/src/test/java/net/minestom/server/api/EnvBefore.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.minestom.server.api; - -import org.junit.jupiter.api.extension.BeforeEachCallback; -import org.junit.jupiter.api.extension.ExtensionContext; - -final class EnvBefore implements BeforeEachCallback { - @Override - public void beforeEach(ExtensionContext context) { - System.setProperty("minestom.viewable-packet", "false"); - } -} diff --git a/src/test/java/net/minestom/server/api/EnvCleaner.java b/src/test/java/net/minestom/server/api/EnvCleaner.java deleted file mode 100644 index 5950c3e85ac..00000000000 --- a/src/test/java/net/minestom/server/api/EnvCleaner.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.minestom.server.api; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.InvocationInterceptor; -import org.junit.jupiter.api.extension.ReflectiveInvocationContext; - -import java.lang.reflect.Method; - -final class EnvCleaner implements InvocationInterceptor { - @Override - public void interceptTestMethod(Invocation invocation, ReflectiveInvocationContext invocationContext, ExtensionContext extensionContext) throws Throwable { - invocation.proceed(); - EnvImpl env = (EnvImpl) invocationContext.getArguments().get(0); - env.cleanup(); - } -} diff --git a/src/test/java/net/minestom/server/api/EnvParameterResolver.java b/src/test/java/net/minestom/server/api/EnvParameterResolver.java deleted file mode 100644 index b0923e70d58..00000000000 --- a/src/test/java/net/minestom/server/api/EnvParameterResolver.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.minestom.server.api; - -import net.minestom.server.MinecraftServer; -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; - -final class EnvParameterResolver extends TypeBasedParameterResolver { - @Override - public Env resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) - throws ParameterResolutionException { - return new EnvImpl(MinecraftServer.updateProcess()); - } -} diff --git a/src/test/java/net/minestom/server/api/EnvTest.java b/src/test/java/net/minestom/server/api/EnvTest.java deleted file mode 100644 index b8c6ad7db6f..00000000000 --- a/src/test/java/net/minestom/server/api/EnvTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.minestom.server.api; - -import org.junit.jupiter.api.extension.ExtendWith; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@ExtendWith(EnvParameterResolver.class) -@ExtendWith(EnvBefore.class) -@ExtendWith(EnvCleaner.class) -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface EnvTest { -} diff --git a/src/test/java/net/minestom/server/collision/EntityBlockPhysicsIntegrationTest.java b/src/test/java/net/minestom/server/collision/EntityBlockPhysicsIntegrationTest.java index a136a8d92d1..884c9758088 100644 --- a/src/test/java/net/minestom/server/collision/EntityBlockPhysicsIntegrationTest.java +++ b/src/test/java/net/minestom/server/collision/EntityBlockPhysicsIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.collision; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; diff --git a/src/test/java/net/minestom/server/collision/EntityBlockTouchTickIntegrationTest.java b/src/test/java/net/minestom/server/collision/EntityBlockTouchTickIntegrationTest.java index 973b9540a66..f5fbb8a9b99 100644 --- a/src/test/java/net/minestom/server/collision/EntityBlockTouchTickIntegrationTest.java +++ b/src/test/java/net/minestom/server/collision/EntityBlockTouchTickIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.collision; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; diff --git a/src/test/java/net/minestom/server/collision/EntityProjectileCollisionIntegrationTest.java b/src/test/java/net/minestom/server/collision/EntityProjectileCollisionIntegrationTest.java index 38b0d0d2c16..ee893bba4cc 100644 --- a/src/test/java/net/minestom/server/collision/EntityProjectileCollisionIntegrationTest.java +++ b/src/test/java/net/minestom/server/collision/EntityProjectileCollisionIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.collision; import net.minestom.server.MinecraftServer; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; diff --git a/src/test/java/net/minestom/server/collision/PlacementCollisionIntegrationTest.java b/src/test/java/net/minestom/server/collision/PlacementCollisionIntegrationTest.java index 62b5205e062..27a2f36c19f 100644 --- a/src/test/java/net/minestom/server/collision/PlacementCollisionIntegrationTest.java +++ b/src/test/java/net/minestom/server/collision/PlacementCollisionIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.collision; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; import net.minestom.server.entity.Entity; diff --git a/src/test/java/net/minestom/server/command/CommandSuggestionIntegrationTest.java b/src/test/java/net/minestom/server/command/CommandSuggestionIntegrationTest.java index 8bf4e0d7b99..90fa134023c 100644 --- a/src/test/java/net/minestom/server/command/CommandSuggestionIntegrationTest.java +++ b/src/test/java/net/minestom/server/command/CommandSuggestionIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.command; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.suggestion.SuggestionEntry; import net.minestom.server.coordinate.Pos; diff --git a/src/test/java/net/minestom/server/entity/EntityBoundingBoxIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityBoundingBoxIntegrationTest.java index 0906a6f8878..dc20cd87d83 100644 --- a/src/test/java/net/minestom/server/entity/EntityBoundingBoxIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityBoundingBoxIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Pos; import net.minestom.server.event.item.PickupItemEvent; diff --git a/src/test/java/net/minestom/server/entity/EntityInstanceIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityInstanceIntegrationTest.java index b51072a34bc..5a9d128ef0d 100644 --- a/src/test/java/net/minestom/server/entity/EntityInstanceIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityInstanceIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/EntityLineOfSightIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityLineOfSightIntegrationTest.java index 9f291fe8693..a6bb809294a 100644 --- a/src/test/java/net/minestom/server/entity/EntityLineOfSightIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityLineOfSightIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/EntityMetaIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityMetaIntegrationTest.java index e1b85ea1be7..d4bc0029ea9 100644 --- a/src/test/java/net/minestom/server/entity/EntityMetaIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityMetaIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.entity; import net.kyori.adventure.text.Component; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.network.packet.server.play.EntityMetaDataPacket; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/net/minestom/server/entity/EntityProjectileIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityProjectileIntegrationTest.java index fc6454d77d2..814257ce83d 100644 --- a/src/test/java/net/minestom/server/entity/EntityProjectileIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityProjectileIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/EntityRemovalIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityRemovalIntegrationTest.java index f6b333d58ca..42d6e2f2377 100644 --- a/src/test/java/net/minestom/server/entity/EntityRemovalIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityRemovalIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.event.entity.EntityTickEvent; import net.minestom.server.network.packet.server.play.DestroyEntitiesPacket; @@ -12,7 +12,7 @@ import java.time.temporal.TemporalUnit; import java.util.List; -import static net.minestom.server.api.TestUtils.waitUntilCleared; +import static net.minestom.testing.TestUtils.waitUntilCleared; import static org.junit.jupiter.api.Assertions.*; @EnvTest diff --git a/src/test/java/net/minestom/server/entity/EntityTeleportIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityTeleportIntegrationTest.java index d909e396d41..22b32a5d527 100644 --- a/src/test/java/net/minestom/server/entity/EntityTeleportIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityTeleportIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.play.EntityTeleportPacket; diff --git a/src/test/java/net/minestom/server/entity/EntityVelocityIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityVelocityIntegrationTest.java index 3d7c2eb7760..2ee0bd4296c 100644 --- a/src/test/java/net/minestom/server/entity/EntityVelocityIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityVelocityIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.Instance; diff --git a/src/test/java/net/minestom/server/entity/EntityViewDirectionIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityViewDirectionIntegrationTest.java index 16b9e0a8569..00d15fb47f6 100644 --- a/src/test/java/net/minestom/server/entity/EntityViewDirectionIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityViewDirectionIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/EntityViewIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityViewIntegrationTest.java index eeea3f9d6c8..181b303252a 100644 --- a/src/test/java/net/minestom/server/entity/EntityViewIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityViewIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.network.packet.server.play.SpawnEntityPacket; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/EntityViewerRuleIntegrationTest.java b/src/test/java/net/minestom/server/entity/EntityViewerRuleIntegrationTest.java index f967fbc0053..40038cf6f25 100644 --- a/src/test/java/net/minestom/server/entity/EntityViewerRuleIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/EntityViewerRuleIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/PassengerIntegrationTest.java b/src/test/java/net/minestom/server/entity/PassengerIntegrationTest.java index 80d56fbf970..2b9402f1cbf 100644 --- a/src/test/java/net/minestom/server/entity/PassengerIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/PassengerIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/entity/PlayerHeldIntegrationTest.java b/src/test/java/net/minestom/server/entity/PlayerHeldIntegrationTest.java index 21610c84935..efd06b00561 100644 --- a/src/test/java/net/minestom/server/entity/PlayerHeldIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/PlayerHeldIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.event.player.PlayerChangeHeldSlotEvent; import net.minestom.server.item.ItemStack; diff --git a/src/test/java/net/minestom/server/entity/ai/ClosestEntityTargetTest.java b/src/test/java/net/minestom/server/entity/ai/ClosestEntityTargetTest.java index cb75f376b93..5c34c621e1b 100644 --- a/src/test/java/net/minestom/server/entity/ai/ClosestEntityTargetTest.java +++ b/src/test/java/net/minestom/server/entity/ai/ClosestEntityTargetTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity.ai; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.EntityType; diff --git a/src/test/java/net/minestom/server/entity/player/PlayerBlockPlacementIntegrationTest.java b/src/test/java/net/minestom/server/entity/player/PlayerBlockPlacementIntegrationTest.java index f4e9c6d1fa7..c2bf3603d30 100644 --- a/src/test/java/net/minestom/server/entity/player/PlayerBlockPlacementIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/player/PlayerBlockPlacementIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.entity.player; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.GameMode; import net.minestom.server.entity.Player; diff --git a/src/test/java/net/minestom/server/entity/player/PlayerIntegrationTest.java b/src/test/java/net/minestom/server/entity/player/PlayerIntegrationTest.java index d32f3e7e6c1..59ddf8a9481 100644 --- a/src/test/java/net/minestom/server/entity/player/PlayerIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/player/PlayerIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.entity.player; -import net.minestom.server.api.Collector; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Collector; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.GameMode; import net.minestom.server.entity.Player; diff --git a/src/test/java/net/minestom/server/entity/player/PlayerMovementIntegrationTest.java b/src/test/java/net/minestom/server/entity/player/PlayerMovementIntegrationTest.java index 8a6f9a7d39a..30e9977964d 100644 --- a/src/test/java/net/minestom/server/entity/player/PlayerMovementIntegrationTest.java +++ b/src/test/java/net/minestom/server/entity/player/PlayerMovementIntegrationTest.java @@ -1,10 +1,10 @@ package net.minestom.server.entity.player; import net.minestom.server.MinecraftServer; -import net.minestom.server.api.Collector; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; -import net.minestom.server.api.TestConnection; +import net.minestom.testing.Collector; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; +import net.minestom.testing.TestConnection; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; import net.minestom.server.entity.Player; @@ -22,8 +22,6 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/net/minestom/server/event/EventNodeMapTest.java b/src/test/java/net/minestom/server/event/EventNodeMapTest.java index f80f7879214..e803aa3e531 100644 --- a/src/test/java/net/minestom/server/event/EventNodeMapTest.java +++ b/src/test/java/net/minestom/server/event/EventNodeMapTest.java @@ -10,7 +10,7 @@ import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicBoolean; -import static net.minestom.server.api.TestUtils.waitUntilCleared; +import static net.minestom.testing.TestUtils.waitUntilCleared; import static org.junit.jupiter.api.Assertions.*; public class EventNodeMapTest { diff --git a/src/test/java/net/minestom/server/instance/AnvilLoaderIntegrationTest.java b/src/test/java/net/minestom/server/instance/AnvilLoaderIntegrationTest.java index f9a38fa9696..859cc49ce0f 100644 --- a/src/test/java/net/minestom/server/instance/AnvilLoaderIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/AnvilLoaderIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.instance.block.Block; import net.minestom.server.utils.NamespaceID; import net.minestom.server.utils.binary.BinaryWriter; diff --git a/src/test/java/net/minestom/server/instance/ChunkViewerIntegrationTest.java b/src/test/java/net/minestom/server/instance/ChunkViewerIntegrationTest.java index 73a3c5a7bf9..e64819127a1 100644 --- a/src/test/java/net/minestom/server/instance/ChunkViewerIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/ChunkViewerIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.instance; import net.minestom.server.MinecraftServer; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.network.packet.server.play.ChunkDataPacket; import net.minestom.server.utils.chunk.ChunkUtils; diff --git a/src/test/java/net/minestom/server/instance/EntityTrackerIntegrationTest.java b/src/test/java/net/minestom/server/instance/EntityTrackerIntegrationTest.java index 0e1832094ce..4896e30acc1 100644 --- a/src/test/java/net/minestom/server/instance/EntityTrackerIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/EntityTrackerIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.instance; import net.minestom.server.MinecraftServer; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Entity; import net.minestom.server.entity.EntityType; diff --git a/src/test/java/net/minestom/server/instance/GeneratorForkConsumerIntegrationTest.java b/src/test/java/net/minestom/server/instance/GeneratorForkConsumerIntegrationTest.java index 51ac7badedb..d4a50690b4a 100644 --- a/src/test/java/net/minestom/server/instance/GeneratorForkConsumerIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/GeneratorForkConsumerIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Point; import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/instance/GeneratorForkIntegrationTest.java b/src/test/java/net/minestom/server/instance/GeneratorForkIntegrationTest.java index e9606dca21a..ec9b91cebac 100644 --- a/src/test/java/net/minestom/server/instance/GeneratorForkIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/GeneratorForkIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Point; import net.minestom.server.instance.block.Block; import net.minestom.server.instance.generator.GenerationUnit; diff --git a/src/test/java/net/minestom/server/instance/GeneratorIntegrationTest.java b/src/test/java/net/minestom/server/instance/GeneratorIntegrationTest.java index 9d52054b1ae..e2ddf7d46b5 100644 --- a/src/test/java/net/minestom/server/instance/GeneratorIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/GeneratorIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.instance.block.Block; import org.jglrxavpok.hephaistos.nbt.NBT; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/instance/InstanceBlockIntegrationTest.java b/src/test/java/net/minestom/server/instance/InstanceBlockIntegrationTest.java index ea873f6df66..5b0d774bc9d 100644 --- a/src/test/java/net/minestom/server/instance/InstanceBlockIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/InstanceBlockIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.block.Block; import net.minestom.server.tag.Tag; diff --git a/src/test/java/net/minestom/server/instance/InstanceBlockPacketIntegrationTest.java b/src/test/java/net/minestom/server/instance/InstanceBlockPacketIntegrationTest.java index 7a482c4af1c..32e9b870384 100644 --- a/src/test/java/net/minestom/server/instance/InstanceBlockPacketIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/InstanceBlockPacketIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.block.Block; diff --git a/src/test/java/net/minestom/server/instance/InstanceUnregisterIntegrationTest.java b/src/test/java/net/minestom/server/instance/InstanceUnregisterIntegrationTest.java index 2b0dc2a6599..eb8f74964aa 100644 --- a/src/test/java/net/minestom/server/instance/InstanceUnregisterIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/InstanceUnregisterIntegrationTest.java @@ -1,14 +1,14 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.event.player.PlayerTickEvent; import org.junit.jupiter.api.Test; import java.lang.ref.WeakReference; -import static net.minestom.server.api.TestUtils.waitUntilCleared; +import static net.minestom.testing.TestUtils.waitUntilCleared; @EnvTest public class InstanceUnregisterIntegrationTest { diff --git a/src/test/java/net/minestom/server/instance/WorldBorderIntegrationTest.java b/src/test/java/net/minestom/server/instance/WorldBorderIntegrationTest.java index 8df2a6e752e..01c4c935fec 100644 --- a/src/test/java/net/minestom/server/instance/WorldBorderIntegrationTest.java +++ b/src/test/java/net/minestom/server/instance/WorldBorderIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.instance; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/net/minestom/server/inventory/InventoryIntegrationTest.java b/src/test/java/net/minestom/server/inventory/InventoryIntegrationTest.java index 8ab1c0cd82d..d0df75b49e8 100644 --- a/src/test/java/net/minestom/server/inventory/InventoryIntegrationTest.java +++ b/src/test/java/net/minestom/server/inventory/InventoryIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.inventory; import net.kyori.adventure.text.Component; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.event.item.ItemDropEvent; import net.minestom.server.item.ItemStack; diff --git a/src/test/java/net/minestom/server/inventory/PlayerInventoryIntegrationTest.java b/src/test/java/net/minestom/server/inventory/PlayerInventoryIntegrationTest.java index 19e6cf6dfba..268a34a2768 100644 --- a/src/test/java/net/minestom/server/inventory/PlayerInventoryIntegrationTest.java +++ b/src/test/java/net/minestom/server/inventory/PlayerInventoryIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.inventory; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.EquipmentSlot; import net.minestom.server.item.ItemStack; diff --git a/src/test/java/net/minestom/server/inventory/click/integration/HeldClickIntegrationTest.java b/src/test/java/net/minestom/server/inventory/click/integration/HeldClickIntegrationTest.java index a190697894e..93069a5a925 100644 --- a/src/test/java/net/minestom/server/inventory/click/integration/HeldClickIntegrationTest.java +++ b/src/test/java/net/minestom/server/inventory/click/integration/HeldClickIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.inventory.click.integration; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Player; import net.minestom.server.event.inventory.InventoryPreClickEvent; diff --git a/src/test/java/net/minestom/server/inventory/click/integration/LeftClickIntegrationTest.java b/src/test/java/net/minestom/server/inventory/click/integration/LeftClickIntegrationTest.java index 0207a001a51..87a81674699 100644 --- a/src/test/java/net/minestom/server/inventory/click/integration/LeftClickIntegrationTest.java +++ b/src/test/java/net/minestom/server/inventory/click/integration/LeftClickIntegrationTest.java @@ -1,8 +1,8 @@ package net.minestom.server.inventory.click.integration; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Player; import net.minestom.server.event.inventory.InventoryPreClickEvent; diff --git a/src/test/java/net/minestom/server/inventory/click/integration/RightClickIntegrationTest.java b/src/test/java/net/minestom/server/inventory/click/integration/RightClickIntegrationTest.java index ceddd0b5e3e..c4e4b6e403c 100644 --- a/src/test/java/net/minestom/server/inventory/click/integration/RightClickIntegrationTest.java +++ b/src/test/java/net/minestom/server/inventory/click/integration/RightClickIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.inventory.click.integration; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Player; import net.minestom.server.event.inventory.InventoryPreClickEvent; diff --git a/src/test/java/net/minestom/server/item/ItemAttributeTest.java b/src/test/java/net/minestom/server/item/ItemAttributeTest.java index 991e892b618..e9d6538d6a1 100644 --- a/src/test/java/net/minestom/server/item/ItemAttributeTest.java +++ b/src/test/java/net/minestom/server/item/ItemAttributeTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.UUID; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.assertEquals; public class ItemAttributeTest { diff --git a/src/test/java/net/minestom/server/item/ItemBlockTest.java b/src/test/java/net/minestom/server/item/ItemBlockTest.java index 86d9f415d0e..495e3de4962 100644 --- a/src/test/java/net/minestom/server/item/ItemBlockTest.java +++ b/src/test/java/net/minestom/server/item/ItemBlockTest.java @@ -3,7 +3,7 @@ import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.assertTrue; public class ItemBlockTest { diff --git a/src/test/java/net/minestom/server/snapshot/ChunkSnapshotIntegrationTest.java b/src/test/java/net/minestom/server/snapshot/ChunkSnapshotIntegrationTest.java index 29e1f44fdca..6f0809d0cba 100644 --- a/src/test/java/net/minestom/server/snapshot/ChunkSnapshotIntegrationTest.java +++ b/src/test/java/net/minestom/server/snapshot/ChunkSnapshotIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.snapshot; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/snapshot/EntitySnapshotIntegrationTest.java b/src/test/java/net/minestom/server/snapshot/EntitySnapshotIntegrationTest.java index 942214c94ab..734b3c88892 100644 --- a/src/test/java/net/minestom/server/snapshot/EntitySnapshotIntegrationTest.java +++ b/src/test/java/net/minestom/server/snapshot/EntitySnapshotIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.snapshot; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.entity.Entity; import net.minestom.server.entity.EntityType; import org.junit.jupiter.api.Test; diff --git a/src/test/java/net/minestom/server/snapshot/InstanceSnapshotIntegrationTest.java b/src/test/java/net/minestom/server/snapshot/InstanceSnapshotIntegrationTest.java index 88fbf1fc08f..7863e30ea16 100644 --- a/src/test/java/net/minestom/server/snapshot/InstanceSnapshotIntegrationTest.java +++ b/src/test/java/net/minestom/server/snapshot/InstanceSnapshotIntegrationTest.java @@ -1,7 +1,7 @@ package net.minestom.server.snapshot; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/net/minestom/server/tag/TagHandlerCopyTest.java b/src/test/java/net/minestom/server/tag/TagHandlerCopyTest.java index 89828187122..11b8660c350 100644 --- a/src/test/java/net/minestom/server/tag/TagHandlerCopyTest.java +++ b/src/test/java/net/minestom/server/tag/TagHandlerCopyTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/net/minestom/server/tag/TagHandlerReadableCopyTest.java b/src/test/java/net/minestom/server/tag/TagHandlerReadableCopyTest.java index 68354b49bee..90d4a646654 100644 --- a/src/test/java/net/minestom/server/tag/TagHandlerReadableCopyTest.java +++ b/src/test/java/net/minestom/server/tag/TagHandlerReadableCopyTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/net/minestom/server/tag/TagItemTest.java b/src/test/java/net/minestom/server/tag/TagItemTest.java index ba817261336..d3ab11a63bb 100644 --- a/src/test/java/net/minestom/server/tag/TagItemTest.java +++ b/src/test/java/net/minestom/server/tag/TagItemTest.java @@ -6,8 +6,8 @@ import java.lang.ref.WeakReference; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; -import static net.minestom.server.api.TestUtils.waitUntilCleared; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.waitUntilCleared; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/net/minestom/server/tag/TagListTest.java b/src/test/java/net/minestom/server/tag/TagListTest.java index c7ab7c85588..28ba07d2c86 100644 --- a/src/test/java/net/minestom/server/tag/TagListTest.java +++ b/src/test/java/net/minestom/server/tag/TagListTest.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.*; public class TagListTest { diff --git a/src/test/java/net/minestom/server/tag/TagNbtTest.java b/src/test/java/net/minestom/server/tag/TagNbtTest.java index 406f0dd8bf2..81fa51a8620 100644 --- a/src/test/java/net/minestom/server/tag/TagNbtTest.java +++ b/src/test/java/net/minestom/server/tag/TagNbtTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; diff --git a/src/test/java/net/minestom/server/tag/TagPathTest.java b/src/test/java/net/minestom/server/tag/TagPathTest.java index 774d88128ff..67fcdcbcc3c 100644 --- a/src/test/java/net/minestom/server/tag/TagPathTest.java +++ b/src/test/java/net/minestom/server/tag/TagPathTest.java @@ -4,7 +4,7 @@ import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.Test; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.*; public class TagPathTest { diff --git a/src/test/java/net/minestom/server/tag/TagRecordTest.java b/src/test/java/net/minestom/server/tag/TagRecordTest.java index dbec3503001..1dfed907baf 100644 --- a/src/test/java/net/minestom/server/tag/TagRecordTest.java +++ b/src/test/java/net/minestom/server/tag/TagRecordTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.*; public class TagRecordTest { diff --git a/src/test/java/net/minestom/server/tag/TagStructureTest.java b/src/test/java/net/minestom/server/tag/TagStructureTest.java index 6973916f380..d4f271c8956 100644 --- a/src/test/java/net/minestom/server/tag/TagStructureTest.java +++ b/src/test/java/net/minestom/server/tag/TagStructureTest.java @@ -7,7 +7,7 @@ import java.util.UUID; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.*; public class TagStructureTest { diff --git a/src/test/java/net/minestom/server/tag/TagUpdateTest.java b/src/test/java/net/minestom/server/tag/TagUpdateTest.java index 670120279d8..222b875de23 100644 --- a/src/test/java/net/minestom/server/tag/TagUpdateTest.java +++ b/src/test/java/net/minestom/server/tag/TagUpdateTest.java @@ -3,7 +3,7 @@ import net.minestom.server.coordinate.Vec; import org.junit.jupiter.api.Test; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.*; public class TagUpdateTest { diff --git a/src/test/java/net/minestom/server/tag/TagViewTest.java b/src/test/java/net/minestom/server/tag/TagViewTest.java index 029a330f7de..718d84a6bb7 100644 --- a/src/test/java/net/minestom/server/tag/TagViewTest.java +++ b/src/test/java/net/minestom/server/tag/TagViewTest.java @@ -8,7 +8,7 @@ import java.util.Map; -import static net.minestom.server.api.TestUtils.assertEqualsSNBT; +import static net.minestom.testing.TestUtils.assertEqualsSNBT; import static org.junit.jupiter.api.Assertions.*; public class TagViewTest { diff --git a/src/test/java/net/minestom/server/utils/TranslationIntegrationTest.java b/src/test/java/net/minestom/server/utils/TranslationIntegrationTest.java index 9a71480897d..fe070a1d175 100644 --- a/src/test/java/net/minestom/server/utils/TranslationIntegrationTest.java +++ b/src/test/java/net/minestom/server/utils/TranslationIntegrationTest.java @@ -5,8 +5,8 @@ import net.kyori.adventure.translation.GlobalTranslator; import net.kyori.adventure.translation.TranslationRegistry; import net.minestom.server.adventure.MinestomAdventure; -import net.minestom.server.api.Env; -import net.minestom.server.api.EnvTest; +import net.minestom.testing.Env; +import net.minestom.testing.EnvTest; import net.minestom.server.coordinate.Pos; import net.minestom.server.network.packet.server.play.SystemChatPacket; import org.junit.jupiter.api.BeforeAll; diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts new file mode 100644 index 00000000000..c10178d3716 --- /dev/null +++ b/testing/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("java-library") +} + +group = "net.minestom.testing" +version = "1.0" + +repositories { + mavenCentral() + maven(url = "https://jitpack.io") +} + +dependencies { + // Minestom API + api(project(mapOf("path" to ":"))) + // Junit Testing Framework + api(libs.junit.api) + api(libs.junit.params) + api(libs.junit.suite.api) + runtimeOnly(libs.junit.engine) + runtimeOnly(libs.junit.suite.engine) +} + +tasks.getByName("test") { + useJUnitPlatform() +} \ No newline at end of file diff --git a/src/test/java/net/minestom/server/api/Collector.java b/testing/src/main/java/net/minestom/testing/Collector.java similarity index 97% rename from src/test/java/net/minestom/server/api/Collector.java rename to testing/src/main/java/net/minestom/testing/Collector.java index 100284d3032..ab74209c362 100644 --- a/src/test/java/net/minestom/server/api/Collector.java +++ b/testing/src/main/java/net/minestom/testing/Collector.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/net/minestom/server/api/Env.java b/testing/src/main/java/net/minestom/testing/Env.java similarity index 98% rename from src/test/java/net/minestom/server/api/Env.java rename to testing/src/main/java/net/minestom/testing/Env.java index 446d50d93f8..23f26476783 100644 --- a/src/test/java/net/minestom/server/api/Env.java +++ b/testing/src/main/java/net/minestom/testing/Env.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import net.minestom.server.ServerProcess; import net.minestom.server.coordinate.Pos; diff --git a/src/test/java/net/minestom/server/api/EnvImpl.java b/testing/src/main/java/net/minestom/testing/EnvImpl.java similarity index 99% rename from src/test/java/net/minestom/server/api/EnvImpl.java rename to testing/src/main/java/net/minestom/testing/EnvImpl.java index 7fd316553fb..50c993f8f22 100644 --- a/src/test/java/net/minestom/server/api/EnvImpl.java +++ b/testing/src/main/java/net/minestom/testing/EnvImpl.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import net.minestom.server.ServerProcess; import net.minestom.server.event.Event; diff --git a/testing/src/main/java/net/minestom/testing/EnvTest.java b/testing/src/main/java/net/minestom/testing/EnvTest.java new file mode 100644 index 00000000000..cff8f74cfe1 --- /dev/null +++ b/testing/src/main/java/net/minestom/testing/EnvTest.java @@ -0,0 +1,43 @@ +package net.minestom.testing; + +import net.minestom.server.MinecraftServer; +import org.junit.jupiter.api.extension.*; +import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Method; + +@ExtendWith(EnvTest.EnvParameterResolver.class) +@ExtendWith(EnvTest.EnvBefore.class) +@ExtendWith(EnvTest.EnvCleaner.class) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface EnvTest { + + final class EnvBefore implements BeforeEachCallback { + @Override + public void beforeEach(ExtensionContext context) { + System.setProperty("minestom.viewable-packet", "false"); + } + } + + final class EnvCleaner implements InvocationInterceptor { + @Override + public void interceptTestMethod(Invocation invocation, ReflectiveInvocationContext invocationContext, ExtensionContext extensionContext) throws Throwable { + invocation.proceed(); + EnvImpl env = (EnvImpl) invocationContext.getArguments().get(0); + env.cleanup(); + } + } + + final class EnvParameterResolver extends TypeBasedParameterResolver { + @Override + public Env resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + return new EnvImpl(MinecraftServer.updateProcess()); + } + } +} diff --git a/src/test/java/net/minestom/server/api/FlexibleListener.java b/testing/src/main/java/net/minestom/testing/FlexibleListener.java similarity index 94% rename from src/test/java/net/minestom/server/api/FlexibleListener.java rename to testing/src/main/java/net/minestom/testing/FlexibleListener.java index 75e99b51ef6..7dcffdfbef5 100644 --- a/src/test/java/net/minestom/server/api/FlexibleListener.java +++ b/testing/src/main/java/net/minestom/testing/FlexibleListener.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import net.minestom.server.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/net/minestom/server/api/TestConnection.java b/testing/src/main/java/net/minestom/testing/TestConnection.java similarity index 95% rename from src/test/java/net/minestom/server/api/TestConnection.java rename to testing/src/main/java/net/minestom/testing/TestConnection.java index f79beeaf22a..c25b74be0e6 100644 --- a/src/test/java/net/minestom/server/api/TestConnection.java +++ b/testing/src/main/java/net/minestom/testing/TestConnection.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Player; diff --git a/src/test/java/net/minestom/server/api/TestConnectionImpl.java b/testing/src/main/java/net/minestom/testing/TestConnectionImpl.java similarity index 99% rename from src/test/java/net/minestom/server/api/TestConnectionImpl.java rename to testing/src/main/java/net/minestom/testing/TestConnectionImpl.java index 5292c2798d0..fddeae74546 100644 --- a/src/test/java/net/minestom/server/api/TestConnectionImpl.java +++ b/testing/src/main/java/net/minestom/testing/TestConnectionImpl.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import net.kyori.adventure.translation.GlobalTranslator; import net.minestom.server.ServerProcess; diff --git a/src/test/java/net/minestom/server/api/TestUtils.java b/testing/src/main/java/net/minestom/testing/TestUtils.java similarity index 98% rename from src/test/java/net/minestom/server/api/TestUtils.java rename to testing/src/main/java/net/minestom/testing/TestUtils.java index b614b3eb8c0..4547a88f306 100644 --- a/src/test/java/net/minestom/server/api/TestUtils.java +++ b/testing/src/main/java/net/minestom/testing/TestUtils.java @@ -1,4 +1,4 @@ -package net.minestom.server.api; +package net.minestom.testing; import org.jglrxavpok.hephaistos.nbt.NBTCompound; import org.jglrxavpok.hephaistos.nbt.NBTException;