From 1454361d34bad149c4e91217b7d7206ee58e668d Mon Sep 17 00:00:00 2001
From: Kevin Turner <83819+keturn@users.noreply.github.com>
Date: Thu, 19 May 2022 16:49:45 -0700
Subject: [PATCH] test: use ModuleTestingEnvironment provided by engine-tests

Requires https://github.com/MovingBlocks/Terasology/pull/5010
---
 module.txt                                    |  5 -----
 .../org/terasology/minecarts/RailsTest.java   | 20 +++++++++----------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/module.txt b/module.txt
index 0d476fa..1a70ed8 100644
--- a/module.txt
+++ b/module.txt
@@ -23,11 +23,6 @@
             "id": "Inventory",
             "minVersion": "1.1.0"
         },
-        {
-            "id": "ModuleTestingEnvironment",
-            "minVersion": "0.3.1",
-            "optional": true
-        },
         {
             "id": "SegmentedPaths",
             "minVersion": "1.0.0"
diff --git a/src/test/java/org/terasology/minecarts/RailsTest.java b/src/test/java/org/terasology/minecarts/RailsTest.java
index ab6d674..c228d6f 100644
--- a/src/test/java/org/terasology/minecarts/RailsTest.java
+++ b/src/test/java/org/terasology/minecarts/RailsTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.minecarts;
@@ -10,10 +10,12 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.terasology.engine.integrationenvironment.ModuleTestingHelper;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.math.Side;
 import org.terasology.engine.math.SideBitFlag;
 import org.terasology.engine.registry.In;
-import org.terasology.engine.world.BlockEntityRegistry;
 import org.terasology.engine.world.WorldProvider;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockManager;
@@ -21,21 +23,14 @@
 import org.terasology.engine.world.block.BlockUri;
 import org.terasology.engine.world.block.family.BlockFamily;
 import org.terasology.engine.world.block.family.BlockPlacementData;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.ModuleTestingHelper;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
 
 @ExtendWith(MTEExtension.class)
 @Dependencies({"Rails", "CoreAssets"})
 @Tag("MteTest")
 public class RailsTest {
+
     private static final String RAIL_BLOCKFAMILY_URI = "rails:rails";
-    private Block dirtBlock;
-    private Block airBlock;
-    private BlockFamily railBlockFamily;
 
-    @In
-    BlockEntityRegistry blockEntityRegistry;
     @In
     BlockManager blockManager;
     @In
@@ -43,8 +38,11 @@ public class RailsTest {
     @In
     WorldProvider worldProvider;
 
+    private Block dirtBlock;
+    private BlockFamily railBlockFamily;
+
     public void initialize() {
-        airBlock = blockManager.getBlock("engine:air");
+        Block airBlock = blockManager.getBlock("engine:air");
         dirtBlock = blockManager.getBlock("CoreAssets:Dirt");
         railBlockFamily = blockManager.getBlockFamily(RAIL_BLOCKFAMILY_URI);