Skip to content

Fix game tests counting stray item entities from other tests #16

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubensworks merged 1 commit into from
Oct 12, 2026
Merged

Fix game tests counting stray item entities from other tests #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 23 additions & 9 deletions loader-common/src/main/java/org/cyclops/colossalchests2/gametest/GameTestsCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
import org.cyclops.cyclopscore.network.PacketBase;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.Objects;
Expand Down Expand Up @@ -230,14 +231,26 @@ public static Block functionalWall(WallType type) {
private static ItemStack breakCoreAndPickUp(GameTestHelper helper, BlockPos corePos) {
// Unlike GameTestHelper#destroyBlock, this runs the loot table like a player breaking the block.
BlockPos absolute = helper.absolutePos(corePos);
helper.getLevel().destroyBlock(absolute, true);
List<ItemEntity> items = helper.getLevel().getEntitiesOfClass(ItemEntity.class, new AABB(absolute).inflate(2));
List<ItemEntity> items = itemEntitiesSpawnedBy(helper, absolute, 2, () -> helper.getLevel().destroyBlock(absolute, true));
helper.assertValueEqual(items.size(), 1, "dropped item entities");
ItemStack stack = items.get(0).getItem().copy();
items.get(0).discard();
return stack;
}

/**
* Run an action and return the item entities it spawned around a position.
* Leftover drops of earlier tests just outside the test bounds are not cleared, so these are ignored.
*/
private static List<ItemEntity> itemEntitiesSpawnedBy(GameTestHelper helper, BlockPos absolute, double radius, Runnable action) {
AABB area = new AABB(absolute).inflate(radius);
List<ItemEntity> before = helper.getLevel().getEntitiesOfClass(ItemEntity.class, area);
action.run();
List<ItemEntity> items = new ArrayList<>(helper.getLevel().getEntitiesOfClass(ItemEntity.class, area));
items.removeAll(before);
return items;
}

private static void placeCore(GameTestHelper helper, ItemStack stack, BlockPos corePos) {
Player player = helper.makeMockPlayer(GameType.SURVIVAL);
player.setItemInHand(InteractionHand.MAIN_HAND, stack);
Expand Down Expand Up @@ -1382,9 +1395,10 @@ public void testCreativeBreakEmptyCoreDropsNothing(GameTestHelper helper) {
.thenWaitUntil(() -> assertFormed(helper, corePos, MIN_A, 3))
.thenExecute(() -> {
ServerPlayer player = makePlayerNorthOf(helper, corePos);
player.gameMode.destroyBlock(helper.absolutePos(corePos));
BlockPos absolute = helper.absolutePos(corePos);
List<ItemEntity> items = itemEntitiesSpawnedBy(helper, absolute, 3, () -> player.gameMode.destroyBlock(absolute));
helper.assertBlockNotPresent(core(ChestMaterial.WOOD), corePos);
helper.assertItemEntityNotPresent(core(ChestMaterial.WOOD).asItem(), corePos, 3);
helper.assertTrue(items.isEmpty(), "Expected no drops, got " + items);
})
.thenSucceed();
}
Expand Down Expand Up @@ -1418,8 +1432,8 @@ private static ItemStack breakCoreAsPlayer(GameTestHelper helper, BlockPos coreP
player.gameMode.changeGameModeForPlayer(GameType.SURVIVAL);
}
BlockPos absolute = helper.absolutePos(corePos);
helper.assertTrue(player.gameMode.destroyBlock(absolute), "Expected the player to break the core");
List<ItemEntity> items = helper.getLevel().getEntitiesOfClass(ItemEntity.class, new AABB(absolute).inflate(2));
List<ItemEntity> items = itemEntitiesSpawnedBy(helper, absolute, 2,
() -> helper.assertTrue(player.gameMode.destroyBlock(absolute), "Expected the player to break the core"));
helper.assertValueEqual(items.size(), 1, "dropped item entities");
// The core is on the north face, so its drop must not land inside the chest.
helper.assertTrue(items.get(0).getZ() < absolute.getZ(), "Expected the drop on the player's side");
Expand Down Expand Up @@ -2851,11 +2865,11 @@ public void testBuildCommandRefusals(GameTestHelper helper) {
helper.assertBlockNotPresent(wall(ChestMaterial.IRON), MIN_A.offset(4, 4, 4));

// Replacing overwrites them without dropping anything.
assertMessage(helper, runCommand(helper, source, 0, Commands.LEVEL_GAMEMASTERS, "colossalchests2 build iron 5" + at + " replace"),
"command.colossalchests2.build.success");
List<ItemEntity> drops = itemEntitiesSpawnedBy(helper, min, 8, () -> assertMessage(helper,
runCommand(helper, source, 0, Commands.LEVEL_GAMEMASTERS, "colossalchests2 build iron 5" + at + " replace"),
"command.colossalchests2.build.success"));
assertFormed(helper, MIN_A.offset(2, 2, 0), MIN_A, 5);
helper.assertBlockPresent(Blocks.AIR, MIN_A.offset(2, 2, 2));
List<ItemEntity> drops = helper.getLevel().getEntitiesOfClass(ItemEntity.class, new AABB(min).inflate(8));
helper.assertTrue(drops.isEmpty(), "Expected no drops, got " + drops);
helper.succeed();
}
Expand Down
Loading