Fix AdvancedDetectorCoverTest (#4451)

Author: zetrock1

src/test/java/com/gregtechceu/gtceu/common/cover/AdvancedDetectorCoverTest.java

@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.common.cover;
 
 import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.capability.IWorkable;
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
 import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine;
@@ -20,6 +21,8 @@
 import net.neoforged.neoforge.gametest.GameTestHolder;
 import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
 
+import org.apache.commons.lang3.mutable.MutableInt;
+
 /**
  * The "electrolyzer" template contains a creative tank with water,
  * that is set to auto-output into an electrolyzer when supplied with a redstone signal
@@ -30,16 +33,24 @@
 @GameTestHolder(GTCEu.MOD_ID)
 public class AdvancedDetectorCoverTest {
 
-    @GameTest(template = "electrolyzer", batch = "coverTests", required = false)
-    public static void BLOCKED_BY_LDLIB_WEIRDNESS_PROBABLY_testAdvancedActivityDetectorCover(GameTestHelper helper) {
+    @GameTest(template = "electrolyzer", batch = "coverTests")
+    public static void testAdvancedActivityDetectorCoverWithActivity(GameTestHelper helper) {
         helper.pullLever(new BlockPos(2, 2, 2));
         MetaMachine machine = ((IMachineBlockEntity) helper.getBlockEntity(new BlockPos(1, 2, 1))).getMetaMachine();
         TestUtils.placeCover(helper, machine, GTItems.COVER_ACTIVITY_DETECTOR_ADVANCED.asStack(), Direction.WEST);
-        helper.runAtTickTime(30, () -> helper.assertRedstoneSignal(
-                new BlockPos(1, 2, 1),
-                Direction.WEST,
-                signal -> signal > 0,
-                () -> "expected redstone signal"));
+        MutableInt expected = new MutableInt();
+        helper.runAtTickTime(40 - machine.getOffsetTimer() % 20, () -> {
+            IWorkable workable = (IWorkable) machine;
+            expected.setValue(Math.round(15f * workable.getProgress() / workable.getMaxProgress()));
+        });
+        helper.runAtTickTime(41 - machine.getOffsetTimer() % 20, () -> {
+            // due to this cover updating only once every 20 ticks, we need to check multiple values
+            TestUtils.assertRedstoneEither(helper, new BlockPos(0, 2, 1),
+                    (expected.intValue() + 13) % 15,
+                    (expected.intValue() + 14) % 15,
+                    expected.intValue());
+            helper.succeed();
+        });
     }
 
     @GameTest(template = "electrolyzer", batch = "coverTests", required = false)

src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java

@@ -24,6 +24,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.gametest.framework.GameTestAssertPosException;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.item.ItemStack;
@@ -112,7 +113,7 @@ public static boolean areItemStacksEqual(List<ItemStack> stack1, List<ItemStack>
      * @return {@code true} if fluids and amounts are equal
      */
     public static boolean isFluidStackEqual(FluidStack stack1, FluidStack stack2) {
-        return stack1.isFluidEqual(stack2) && stack1.getAmount() == stack2.getAmount();
+        return FluidStack.isSameFluid(stack1, stack2) && stack1.getAmount() == stack2.getAmount();
     }
 
     /**
@@ -121,7 +122,7 @@ public static boolean isFluidStackEqual(FluidStack stack1, FluidStack stack2) {
      * @return {@code true} if items are equal, and if stack2's amount is within range.
      */
     public static boolean isFluidStackWithinRange(FluidStack stack1, FluidStack stack2, int min, int max) {
-        return stack1.isFluidEqual(stack2) && isFluidWithinRange(stack2, min, max);
+        return FluidStack.isSameFluid(stack1, stack2) && isFluidWithinRange(stack2, min, max);
     }
 
     /**
@@ -271,10 +272,10 @@ public static void assertEqual(GameTestHelper helper, ItemStack stack1, ItemStac
     }
 
     public static void assertEqual(GameTestHelper helper, FluidStack stack1, FluidStack stack2) {
-        helper.assertTrue(stack1.isFluidStackIdentical(stack2),
+        helper.assertTrue(FluidStack.matches(stack1, stack2),
                 "Fluid stacks not equal: \"%s %d\" != \"%s %d\"".formatted(
-                        stack1.getDisplayName().getString(), stack1.getAmount(),
-                        stack2.getDisplayName().getString(), stack2.getAmount()));
+                        stack1.getHoverName().getString(), stack1.getAmount(),
+                        stack2.getHoverName().getString(), stack2.getAmount()));
     }
 
     public static void assertLampOn(GameTestHelper helper, BlockPos pos) {
@@ -317,4 +318,31 @@ public static void succeedAfterTest(GameTestHelper helper, long timeout) {
     public static void assertEqual(GameTestHelper helper, @Nullable BlockPos pos1, @Nullable BlockPos pos2) {
         helper.assertTrue(pos1 != null && pos1.equals(pos2), "Expected %s to equal to %s".formatted(pos1, pos2));
     }
+
+    public static void assertRedstone(GameTestHelper helper, BlockPos pos, int min, int max) {
+        BlockPos absolutePos = helper.absolutePos(pos);
+        int strength = helper.getLevel().getBestNeighborSignal(absolutePos);
+        if (strength > max || strength < min) {
+            throw new GameTestAssertPosException(
+                    "Expected redstone signal between %d and %d, got %d".formatted(min, max, strength),
+                    absolutePos, pos, helper.getTick());
+        }
+    }
+
+    public static void assertRedstoneEither(GameTestHelper helper, BlockPos pos, int... values) {
+        BlockPos absolutePos = helper.absolutePos(pos);
+        int strength = helper.getLevel().getBestNeighborSignal(absolutePos);
+        boolean pass = false;
+        for (int i : values) {
+            if (i == strength) {
+                pass = true;
+                break;
+            }
+        }
+        if (!pass) {
+            throw new GameTestAssertPosException(
+                    "Expected redstone signal to be one of %s, got %d".formatted(values, strength),
+                    absolutePos, pos, helper.getTick());
+        }
+    }
 }