From b07ceb5e6878c46ab8186632e2447d7ea11373a4 Mon Sep 17 00:00:00 2001 From: Josephine Rueckert Date: Wed, 8 Jun 2022 00:28:53 +0200 Subject: [PATCH] test: use ModuleTestingEnvironment provided by engine-tests --- module.txt | 5 ----- .../java/org/terasology/module/behaviors/BehaviorTests.java | 4 ++-- .../java/org/terasology/module/behaviors/MovementTests.java | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/module.txt b/module.txt index acb5e71a..3646d9ab 100644 --- a/module.txt +++ b/module.txt @@ -23,11 +23,6 @@ { "id": "Inventory", "minVersion": "1.1.0" - }, - { - "id": "ModuleTestingEnvironment", - "minVersion": "0.3.0", - "optional": true } ], "isServerSideOnly": true, diff --git a/src/test/java/org/terasology/module/behaviors/BehaviorTests.java b/src/test/java/org/terasology/module/behaviors/BehaviorTests.java index 215bccf3..296f8240 100644 --- a/src/test/java/org/terasology/module/behaviors/BehaviorTests.java +++ b/src/test/java/org/terasology/module/behaviors/BehaviorTests.java @@ -14,13 +14,13 @@ 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.moduletestingenvironment.MTEExtension; -import org.terasology.moduletestingenvironment.extension.Dependencies; import java.util.Optional; import java.util.stream.Stream; diff --git a/src/test/java/org/terasology/module/behaviors/MovementTests.java b/src/test/java/org/terasology/module/behaviors/MovementTests.java index ddb4c524..a169a350 100644 --- a/src/test/java/org/terasology/module/behaviors/MovementTests.java +++ b/src/test/java/org/terasology/module/behaviors/MovementTests.java @@ -21,6 +21,9 @@ import org.terasology.engine.entitySystem.entity.EntityBuilder; 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; @@ -32,9 +35,6 @@ import org.terasology.engine.world.block.BlockRegionc; import org.terasology.engine.world.block.Blocks; import org.terasology.module.behaviors.components.MinionMoveComponent; -import org.terasology.moduletestingenvironment.MTEExtension; -import org.terasology.moduletestingenvironment.ModuleTestingHelper; -import org.terasology.moduletestingenvironment.extension.Dependencies; import java.util.Arrays; import java.util.stream.Collectors;