-
Notifications
You must be signed in to change notification settings - Fork 357
Even more cover tests #3854
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.
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
Merged
Merged
Even more cover tests #3854
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
da60d47
moved the tests to common, made pump tests
TarLaboratories d56f3d2
Merge branch '1.20.1' into tar/more-cover-tests
TarLaboratories 0408ccb
filter cover test
TarLaboratories d1ca8d9
made more filter cover tests
TarLaboratories 54557d3
made tests pass (i hope)
TarLaboratories adf05c8
idk
TarLaboratories 0059ddd
tests work yay
TarLaboratories 5c06f87
shutter cover test
TarLaboratories 572d9d3
oops
TarLaboratories 10c0fbb
advanced detector cover tests
TarLaboratories 8d61052
it works (i think)
TarLaboratories 0fcb859
yay central monitor test
TarLaboratories 46362de
idk, fixed stuff maybe
TarLaboratories 02563ff
Merge branch '1.20.1' into tar/more-cover-tests
TarLaboratories cd4aa5a
more advanced item detector tests
TarLaboratories 0cba6ad
oops forgot setLatched
TarLaboratories 689fb7e
idk how this is supposed to work so i'll just leave it unlatched
TarLaboratories d4cdca9
idk why that was there
TarLaboratories c3f0d2d
comment explaining template
TarLaboratories bd0ea6d
smth
TarLaboratories 96b2a2e
lol why did i put 40
TarLaboratories 394a8d7
last push before battery ded
TarLaboratories 2c1d580
idk
TarLaboratories 9ab9308
Merge branch '1.20.1' into tar/more-cover-tests
TarLaboratories 4bc618b
idk
TarLaboratories 54f8763
removed unused constant
TarLaboratories File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
src/test/java/com/gregtechceu/gtceu/common/cover/AdvancedDetectorCoverTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package com.gregtechceu.gtceu.common.cover; | ||
|
|
||
| import com.gregtechceu.gtceu.GTCEu; | ||
| import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity; | ||
| import com.gregtechceu.gtceu.api.machine.MetaMachine; | ||
| import com.gregtechceu.gtceu.common.cover.detector.AdvancedFluidDetectorCover; | ||
| import com.gregtechceu.gtceu.common.cover.detector.AdvancedItemDetectorCover; | ||
| import com.gregtechceu.gtceu.common.data.GTItems; | ||
| import com.gregtechceu.gtceu.gametest.util.TestUtils; | ||
|
|
||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.core.Direction; | ||
| import net.minecraft.gametest.framework.GameTest; | ||
| import net.minecraft.gametest.framework.GameTestHelper; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.Items; | ||
| import net.minecraftforge.gametest.GameTestHolder; | ||
| import net.minecraftforge.gametest.PrefixGameTestTemplate; | ||
|
|
||
| /** | ||
| * The "electrolyzer" template contains a creative tank with water, | ||
| * that is set to auto-output into an electrolyzer when supplied with a redstone signal | ||
| * The redstone lamp is connected to the covers that are placed in the tests in this class. | ||
| * The creative tank's rate of output is equal to the electrolyzer's rate of processing | ||
| */ | ||
| @PrefixGameTestTemplate(false) | ||
| @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) { | ||
| 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")); | ||
| } | ||
|
|
||
| @GameTest(template = "electrolyzer", batch = "coverTests") | ||
| public static void testAdvancedActivityDetectorCover(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(35, () -> helper.pullLever(2, 2, 2)); | ||
| helper.runAtTickTime(40, () -> { | ||
| TestUtils.assertLampOff(helper, new BlockPos(0, 2, 1)); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
|
|
||
| @GameTest(template = "electrolyzer", batch = "coverTests", attempts = 5) | ||
| public static void testAdvancedFluidDetectorCover(GameTestHelper helper) { | ||
| helper.pullLever(new BlockPos(2, 2, 2)); | ||
| MetaMachine machine = ((IMachineBlockEntity) helper.getBlockEntity(new BlockPos(1, 2, 1))).getMetaMachine(); | ||
| AdvancedFluidDetectorCover cover = (AdvancedFluidDetectorCover) TestUtils.placeCover(helper, machine, | ||
| GTItems.COVER_FLUID_DETECTOR_ADVANCED.asStack(), Direction.WEST); | ||
| cover.setMaxValue(100000); | ||
| cover.setMinValue(1); | ||
| cover.setLatched(true); | ||
| helper.runAtTickTime(40, () -> { | ||
| TestUtils.assertLampOff(helper, new BlockPos(0, 2, 1)); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
|
|
||
| @GameTest(template = "electrolyzer", batch = "coverTests") | ||
| public static void testAdvancedItemDetectorCover(GameTestHelper helper) { | ||
| helper.pullLever(new BlockPos(2, 2, 2)); | ||
| MetaMachine machine = ((IMachineBlockEntity) helper.getBlockEntity(new BlockPos(1, 2, 1))).getMetaMachine(); | ||
| AdvancedItemDetectorCover cover = (AdvancedItemDetectorCover) TestUtils.placeCover(helper, machine, | ||
| GTItems.COVER_ITEM_DETECTOR_ADVANCED.asStack(), Direction.WEST); | ||
| cover.setLatched(true); | ||
| helper.runAtTickTime(40, () -> { | ||
| TestUtils.assertLampOn(helper, new BlockPos(0, 2, 1)); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
|
|
||
| @GameTest(template = "electrolyzer", batch = "coverTests") | ||
| public static void testAdvancedItemDetectorCoverBelowThreshold(GameTestHelper helper) { | ||
| helper.pullLever(new BlockPos(2, 2, 2)); | ||
| MetaMachine machine = ((IMachineBlockEntity) helper.getBlockEntity(new BlockPos(1, 2, 1))).getMetaMachine(); | ||
| AdvancedItemDetectorCover cover = (AdvancedItemDetectorCover) TestUtils.placeCover(helper, machine, | ||
| GTItems.COVER_ITEM_DETECTOR_ADVANCED.asStack(), Direction.WEST); | ||
| cover.setMinValue(1); | ||
| cover.setMaxValue(4); | ||
| helper.runAtTickTime(40, () -> { | ||
| TestUtils.assertLampOff(helper, new BlockPos(0, 2, 1)); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
|
|
||
| @GameTest(template = "electrolyzer", batch = "coverTests") | ||
| public static void testAdvancedItemDetectorCoverAboveThreshold(GameTestHelper helper) { | ||
| helper.pullLever(new BlockPos(2, 2, 2)); | ||
| MetaMachine machine = ((IMachineBlockEntity) helper.getBlockEntity(new BlockPos(1, 2, 1))).getMetaMachine(); | ||
| machine.getItemHandlerCap(null, false).setStackInSlot(0, new ItemStack(Items.DIRT, 5)); | ||
| AdvancedItemDetectorCover cover = (AdvancedItemDetectorCover) TestUtils.placeCover(helper, machine, | ||
| GTItems.COVER_ITEM_DETECTOR_ADVANCED.asStack(), Direction.WEST); | ||
| cover.setMinValue(1); | ||
| cover.setMaxValue(4); | ||
| cover.setLatched(true); | ||
| helper.runAtTickTime(40, () -> { | ||
| TestUtils.assertLampOff(helper, new BlockPos(0, 2, 1)); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...eu/gtceu/api/cover/DetectorCoverTest.java → ...gtceu/common/cover/DetectorCoverTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...hceu/gtceu/api/cover/EnderCoversTest.java → ...u/gtceu/common/cover/EnderCoversTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
src/test/java/com/gregtechceu/gtceu/common/cover/ItemFilterCoverTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package com.gregtechceu.gtceu.common.cover; | ||
|
|
||
| import com.gregtechceu.gtceu.GTCEu; | ||
| import com.gregtechceu.gtceu.api.GTValues; | ||
| import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; | ||
| import com.gregtechceu.gtceu.api.capability.recipe.IO; | ||
| import com.gregtechceu.gtceu.api.cover.filter.SimpleItemFilter; | ||
| import com.gregtechceu.gtceu.common.cover.data.FilterMode; | ||
| import com.gregtechceu.gtceu.common.data.GTItems; | ||
| import com.gregtechceu.gtceu.common.data.GTMachines; | ||
| import com.gregtechceu.gtceu.common.machine.storage.BufferMachine; | ||
| import com.gregtechceu.gtceu.gametest.util.TestUtils; | ||
|
|
||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.core.Direction; | ||
| import net.minecraft.gametest.framework.GameTest; | ||
| import net.minecraft.gametest.framework.GameTestHelper; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.Items; | ||
| import net.minecraftforge.gametest.GameTestHolder; | ||
| import net.minecraftforge.gametest.PrefixGameTestTemplate; | ||
|
|
||
| @PrefixGameTestTemplate(false) | ||
| @GameTestHolder(GTCEu.MOD_ID) | ||
| public class ItemFilterCoverTest { | ||
|
|
||
| private static ItemStack makeDiamondFilter() { | ||
| ItemStack stack = GTItems.ITEM_FILTER.asStack(); | ||
| SimpleItemFilter filter = SimpleItemFilter.loadFilter(stack); | ||
| filter.getMatches()[0] = Items.DIAMOND.getDefaultInstance(); | ||
| stack.setTag(filter.saveFilter()); | ||
| return stack; | ||
| } | ||
|
|
||
| public static void setupCrates(GameTestHelper helper) { | ||
| helper.setBlock(new BlockPos(0, 1, 0), GTMachines.BUFFER[GTValues.LV].getBlock()); | ||
| helper.setBlock(new BlockPos(0, 2, 0), GTMachines.BUFFER[GTValues.LV].getBlock()); | ||
| } | ||
|
|
||
| // Test for seeing if conveyors pass filtered items correctly | ||
| @GameTest(template = "empty_5x5", batch = "coverTests") | ||
| public static void conveyorTransfersFilteredItemsTest(GameTestHelper helper) { | ||
| setupCrates(helper); | ||
| BufferMachine crate1 = (BufferMachine) ((MetaMachineBlockEntity) helper.getBlockEntity(new BlockPos(0, 1, 0))) | ||
| .getMetaMachine(); | ||
| BufferMachine crate2 = (BufferMachine) ((MetaMachineBlockEntity) helper.getBlockEntity(new BlockPos(0, 2, 0))) | ||
| .getMetaMachine(); | ||
| crate1.getInventory().setStackInSlot(0, new ItemStack(Items.FLINT, 8)); | ||
| crate1.getInventory().setStackInSlot(1, new ItemStack(Items.DIAMOND, 16)); | ||
| // LV Cover | ||
| ConveyorCover cover = (ConveyorCover) TestUtils.placeCover(helper, crate2, GTItems.CONVEYOR_MODULE_LV.asStack(), | ||
| Direction.DOWN); | ||
| // Set the cover to import from crate1 to crate2 | ||
| cover.setIo(IO.IN); | ||
| // Filter to whitelist diamonds | ||
| ItemFilterCover filterCover = (ItemFilterCover) TestUtils.placeCover(helper, crate1, | ||
| makeDiamondFilter(), Direction.UP); | ||
| filterCover.setFilterMode(FilterMode.FILTER_EXTRACT); | ||
|
|
||
| helper.succeedWhen(() -> { | ||
| TestUtils.assertEqual(helper, crate2.getInventory().getStackInSlot(0), new ItemStack(Items.DIAMOND, 8)); | ||
| TestUtils.assertEqual(helper, crate2.getInventory().getStackInSlot(1), ItemStack.EMPTY); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
|
|
||
| // Test for seeing if conveyors pass filtered items correctly | ||
| @GameTest(template = "empty_5x5", batch = "coverTests") | ||
| public static void conveyorDoesntTransferFilteredItemsTest(GameTestHelper helper) { | ||
| setupCrates(helper); | ||
| BufferMachine crate1 = (BufferMachine) ((MetaMachineBlockEntity) helper.getBlockEntity(new BlockPos(0, 1, 0))) | ||
| .getMetaMachine(); | ||
| BufferMachine crate2 = (BufferMachine) ((MetaMachineBlockEntity) helper.getBlockEntity(new BlockPos(0, 2, 0))) | ||
| .getMetaMachine(); | ||
| crate1.getInventory().setStackInSlot(0, new ItemStack(Items.FLINT, 16)); | ||
| crate1.getInventory().setStackInSlot(1, new ItemStack(Items.DIAMOND, 16)); | ||
| // LV Cover | ||
| ConveyorCover cover = (ConveyorCover) TestUtils.placeCover(helper, crate2, GTItems.CONVEYOR_MODULE_LV.asStack(), | ||
| Direction.DOWN); | ||
| // Set the cover to import from crate1 to crate2 | ||
| cover.setIo(IO.IN); | ||
| // Filter to whitelist diamonds | ||
| ItemFilterCover filterCover = (ItemFilterCover) TestUtils.placeCover(helper, crate1, makeDiamondFilter(), | ||
| Direction.UP); | ||
| filterCover.setFilterMode(FilterMode.FILTER_INSERT); // filter is for insert only, so should block transfer | ||
|
|
||
| helper.runAtTickTime(40, () -> { | ||
| TestUtils.assertEqual(helper, crate2.getInventory().getStackInSlot(0), ItemStack.EMPTY); | ||
| TestUtils.assertEqual(helper, crate2.getInventory().getStackInSlot(1), ItemStack.EMPTY); | ||
| helper.succeed(); | ||
| }); | ||
| } | ||
| } |
3 changes: 1 addition & 2 deletions
3
...ceu/gtceu/api/cover/MonitorCoverTest.java → .../gtceu/common/cover/MonitorCoverTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.