chore: use test suite name as group rather than batch

Author: marcus8448

src/main/java/dev/galacticraft/machinelib/api/gametest/SimpleGameTest.java

@@ -75,12 +75,6 @@ public abstract class SimpleGameTest implements FabricGameTest {
         return tests;
     }
 
-    protected String getTestBatch() {
-        TestSuite annotation = this.getClass().getAnnotation(TestSuite.class);
-        if (annotation != null) return annotation.value();
-        return "defaultBatch";
-    }
-
     @Override
     public void invokeTestMethod(GameTestHelper context, Method method) {
         // don't invoke fabric if there is no annotation (generated test)
@@ -96,9 +90,10 @@ protected TestFunction createTest(@Nullable String group, String name, String st
     }
 
     protected TestFunction createTest(@Nullable String batch, @Nullable String group, String name, String structure, int ticks, int setupTicks, Consumer<GameTestHelper> test) {
+        batch = batch == null || batch.isBlank() ? "defaultBatch" : batch;
         return new TestFunction(
-                batch == null || batch.isBlank() ? this.getTestBatch() : batch,
-                GameTestUtils.generateTestName(batch == null || batch.isBlank() ? this.getTestBatch() : batch, group, name),
+                batch,
+                GameTestUtils.generateTestName(batch, group == null || group.isBlank() ? getDefaultTestGroup() : group, name),
                 structure,
                 Rotation.NONE,
                 ticks,
@@ -107,4 +102,9 @@ protected TestFunction createTest(@Nullable String batch, @Nullable String group
                 test
         );
     }
+
+    private String getDefaultTestGroup() {
+        TestSuite annotation = this.getClass().getAnnotation(TestSuite.class);
+        return annotation != null ? annotation.value() : null;
+    }
 }

src/main/java/dev/galacticraft/machinelib/api/gametest/annotation/BasicTest.java

@@ -53,7 +53,7 @@
      *
      * @see GameTest#batch()
      */
-    String batch();
+    String batch() default "defaultBatch";
 
     /**
      * {@return the group name of the test}