Skip to content

Commit 040159d

Browse files
robotgryphonrobotgryphon
committed
Introduce new gametest attributes @gtholder and @PrefixGTTemplate
1 parent bb12ed2 commit 040159d

17 files changed

+125
-141
lines changed

‎build.gradle‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ sourceSets {
6161
}
6262

6363
test {
64-
java { srcDir "src/main/test" }
64+
java { srcDir "src/test/java" }
6565

6666
resources {
6767
srcDir "src/test/resources"
@@ -123,9 +123,6 @@ minecraft {
123123
property 'mixin.env.remapRefMap', 'true'
124124
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
125125

126-
// Only runs gametests which use "examplemod" as the namespace
127-
args '--enableNamespace', mod_id
128-
129126
environment "CC_TEST_RESOURCES", sourceSets.test.resources.srcDirs[0]
130127

131128
mods {
@@ -151,7 +148,6 @@ minecraft {
151148
args '--output', file('src/generated/resources/')
152149
args "--existing", file("src/main/resources")
153150

154-
155151
mods {
156152
compactcrafting {
157153
source sourceSets.main
@@ -160,7 +156,7 @@ minecraft {
160156
}
161157
}
162158

163-
gametestserver {
159+
gameTestServer {
164160
workingDirectory project.file('run/gametest')
165161

166162
// Recommended logging data for a userdev environment
@@ -178,9 +174,6 @@ minecraft {
178174
property 'mixin.env.remapRefMap', 'true'
179175
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
180176

181-
// Only runs gametests which use "examplemod" as the namespace
182-
args '--enableNamespace', mod_id
183-
184177
environment "CC_TEST_RESOURCES", sourceSets.test.resources.srcDirs[0]
185178

186179
mods {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

66
minecraft_version=1.18.1
7-
forge_version=39.0.97-gametest-1.18.x
7+
forge_version=39.0.105-gametest
88

99
mod_id=compactcrafting
1010
mod_version=2.0.0-beta.1

‎src/test/java/dev/compactmods/crafting/tests/GameTestsMain.java‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/test/java/dev/compactmods/crafting/tests/projectors/Projectors.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
import net.minecraft.gametest.framework.GameTestHelper;
1616
import net.minecraft.server.level.ServerLevel;
1717
import net.minecraft.world.level.block.state.BlockState;
18+
import net.minecraftforge.gametest.GameTestHolder;
1819

19-
// @IntegrationTestClass("projectors")
20+
@GameTestHolder(CompactCrafting.MOD_ID)
2021
public class Projectors {
2122

22-
@GameTest(template = "small_field", templateNamespace = CompactCrafting.MOD_ID)
23+
@GameTest(template = "small_field")
2324
public static void CanPlaceProjector(final GameTestHelper test) {
2425
final BlockPos fieldCenter = MiniaturizationFieldSize.SMALL.getOriginCenterFromCorner()
2526
.above();
@@ -61,7 +62,7 @@ public static void CanPlaceProjector(final GameTestHelper test) {
6162
test.succeed();
6263
}
6364

64-
@GameTest(template = "small_field", templateNamespace = CompactCrafting.MOD_ID)
65+
@GameTest(template = "small_field")
6566
public static void GeneratesFieldCapabilityInstance(final GameTestHelper test) {
6667
final BlockPos center = test.absolutePos(MiniaturizationFieldSize.SMALL.getOriginCenterFromCorner().above());
6768

@@ -88,7 +89,7 @@ public static void GeneratesFieldCapabilityInstance(final GameTestHelper test) {
8889
});
8990
}
9091

91-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID)
92+
@GameTest(template = "empty_medium")
9293
public static void PlacingSingleActiveProjectorDeactivatesIt(final GameTestHelper test) {
9394
final BlockState stateSmall = CCBlocks.FIELD_PROJECTOR_BLOCK.get()
9495
.defaultBlockState()
@@ -117,9 +118,4 @@ public static void PlacingSingleActiveProjectorDeactivatesIt(final GameTestHelpe
117118

118119
test.succeed();
119120
}
120-
121-
// @IntegrationTest("empty_medium")
122-
// void FailureTest(IntegrationTestHelper test) {
123-
// Assertions.fail("Uncomment in production.");
124-
// }
125121
}

‎src/test/java/dev/compactmods/crafting/tests/recipes/components/BlockComponentTests.java‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@
1515
import net.minecraft.world.level.block.state.BlockState;
1616
import net.minecraft.world.level.block.state.properties.Half;
1717
import net.minecraft.world.level.block.state.properties.StairsShape;
18+
import net.minecraftforge.gametest.GameTestHolder;
19+
import net.minecraftforge.gametest.PrefixGameTestTemplate;
1820
import org.junit.jupiter.api.Assertions;
1921

22+
@PrefixGameTestTemplate(false)
23+
@GameTestHolder(CompactCrafting.MOD_ID)
2024
public class BlockComponentTests {
2125

22-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
26+
@GameTest(template = "empty_medium")
2327
public static void CanCreateInstanceWithBlock(final GameTestHelper test) {
2428
BlockComponent component = new BlockComponent(Blocks.GOLD_BLOCK);
2529
if (!Blocks.GOLD_BLOCK.equals(component.getBlock()))
@@ -28,7 +32,7 @@ public static void CanCreateInstanceWithBlock(final GameTestHelper test) {
2832
test.succeed();
2933
}
3034

31-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
35+
@GameTest(template = "empty_medium")
3236
public static void CanFetchFirstMatch(final GameTestHelper test) {
3337
BlockComponent component = new BlockComponent(Blocks.GOLD_BLOCK);
3438

@@ -46,7 +50,7 @@ public static void CanFetchFirstMatch(final GameTestHelper test) {
4650
test.succeed();
4751
}
4852

49-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
53+
@GameTest(template = "empty_medium")
5054
public static void ToStringShowsBlockId(final GameTestHelper test) {
5155
BlockComponent component = new BlockComponent(Blocks.GOLD_BLOCK);
5256

@@ -59,7 +63,7 @@ public static void ToStringShowsBlockId(final GameTestHelper test) {
5963
}
6064
}
6165

62-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
66+
@GameTest(template = "empty_medium")
6367
public static void CanMatchBlock(final GameTestHelper test) {
6468
JsonElement json = FileHelper.getJsonFromFile("components/block/block_properties.json");
6569

@@ -97,7 +101,7 @@ public static void CanMatchBlock(final GameTestHelper test) {
97101
}
98102
}
99103

100-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
104+
@GameTest(template = "empty_medium")
101105
public static void CanMatchBlockNoProperties(final GameTestHelper test) {
102106
JsonElement json = FileHelper.getJsonFromFile("components/block/block_no_properties.json");
103107

@@ -128,7 +132,7 @@ public static void CanMatchBlockNoProperties(final GameTestHelper test) {
128132
});
129133
}
130134

131-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
135+
@GameTest(template = "empty_medium")
132136
public static void CanReserializeComponentMatcher(final GameTestHelper test) throws RuntimeException {
133137
JsonElement json = FileHelper.getJsonFromFile("components/block/block_properties.json");
134138

@@ -147,8 +151,8 @@ public static void CanReserializeComponentMatcher(final GameTestHelper test) thr
147151
});
148152
}
149153

150-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
151-
void ThrowsErrorOnUnregisteredBlock() {
154+
@GameTest(template = "empty_medium")
155+
public static void ThrowsErrorOnUnregisteredBlock(final GameTestHelper test) {
152156
JsonElement json = FileHelper.getJsonFromFile("components/block/block_not_registered.json");
153157

154158
BlockComponent.CODEC.decode(JsonOps.INSTANCE, json)
@@ -158,8 +162,8 @@ void ThrowsErrorOnUnregisteredBlock() {
158162
});
159163
}
160164

161-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
162-
void DoesWarnOnBadProperty() {
165+
@GameTest(template = "empty_medium")
166+
public static void DoesWarnOnBadProperty(final GameTestHelper test) {
163167
JsonElement json = FileHelper.getJsonFromFile("components/block/block_bad_property.json");
164168

165169
BlockComponent.CODEC.decode(JsonOps.INSTANCE, json)
@@ -171,8 +175,8 @@ void DoesWarnOnBadProperty() {
171175
});
172176
}
173177

174-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
175-
void DoesNotMatchDifferentBlocks() {
178+
@GameTest(template = "empty_medium")
179+
public static void DoesNotMatchDifferentBlocks(final GameTestHelper test) {
176180
// Loads a cobblestone stairs definition
177181
JsonElement json = FileHelper.getJsonFromFile("components/block/block_no_properties.json");
178182

@@ -186,8 +190,8 @@ void DoesNotMatchDifferentBlocks() {
186190
});
187191
}
188192

189-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
190-
void HasCorrectComponentType() {
193+
@GameTest(template = "empty_medium")
194+
public static void HasCorrectComponentType(final GameTestHelper test) {
191195
// Loads a cobblestone stairs definition
192196
JsonElement json = FileHelper.getJsonFromFile("components/block/block_no_properties.json");
193197

@@ -203,8 +207,8 @@ void HasCorrectComponentType() {
203207
});
204208
}
205209

206-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
207-
void HasARenderBlockstate() {
210+
@GameTest(template = "empty_medium")
211+
public static void HasARenderBlockstate(final GameTestHelper test) {
208212
// Loads a cobblestone stairs definition
209213
JsonElement json = FileHelper.getJsonFromFile("components/block/block_no_properties.json");
210214

@@ -219,8 +223,8 @@ void HasARenderBlockstate() {
219223
});
220224
}
221225

222-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
223-
void CanHandleErrorRenderingChanges() {
226+
@GameTest(template = "empty_medium")
227+
public static void CanHandleErrorRenderingChanges(final GameTestHelper test) {
224228

225229
BlockComponent component = new BlockComponent(Blocks.GOLD_BLOCK);
226230

‎src/test/java/dev/compactmods/crafting/tests/recipes/components/CCRecipeComponentsTests.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
import net.minecraft.gametest.framework.GameTest;
1313
import net.minecraft.gametest.framework.GameTestHelper;
1414
import net.minecraft.world.level.block.Blocks;
15+
import net.minecraftforge.gametest.GameTestHolder;
16+
import net.minecraftforge.gametest.PrefixGameTestTemplate;
1517
import org.junit.jupiter.api.Assertions;
1618
import org.junit.jupiter.api.Test;
1719

20+
@PrefixGameTestTemplate(false)
21+
@GameTestHolder(CompactCrafting.MOD_ID)
1822
public class CCRecipeComponentsTests {
1923

2024
@Test
@@ -39,7 +43,7 @@ void CanFetchComponentsFresh() {
3943
Assertions.assertTrue(allComponents.isEmpty());
4044
}
4145

42-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
46+
@GameTest(template = "empty_medium")
4347
public static void CanRegisterAndFetchBlocks(final GameTestHelper test) {
4448
MiniaturizationRecipeComponents components = new MiniaturizationRecipeComponents();
4549
final BlockComponent BLOCK_COMPONENT = new BlockComponent(Blocks.GOLD_BLOCK);
@@ -65,7 +69,7 @@ public static void CanRegisterAndFetchBlocks(final GameTestHelper test) {
6569
});
6670
}
6771

68-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
72+
@GameTest(template = "empty_medium")
6973
public static void EmptyBlocksAreActuallyEmpty(final GameTestHelper test) {
7074
MiniaturizationRecipeComponents components = new MiniaturizationRecipeComponents();
7175
components.registerBlock("G", new BlockComponent(Blocks.GOLD_BLOCK));
@@ -104,7 +108,7 @@ public RecipeComponentType<?> getType() {
104108
}, "Failed to register a component as 'other'.");
105109
}
106110

107-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
111+
@GameTest(template = "empty_medium")
108112
public static void CanGetNumberOfComponents(final GameTestHelper test) {
109113
MiniaturizationRecipeComponents components = new MiniaturizationRecipeComponents();
110114
if(0 != components.size())

‎src/test/java/dev/compactmods/crafting/tests/recipes/components/ComponentTypeCodecTests.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
import net.minecraft.gametest.framework.GameTest;
1111
import net.minecraft.gametest.framework.GameTestHelper;
1212

13+
@PrefixGameTestTemplate(false)
14+
@GameTestHolder(CompactCrafting.MOD_ID)
1315
public class ComponentTypeCodecTests {
1416

15-
@GameTest(templateNamespace = CompactCrafting.MOD_ID, template = "empty_medium", prefixTemplateWithClassname = false)
17+
@GameTest(template = "empty_medium")
1618
public static void testFailedDecode(final GameTestHelper test) {
1719
JsonElement string = JsonOps.INSTANCE.createString("compactcrafting:bad_component_type");
1820

@@ -29,7 +31,7 @@ public static void testFailedDecode(final GameTestHelper test) {
2931
test.succeed();
3032
}
3133

32-
@GameTest(templateNamespace = CompactCrafting.MOD_ID, template = "empty_medium", prefixTemplateWithClassname = false)
34+
@GameTest(template = "empty_medium")
3335
public static void testBadEncode(final GameTestHelper test) {
3436
RecipeComponentType<?> badComponentType = new BadRecipeComponentType();
3537

@@ -46,7 +48,7 @@ public static void testBadEncode(final GameTestHelper test) {
4648
test.succeed();
4749
}
4850

49-
@GameTest(templateNamespace = CompactCrafting.MOD_ID, template = "empty_medium", prefixTemplateWithClassname = false)
51+
@GameTest(template = "empty_medium")
5052
public static void testEncode(final GameTestHelper test) {
5153
DataResult<JsonElement> result = RecipeComponentTypeCodec.INSTANCE.encodeStart(JsonOps.INSTANCE, ComponentRegistration.EMPTY_BLOCK_COMPONENT.get());
5254

‎src/test/java/dev/compactmods/crafting/tests/recipes/components/EmptyComponentTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
import org.junit.jupiter.api.Assertions;
1717
import org.junit.jupiter.api.Test;
1818

19+
@PrefixGameTestTemplate(false)
20+
@GameTestHolder(CompactCrafting.MOD_ID)
1921
public class EmptyComponentTests {
2022

21-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
23+
@GameTest(template = "empty_medium")
2224
public static void CanCreateEmptyComponent(final GameTestHelper test) {
2325
JsonElement json = FileHelper.getJsonFromFile("components/empty/empty_component.json");
2426

@@ -48,7 +50,7 @@ void DoesNotErrorRendering() {
4850
Assertions.assertFalse(errored);
4951
}
5052

51-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
53+
@GameTest(template = "empty_medium")
5254
public static void HasComponentType(final GameTestHelper test) {
5355
JsonElement json = FileHelper.getJsonFromFile("components/empty/empty_component.json");
5456

@@ -69,7 +71,7 @@ public static void HasComponentType(final GameTestHelper test) {
6971
});
7072
}
7173

72-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
74+
@GameTest(template = "empty_medium")
7375
public static void HasRenderState(final GameTestHelper test) {
7476
JsonElement json = FileHelper.getJsonFromFile("components/empty/empty_component.json");
7577

@@ -87,7 +89,7 @@ public static void HasRenderState(final GameTestHelper test) {
8789
});
8890
}
8991

90-
@GameTest(template = "empty_medium", templateNamespace = CompactCrafting.MOD_ID, prefixTemplateWithClassname = false)
92+
@GameTest(template = "empty_medium")
9193
public static void CanGetBlock(final GameTestHelper test) {
9294
EmptyBlockComponent component = new EmptyBlockComponent();
9395
final Block block = component.getBlock();

0 commit comments

Comments
 (0)