Add game and junit tests to AP

.gitignore

@@ -21,12 +21,12 @@ build
 eclipse
 run
 server
+/.jqwik-database
 
 # Files from Forge MDK
 forge*changelog.txt
 
 #github
-
 1.17
 .env
 

build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'net.darkhax.curseforgegradle' version '1.1.16'
     id 'org.jetbrains.changelog' version '1.2.1'
     id "com.modrinth.minotaur" version "2.+"
-    id "org.jetbrains.kotlin.jvm" version "1.6.10"
+    id "org.jetbrains.kotlin.jvm" version "1.9.23"
     id 'net.minecraftforge.gradle' version '[6.0.18,6.2)'
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
     id 'org.spongepowered.mixin' version '0.7.+'
@@ -56,7 +56,23 @@ sourceSets {
     main.resources {
         srcDir 'src/generated/resources'
     }
-    testMod {}
+    testMod {
+        java.srcDir 'src/testMod/java'
+        kotlin.srcDir 'src/testMod/kotlin'
+        resources.srcDir 'src/testMod/resources'
+        compileClasspath += main.compileClasspath + test.compileClasspath
+        runtimeClasspath += main.runtimeClasspath + test.runtimeClasspath
+    }
+    testFixtures {
+        java.srcDir 'src/testFixtures/java'
+        kotlin.srcDir 'src/testFixtures/kotlin'
+        resources.srcDir 'src/testFixtures/resources'
+    }
+}
+
+java.registerFeature("testFixtures") {
+    usingSourceSet(sourceSets.testFixtures)
+    disablePublication()
 }
 
 minecraft {
@@ -66,7 +82,13 @@ minecraft {
     accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
     accessTransformer file('src/testMod/resources/META-INF/accesstransformer.cfg')
 
+
     runs {
+        all {
+            lazyToken('minecraft_classpath') {
+                configurations.library.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
+            }
+        }
         client {
             workingDirectory project.file('run')
 
@@ -126,38 +148,69 @@ minecraft {
             }
         }
 
-        testClient {
+        gameTestClient {
             workingDirectory project.file('test-files/client')
             parent runs.client
 
+            def old = lazyTokens["minecraft_classpath"]
+            lazyToken("minecraft_classpath") {
+                // Add all files in testMinecraftLibrary to the classpath.
+                def allFiles = new HashSet<String>();
+
+                def oldVal = old?.get()
+                if (!oldVal != null && !oldVal.isEmpty()) allFiles.addAll(oldVal.split(File.pathSeparatorChar))
+
+                for (file in configurations["testMinecraftLibrary"]) allFiles.add(file.absolutePath)
+
+                println("New classpath $allFiles")
+                allFiles.join(File.pathSeparator)
+            }
+
+            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', 'advancedperipherals,advancedperipheralstest'
+            property 'advancedperipheralstest.sources', file("src/testMod/resources/data/advancedperipheralstest").absolutePath
+
+            args "--mixin.config=advancedperipheralstest.mixins.json"
+
             mods {
-                aptest {
+                advancedperipheralstest {
                     source sourceSets.testMod
+                    source sourceSets.testFixtures
                 }
             }
+        }
 
-            lazyToken('minecraft_classpath') {
-                (configurations.implementationExtra.copyRecursive().resolve())
-                        .collect { it.absolutePath }
-                        .join(File.pathSeparator)
+        gameTestServer {
+            def old = lazyTokens["minecraft_classpath"]
+            lazyToken("minecraft_classpath") {
+                // Add all files in testMinecraftLibrary to the classpath.
+                def allFiles = new HashSet<String>();
+
+                def oldVal = old?.get()
+                if (!oldVal != null && !oldVal.isEmpty()) allFiles.addAll(oldVal.split(File.pathSeparatorChar))
+
+                for (file in configurations["testMinecraftLibrary"]) allFiles.add(file.absolutePath)
+
+                println("New classpath $allFiles")
+                allFiles.join(File.pathSeparator)
             }
-        }
 
-        testServer {
             workingDirectory project.file('test-files/server')
+            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', 'advancedperipherals,advancedperipheralstest'
+            property 'advancedperipheralstest.sources', file("src/testMod/resources/data/advancedperipheralstest").absolutePath
+
+            args "--mixin.config=advancedperipheralstest.mixins.json"
             parent runs.server
 
             mods {
-                aptest {
+                advancedperipheralstest {
                     source sourceSets.testMod
+                    source sourceSets.testFixtures
                 }
             }
-
-            lazyToken('minecraft_classpath') {
-                (configurations.implementationExtra.copyRecursive().resolve())
-                        .collect { it.absolutePath }
-                        .join(File.pathSeparator)
-            }
         }
     }
 }
@@ -247,9 +300,31 @@ repositories {
 }
 
 configurations {
+        named("testModCompileClasspath") {
+            shouldResolveConsistentlyWith compileClasspath
+        }
+
+        named("testModRuntimeClasspath") {
+            shouldResolveConsistentlyWith runtimeClasspath
+        }
+
+    munecraftLibrary { extendsFrom(minecraftEmbed) }
+
+    testMinecraftLibrary {
+        canBeResolved = true
+        canBeConsumed = false
+        // Prevent ending up with multiple versions of libraries on the classpath.
+        shouldResolveConsistentlyWith(minecraftLibrary)
+    }
+
+    library
+    implementation.extendsFrom library
     implementationExtra
+    testImplementation.extendsFrom(implementation)
     testModImplementation.extendsFrom(implementation)
     testModImplementation.extendsFrom(testImplementation)
+    testFixturesImplementation.extendsFrom(implementation)
+    testFixturesImplementation.extendsFrom(testImplementation)
 }
 
 dependencies {
@@ -260,6 +335,7 @@ dependencies {
     compileOnly "org.jetbrains:annotations:${jb_annotations}"
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
     implementation fg.deobf("org.squiddev:cc-tweaked-${minecraft_version}:${cc_version}")
+    implementation fg.deobf("org.squiddev:cc-tweaked-${minecraft_version}:${cc_version}:api")
     // Minimal requirements end
 
     // Extended requirements
@@ -323,9 +399,6 @@ dependencies {
     compileOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
     runtimeOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
 
-    //Removed until fully ported
-    //testImplementation fg.deobf("site.siredvin.ttoolkit:ttoolkit-${minecraft_version}:${ttoolkit_version}")
-
     //Powah
     compileOnly fg.deobf("curse.maven:powah-633483:${powah_version}")
     runtimeOnly fg.deobf("curse.maven:powah-633483:${powah_version}")
@@ -337,12 +410,16 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
+    testImplementation "net.jqwik:jqwik:${jqwikVersion}"
     testImplementation "org.hamcrest:hamcrest:${hamcrest_version}"
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinx_coroutines_version}"
     testModImplementation sourceSets.main.output
+    testModImplementation sourceSets.testFixtures.output
+
+    testMinecraftLibrary("org.junit.jupiter:junit-jupiter-api:${junit_version}")
+    testMinecraftLibrary("org.junit.jupiter:junit-jupiter-params:${junit_version}")
+    testMinecraftLibrary("org.hamcrest:hamcrest:${hamcrest_version}")
 
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
     // Testing stuff
     // JEI
     implementation fg.deobf("mezz.jei:jei-${jei_version}")
@@ -370,6 +447,11 @@ changelog {
 
 compileTestModJava {
     dependsOn(compileJava)
+    dependsOn(compileKotlin)
+    dependsOn(compileTestJava)
+    dependsOn(compileTestKotlin)
+    dependsOn(compileTestFixturesJava)
+    dependsOn(compileTestFixturesKotlin)
 }
 
 task setupServer(type: Copy) {
@@ -383,28 +465,12 @@ task setupServer(type: Copy) {
     into "test-files/server"
 }
 
-["Client", "Server"].forEach { name ->
-    tasks.register("test$name", JavaExec.class).configure {
-        it.group('In-game tests')
-        it.description("Runs tests on a temporary Minecraft instance.")
-        it.dependsOn(setupServer, "prepareRunTest$name", "cleanTest$name", 'compileTestModJava')
-
-        JavaExec exec = tasks.getByName("runTest$name")
-        exec.copyTo(it)
-        it.setClasspath(exec.getClasspath())
-        it.mainClass = exec.mainClass
-        it.setArgs(exec.getArgs())
-
-        it.systemProperty('forge.logging.console.level', 'debug')
-        it.systemProperty('ttoolkit.run', 'true')
-    }
-}
-
 test {
     useJUnitPlatform()
     testLogging {
         events "skipped", "failed"
     }
+    finalizedBy('runGameTestServer')
 }
 
 afterEvaluate {

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.logging.level=info
 # Minecraft related
 mod_id=advancedperipherals
 minecraft_version=1.19.2
-forge_version=43.3.8
+forge_version=43.3.13
 loader_version=43
 mod_version=0.7.36r
 release_type=release
@@ -14,11 +14,10 @@ mappings_version=2022.11.27-1.19.2
 jb_annotations=21.0.1
 
 # Test dependencies
-junit_version=5.7.2
+junit_version=5.10.2
 hamcrest_version=2.2
-kotlin_version=1.8.0
-kotlinx_coroutines_version=1.6.0-RC3
 ttoolkit_version=0.1.3
+jqwikVersion=1.8.4
 
 # Mod dependencies
 cc_version=1.101.3

settings.gradle

@@ -16,5 +16,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }

src/main/java/de/srendi/advancedperipherals/common/items/MemoryCardItem.java

@@ -10,6 +10,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -26,7 +27,7 @@ public boolean isEnabled() {
     }
 
     @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level levelIn, List<Component> tooltip, TooltipFlag flagIn) {
+    public void appendHoverText(@NotNull ItemStack stack, @Nullable Level levelIn, @NotNull List<Component> tooltip, @NotNull TooltipFlag flagIn) {
         super.appendHoverText(stack, levelIn, tooltip, flagIn);
         if (stack.getOrCreateTag().contains("owner"))
             tooltip.add(EnumColor.buildTextComponent(Component.translatable("item.advancedperipherals.tooltip.memory_card.bound", stack.getOrCreateTag().getString("owner"))));

src/main/java/de/srendi/advancedperipherals/common/items/WeakAutomataCore.java

@@ -58,7 +58,7 @@ public WeakAutomataCore(@Nullable ResourceLocation turtleID, @Nullable ResourceL
     }
 
     @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List<Component> tooltip, TooltipFlag flagIn) {
+    public void appendHoverText(@NotNull ItemStack stack, @Nullable Level worldIn, @NotNull List<Component> tooltip, @NotNull TooltipFlag flagIn) {
         super.appendHoverText(stack, worldIn, tooltip, flagIn);
         CompoundTag tag = stack.getOrCreateTag();
         CompoundTag consumedData = tag.getCompound(CONSUMER_ENTITY_COMPOUND);

src/main/java/de/srendi/advancedperipherals/common/items/base/BaseBlockItem.java

@@ -1,10 +1,8 @@
 package de.srendi.advancedperipherals.common.items.base;
 
 import de.srendi.advancedperipherals.AdvancedPeripherals;
-import de.srendi.advancedperipherals.client.KeyBindings;
-import de.srendi.advancedperipherals.common.util.EnumColor;
-import de.srendi.advancedperipherals.common.util.KeybindUtil;
 import de.srendi.advancedperipherals.common.util.TranslationUtil;
+import de.srendi.advancedperipherals.common.util.inventory.ItemUtil;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
@@ -28,15 +26,9 @@ public BaseBlockItem(Block blockIn) {
     }
 
     @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level levelIn, List<Component> tooltip, TooltipFlag flagIn) {
+    public void appendHoverText(@NotNull ItemStack stack, @Nullable Level levelIn, @NotNull List<Component> tooltip, @NotNull TooltipFlag flagIn) {
         super.appendHoverText(stack, levelIn, tooltip, flagIn);
-        if (!KeybindUtil.isKeyPressed(KeyBindings.DESCRIPTION_KEYBINDING)) {
-            tooltip.add(EnumColor.buildTextComponent(Component.translatable("item.advancedperipherals.tooltip.show_desc", KeyBindings.DESCRIPTION_KEYBINDING.getTranslatedKeyMessage())));
-        } else {
-            tooltip.add(EnumColor.buildTextComponent(getDescription()));
-        }
-        if (!isEnabled())
-            tooltip.add(EnumColor.buildTextComponent(Component.translatable("item.advancedperipherals.tooltip.disabled")));
+        ItemUtil.buildItemTooltip(getDescription(), isEnabled(), tooltip);
     }
 
     public @NotNull Component getDescription() {

src/main/java/de/srendi/advancedperipherals/common/items/base/BaseItem.java

@@ -1,10 +1,8 @@
 package de.srendi.advancedperipherals.common.items.base;
 
 import de.srendi.advancedperipherals.AdvancedPeripherals;
-import de.srendi.advancedperipherals.client.KeyBindings;
-import de.srendi.advancedperipherals.common.util.EnumColor;
-import de.srendi.advancedperipherals.common.util.KeybindUtil;
 import de.srendi.advancedperipherals.common.util.TranslationUtil;
+import de.srendi.advancedperipherals.common.util.inventory.ItemUtil;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -45,18 +43,11 @@ public InteractionResultHolder<ItemStack> use(Level worldIn, Player playerIn, In
     }
 
     @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List<Component> tooltip, TooltipFlag flagIn) {
+    public void appendHoverText(@NotNull ItemStack stack, @Nullable Level worldIn, @NotNull List<Component> tooltip, @NotNull TooltipFlag flagIn) {
         super.appendHoverText(stack, worldIn, tooltip, flagIn);
-        if (!KeybindUtil.isKeyPressed(KeyBindings.DESCRIPTION_KEYBINDING)) {
-            tooltip.add(EnumColor.buildTextComponent(Component.translatable("item.advancedperipherals.tooltip.show_desc", KeyBindings.DESCRIPTION_KEYBINDING.getTranslatedKeyMessage())));
-        } else {
-            tooltip.add(EnumColor.buildTextComponent(getDescription()));
-        }
-        if (!isEnabled())
-            tooltip.add(EnumColor.buildTextComponent(Component.translatable("item.advancedperipherals.tooltip.disabled")));
+        ItemUtil.buildItemTooltip(getDescription(), isEnabled(), tooltip);
     }
 
-
     public @NotNull Component getDescription() {
         if (description == null) description = TranslationUtil.itemTooltip(getDescriptionId());
         return description;