Update test mixed filenames to better show what they are, fix tests

Author: robotgryphon

src/test/java/dev/compactmods/crafting/tests/recipes/layers/MixedLayerTests.java

@@ -21,7 +21,7 @@ public class MixedLayerTests {
     @Test
     @Tag("minecraft")
     void CanCreateLayerInstance() {
-        JsonElement layerJson = FileHelper.INSTANCE.getJsonFromFile("layers/mixed/mixed.json");
+        JsonElement layerJson = FileHelper.INSTANCE.getJsonFromFile("layers/mixed/basic.json");
 
         DataResult<MixedComponentRecipeLayer> parsed = MixedComponentRecipeLayer.CODEC.parse(JsonOps.INSTANCE, layerJson);
         parsed.resultOrPartial(Assertions::fail)

src/test/java/dev/compactmods/crafting/tests/recipes/layers/RecipeLayerUtilTests.java

@@ -18,22 +18,22 @@ public class RecipeLayerUtilTests {
     @Test
     @Tag("minecraft")
     void CanRotate() {
-        TestRecipeLayerBlocks harness = getHarness("layers/mixed/mixed_basic.json");
+        TestRecipeLayerBlocks harness = getHarness("layers/mixed/basic_harness.json");
         Assertions.assertNotNull(harness);
 
         final IRecipeLayerBlocks rotatedClockwise = RecipeLayerUtil.rotate(harness, Rotation.CLOCKWISE_90);
         Assertions.assertNotNull(rotatedClockwise);
 
-        final Set<BlockPos> originalPositions = harness.getPositionsForComponent("Go").map(BlockPos::immutable).collect(Collectors.toSet());
-        final Set<BlockPos> rotatedPositions = rotatedClockwise.getPositionsForComponent("Go").map(BlockPos::immutable).collect(Collectors.toSet());
+        final Set<BlockPos> originalPositions = harness.getPositionsForComponent("G").map(BlockPos::immutable).collect(Collectors.toSet());
+        final Set<BlockPos> rotatedPositions = rotatedClockwise.getPositionsForComponent("G").map(BlockPos::immutable).collect(Collectors.toSet());
 
         Assertions.assertNotEquals(originalPositions, rotatedPositions);
     }
 
     @Test
     @Tag("minecraft")
     void CanRotateWithUnknownComponent() {
-        TestRecipeLayerBlocks harness = getHarness("layers/mixed/mixed_unknown_basic.json");
+        TestRecipeLayerBlocks harness = getHarness("layers/mixed/unknown_component.json");
         Assertions.assertNotNull(harness);
 
         boolean identified = harness.allIdentified();
@@ -55,14 +55,14 @@ void CanRotateWithUnknownComponent() {
     @Test
     @Tag("minecraft")
     void NonRotationCreatesCopiedInstance() {
-        TestRecipeLayerBlocks harness = getHarness("layers/mixed/mixed_basic.json");
+        TestRecipeLayerBlocks harness = getHarness("layers/mixed/basic_harness.json");
         Assertions.assertNotNull(harness);
 
         final IRecipeLayerBlocks rotatedHarness = RecipeLayerUtil.rotate(harness, Rotation.NONE);
         Assertions.assertNotNull(rotatedHarness);
 
-        final Set<BlockPos> originalPositions = harness.getPositionsForComponent("Go").map(BlockPos::immutable).collect(Collectors.toSet());
-        final Set<BlockPos> rotatedPositions = rotatedHarness.getPositionsForComponent("Go").map(BlockPos::immutable).collect(Collectors.toSet());
+        final Set<BlockPos> originalPositions = harness.getPositionsForComponent("G").map(BlockPos::immutable).collect(Collectors.toSet());
+        final Set<BlockPos> rotatedPositions = rotatedHarness.getPositionsForComponent("G").map(BlockPos::immutable).collect(Collectors.toSet());
 
         Assertions.assertEquals(originalPositions, rotatedPositions);
 

…c/test/resources/layers/mixed/mixed.json …c/test/resources/layers/mixed/basic.jsonsrc/test/resources/layers/mixed/mixed.json renamed to src/test/resources/layers/mixed/basic.json src/test/resources/layers/mixed/mixed.json renamed to src/test/resources/layers/mixed/basic.json

@@ -0,0 +1,51 @@
+{
+  "world": {
+    "type": "compactcrafting:mixed",
+    "pattern": [
+      ["I", "G", "G", "G", "G"],
+      ["G", "-", "-", "-", "G"],
+      ["G", "-", "O", "-", "G"],
+      ["G", "-", "-", "-", "G"],
+      ["G", "G", "G", "G", "G"]
+    ]
+  },
+  "worldBlocks": {
+    "G": {
+      "type": "compactcrafting:block",
+      "block": "minecraft:glass"
+    },
+    "O": {
+      "type": "compactcrafting:block",
+      "block": "minecraft:obsidian"
+    },
+    "I": {
+      "type": "compactcrafting:block",
+      "block": "minecraft:iron_block"
+    }
+  },
+
+  "layer": {
+    "type": "compactcrafting:mixed",
+    "pattern": [
+      ["I", "G", "G", "G", "G"],
+      ["G", "-", "-", "-", "G"],
+      ["G", "-", "O", "-", "G"],
+      ["G", "-", "-", "-", "G"],
+      ["G", "G", "G", "G", "G"]
+    ]
+  },
+  "components": {
+    "G": {
+      "type": "compactcrafting:block",
+      "block": "minecraft:glass"
+    },
+    "O": {
+      "type": "compactcrafting:block",
+      "block": "minecraft:obsidian"
+    },
+    "I": {
+      "type": "compactcrafting:block",
+      "block": "minecraft:iron_block"
+    }
+  }
+}