From f1b811b7fbcd8de8a9d1527d0dc62538e2c3c3e7 Mon Sep 17 00:00:00 2001 From: Manuel Maxera <95315128+manumafe98@users.noreply.github.com> Date: Sat, 6 Jan 2024 17:46:43 -0300 Subject: [PATCH] refactor: annotations of ``Behaviors`` (#116) * Reformating annotations for BehavoirTests and MovementTests * Applying pipeline suggestions --- .../org/terasology/module/behaviors/BehaviorTests.java | 9 ++------- .../org/terasology/module/behaviors/MovementTests.java | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/test/java/org/terasology/module/behaviors/BehaviorTests.java b/src/test/java/org/terasology/module/behaviors/BehaviorTests.java index 296f824..cdb78f6 100644 --- a/src/test/java/org/terasology/module/behaviors/BehaviorTests.java +++ b/src/test/java/org/terasology/module/behaviors/BehaviorTests.java @@ -5,30 +5,25 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.terasology.engine.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.prefab.Prefab; -import org.terasology.engine.integrationenvironment.jupiter.Dependencies; -import org.terasology.engine.integrationenvironment.jupiter.MTEExtension; import org.terasology.engine.logic.behavior.BehaviorComponent; import org.terasology.engine.logic.behavior.asset.BehaviorTree; import org.terasology.engine.registry.In; import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.gestalt.assets.management.AssetManager; +import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment; import java.util.Optional; import java.util.stream.Stream; -@ExtendWith(MTEExtension.class) -@Dependencies("Behaviors") -@Tag("MteTest") +@IntegrationEnvironment(dependencies = "Behaviors") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class BehaviorTests { diff --git a/src/test/java/org/terasology/module/behaviors/MovementTests.java b/src/test/java/org/terasology/module/behaviors/MovementTests.java index a169a35..a349958 100644 --- a/src/test/java/org/terasology/module/behaviors/MovementTests.java +++ b/src/test/java/org/terasology/module/behaviors/MovementTests.java @@ -11,8 +11,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -22,8 +20,6 @@ import org.terasology.engine.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.integrationenvironment.ModuleTestingHelper; -import org.terasology.engine.integrationenvironment.jupiter.Dependencies; -import org.terasology.engine.integrationenvironment.jupiter.MTEExtension; import org.terasology.engine.logic.characters.CharacterMovementComponent; import org.terasology.engine.logic.location.LocationComponent; import org.terasology.engine.physics.engine.PhysicsEngine; @@ -35,14 +31,13 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.block.Blocks; import org.terasology.module.behaviors.components.MinionMoveComponent; +import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment; import java.util.Arrays; import java.util.stream.Collectors; import java.util.stream.Stream; -@Dependencies("Behaviors") -@Tag("MteTest") -@ExtendWith(MTEExtension.class) +@IntegrationEnvironment(dependencies = "Behaviors") public class MovementTests { private static final Logger logger = LoggerFactory.getLogger(MovementTests.class);