Skip to content
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

Fabric Game Test API #1622

Merged
merged 23 commits into from
Aug 31, 2021
Merged

Fabric Game Test API #1622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ad90675
First proof of concept pass
modmuss50 Aug 9, 2021
89de800
Cleanup and fixes.
modmuss50 Aug 9, 2021
70fdebb
Checkstyle
modmuss50 Aug 9, 2021
3c1b06a
Fix running.
modmuss50 Aug 9, 2021
cca985a
Updated
modmuss50 Aug 10, 2021
57d9053
Fix build
modmuss50 Aug 10, 2021
163eede
Cleanup + fixes.
modmuss50 Aug 10, 2021
b7fc7a1
Fix package
modmuss50 Aug 10, 2021
e448860
and test package
modmuss50 Aug 10, 2021
62d0259
game-test -> gametest
modmuss50 Aug 10, 2021
742d6a1
Fix exclusion
modmuss50 Aug 10, 2021
62b63ae
Review feedback and fixes.
modmuss50 Aug 15, 2021
67dd60c
Remove comment
modmuss50 Aug 15, 2021
6f228c7
Review feedback.
modmuss50 Aug 15, 2021
6229cbb
Don't set the game instance
modmuss50 Aug 17, 2021
5f495e7
Merge branch '1.17' into gametest
modmuss50 Aug 24, 2021
780b00c
Fix
modmuss50 Aug 24, 2021
61f9002
Work around shadowed fields from super classes not getting remapped..…
modmuss50 Aug 24, 2021
f96a1e4
Add mixin to exit with a non-zero exit code in case the test server f…
shartte Aug 24, 2021
0891af2
Enable JUnit XML report generation.
shartte Aug 24, 2021
f704a2d
Merge pull request #2 from shartte/gametest
modmuss50 Aug 25, 2021
8b42425
Merge pull request #3 from shartte/junit
modmuss50 Aug 25, 2021
24d4c4b
Merge branch '1.17' into gametest
modmuss50 Aug 25, 2021
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
2 changes: 0 additions & 2 deletions ...gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import net.minecraft.world.level.storage.LevelStorage;

import net.fabricmc.fabric.api.gametest.v1.FabricGameTest;
import net.fabricmc.loader.FabricLoader;

public final class FabricGameTestHelper {
public static final boolean ENABLED = System.getProperty("fabric-api.gametest") != null;
Expand All @@ -53,7 +52,6 @@ public static void runHeadlessServer(LevelStorage.Session session, ResourcePackM
LOGGER.info("Starting test server");
MinecraftServer server = TestServer.startServer(thread -> {
TestServer testServer = new TestServer(thread, session, resourcePackManager, serverResourceManager, getBatches(), BlockPos.ORIGIN, registryManager);
FabricLoader.INSTANCE.setGameInstance(testServer);
return testServer;
});
}
Expand Down
4 changes: 4 additions & 0 deletions ...-gametest-api-v1/src/testmod/java/net/fabricmc/fabric/test/gametest/ExampleTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package net.fabricmc.fabric.test.gametest;

import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.block.Blocks;
import net.minecraft.test.GameTest;
import net.minecraft.test.TestContext;
Expand All @@ -29,6 +30,9 @@ public void diamond(TestContext context) {
context.addInstantFinalTask(() ->
context.checkBlock(new BlockPos(0, 2, 0), (block) -> block == Blocks.DIAMOND_BLOCK, "Expect block to be diamond")
);

// This should be null for the game tests
assert FabricLoader.getInstance().getGameInstance() == null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't assert useless by default? It should probably be if (FabricLoader.getInstance().getGameInstance() != null) throw new AssertionError();

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might just remove this, was just a quick test tbh;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can just add -ea for vm args for test mod runs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's enabled for the regular test task too.

}

@GameTest(structureName = FabricGameTest.EMPTY_STRUCTURE)
Expand Down