Skip to content

Fix flaky day/night world-reader game tests #1666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 3 commits into from
+41 −38
Closed

Fix flaky day/night world-reader game tests #1666

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c27944
Fix flaky day/night game tests by invalidating LazyAspectVariable cac…
Copilot Apr 19, 2026
9fcff13
Merge four day/night tests into one sequential test to eliminate cloc…
Copilot Apr 19, 2026
1ac2519
Fix IsDayAndIsNight test: use getOrThrow + invalidateTickCache + upda…
Copilot Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 41 additions & 38 deletions src/main/java/org/cyclops/integrateddynamics/gametest/GameTestsAspectsReadWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.cyclops.integrateddynamics.gametest;

import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.gametest.framework.GameTestHelper;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.clock.WorldClocks;
Expand All @@ -10,8 +11,13 @@
import org.cyclops.cyclopscore.gametest.GameTest;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.integrateddynamics.Reference;
import org.cyclops.integrateddynamics.api.part.PartPos;
import org.cyclops.integrateddynamics.api.part.PartTarget;
import org.cyclops.integrateddynamics.api.part.read.IPartStateReader;
import org.cyclops.integrateddynamics.api.part.read.IPartTypeReader;
import org.cyclops.integrateddynamics.core.evaluate.variable.*;
import org.cyclops.integrateddynamics.core.helper.Helpers;
import org.cyclops.integrateddynamics.core.helper.PartHelpers;
import org.cyclops.integrateddynamics.core.part.PartTypes;
import org.cyclops.integrateddynamics.part.aspect.Aspects;

Expand Down Expand Up @@ -57,44 +63,41 @@ public void testAspectsReadWorldWeatherThunderFalse(GameTestHelper helper) {
testReadAspect(POS, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_WEATHER_THUNDER, ValueTypeBoolean.ValueBoolean.of(false));
}

@GameTest(template = TEMPLATE_EMPTY, environment = Reference.MOD_ID + ":time_day")
public void testAspectsReadWorldIsDayTrue(GameTestHelper helper) {
Supplier<IAspectVariable> variableSupplier = GameTestHelpersIntegratedDynamics.testReadAspectSetup(POS, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_ISDAY);
helper.succeedWhen(() -> {
helper.getLevel().registryAccess().get(WorldClocks.OVERWORLD).ifPresent(clockHolder ->
((ServerLevel) helper.getLevel()).clockManager().setTotalTicks(clockHolder, 1000L));
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, variableSupplier.get(), ValueTypeBoolean.ValueBoolean.of(true));
});
}

@GameTest(template = TEMPLATE_EMPTY, environment = Reference.MOD_ID + ":time_night")
public void testAspectsReadWorldIsDayFalse(GameTestHelper helper) {
Supplier<IAspectVariable> variableSupplier = GameTestHelpersIntegratedDynamics.testReadAspectSetup(POS, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_ISDAY);
helper.succeedWhen(() -> {
helper.getLevel().registryAccess().get(WorldClocks.OVERWORLD).ifPresent(clockHolder ->
((ServerLevel) helper.getLevel()).clockManager().setTotalTicks(clockHolder, 13000L));
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, variableSupplier.get(), ValueTypeBoolean.ValueBoolean.of(false));
});
}

@GameTest(template = TEMPLATE_EMPTY, environment = Reference.MOD_ID + ":time_night")
public void testAspectsReadWorldIsNightTrue(GameTestHelper helper) {
Supplier<IAspectVariable> variableSupplier = GameTestHelpersIntegratedDynamics.testReadAspectSetup(POS, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_ISNIGHT);
helper.succeedWhen(() -> {
helper.getLevel().registryAccess().get(WorldClocks.OVERWORLD).ifPresent(clockHolder ->
((ServerLevel) helper.getLevel()).clockManager().setTotalTicks(clockHolder, 13000L));
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, variableSupplier.get(), ValueTypeBoolean.ValueBoolean.of(true));
});
}

@GameTest(template = TEMPLATE_EMPTY, environment = Reference.MOD_ID + ":time_day")
public void testAspectsReadWorldIsNightFalse(GameTestHelper helper) {
Supplier<IAspectVariable> variableSupplier = GameTestHelpersIntegratedDynamics.testReadAspectSetup(POS, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_ISNIGHT);
helper.succeedWhen(() -> {
helper.getLevel().registryAccess().get(WorldClocks.OVERWORLD).ifPresent(clockHolder ->
((ServerLevel) helper.getLevel()).clockManager().setTotalTicks(clockHolder, 1000L));
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, variableSupplier.get(), ValueTypeBoolean.ValueBoolean.of(false));
});
@GameTest(template = TEMPLATE_EMPTY)
public void testAspectsReadWorldIsDayAndIsNight(GameTestHelper helper) {
ServerLevel level = (ServerLevel) helper.getLevel();

// Day-phase cable at POS: check BOOLEAN_ISDAY=true and BOOLEAN_ISNIGHT=false at clock=1000 (day)
Supplier<IAspectVariable> isDayTrueSupplier = GameTestHelpersIntegratedDynamics.testReadAspectSetup(POS, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_ISDAY);
PartPos partPosDay = PartPos.of(level, helper.absolutePos(POS), Direction.WEST);
PartHelpers.PartStateHolder<?, ?> dayStateHolder = PartHelpers.getPart(partPosDay);
IPartTypeReader dayPartReader = (IPartTypeReader) dayStateHolder.getPart();
IPartStateReader dayPartState = (IPartStateReader) dayStateHolder.getState();
Supplier<IAspectVariable> isNightFalseSupplier = () -> dayPartReader.getVariable(PartTarget.fromCenter(partPosDay), dayPartState, Aspects.Read.World.BOOLEAN_ISNIGHT);

// Night-phase cable at POS.offset(2,0,0): use a separate cable so LazyAspectVariable instances are fresh
BlockPos posNight = POS.offset(2, 0, 0);
Supplier<IAspectVariable> isDayFalseSupplier = GameTestHelpersIntegratedDynamics.testReadAspectSetup(posNight, helper, PartTypes.WORLD_READER, Aspects.Read.World.BOOLEAN_ISDAY);
PartPos partPosNight = PartPos.of(level, helper.absolutePos(posNight), Direction.WEST);
PartHelpers.PartStateHolder<?, ?> nightStateHolder = PartHelpers.getPart(partPosNight);
IPartTypeReader nightPartReader = (IPartTypeReader) nightStateHolder.getPart();
IPartStateReader nightPartState = (IPartStateReader) nightStateHolder.getState();
Supplier<IAspectVariable> isNightTrueSupplier = () -> nightPartReader.getVariable(PartTarget.fromCenter(partPosNight), nightPartState, Aspects.Read.World.BOOLEAN_ISNIGHT);

// Set clock to day and immediately sync skyDarken (no runAfterDelay needed, avoids clock race conditions)
level.clockManager().setTotalTicks(level.registryAccess().getOrThrow(WorldClocks.OVERWORLD), 1000L);
level.environmentAttributes().invalidateTickCache();
level.updateSkyBrightness();
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, isDayTrueSupplier.get(), ValueTypeBoolean.ValueBoolean.of(true));
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, isNightFalseSupplier.get(), ValueTypeBoolean.ValueBoolean.of(false));

// Set clock to night and immediately sync skyDarken
level.clockManager().setTotalTicks(level.registryAccess().getOrThrow(WorldClocks.OVERWORLD), 13000L);
level.environmentAttributes().invalidateTickCache();
level.updateSkyBrightness();
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, isDayFalseSupplier.get(), ValueTypeBoolean.ValueBoolean.of(false));
GameTestHelpersIntegratedDynamics.assertValueEqual(helper, isNightTrueSupplier.get(), ValueTypeBoolean.ValueBoolean.of(true));
helper.succeed();
}

@GameTest(template = TEMPLATE_EMPTY, environment = Reference.MOD_ID + ":weather_clear2")
Expand Down
Loading