build: streamline test setup in otter modules

Signed-off-by: Jendrik Johannes <[email protected]>

Author: jjohannes

platform-sdk/base-crypto/src/main/java/module-info.java

@@ -8,7 +8,8 @@
             com.swirlds.platform.core,
             com.swirlds.common.test.fixtures,
             com.swirlds.platform.core.test.fixtures,
-            org.hiero.base.crypto.test.fixtures;
+            org.hiero.base.crypto.test.fixtures,
+            org.hiero.otter.test;
     exports org.hiero.base.crypto.engine to
             com.swirlds.common,
             com.swirlds.common.test.fixtures,

platform-sdk/consensus-otter-docker-app/build.gradle.kts

@@ -1,20 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 plugins {
-    id("java-library")
-    id("jacoco")
-    id("org.hiero.gradle.base.jpms-modules")
-    id("org.hiero.gradle.base.lifecycle")
-    id("org.hiero.gradle.base.version")
-    id("org.hiero.gradle.check.dependencies")
-    id("org.hiero.gradle.check.javac-lint")
-    id("org.hiero.gradle.check.spotless")
-    id("org.hiero.gradle.check.spotless-java")
-    id("org.hiero.gradle.check.spotless-kotlin")
-    id("org.hiero.gradle.feature.git-properties-file")
-    id("org.hiero.gradle.feature.java-compile")
-    id("org.hiero.gradle.feature.java-execute")
-    id("org.hiero.gradle.feature.test")
-    id("org.hiero.gradle.report.test-logger")
+    id("org.hiero.gradle.module.library")
     id("org.hiero.gradle.feature.test-fixtures")
     id("org.hiero.gradle.feature.protobuf")
 }

platform-sdk/consensus-otter-docker-app/src/main/java/module-info.java

@@ -1,33 +1,42 @@
 // SPDX-License-Identifier: Apache-2.0
+import org.gradlex.javamodule.dependencies.dsl.GradleOnlyDirectives
+
 plugins {
-    id("java-library")
-    id("jacoco")
-    id("org.hiero.gradle.base.jpms-modules")
-    id("org.hiero.gradle.base.lifecycle")
-    id("org.hiero.gradle.base.version")
-    id("org.hiero.gradle.check.dependencies")
-    id("org.hiero.gradle.check.javac-lint")
-    id("org.hiero.gradle.check.spotless")
-    id("org.hiero.gradle.check.spotless-java")
-    id("org.hiero.gradle.check.spotless-kotlin")
-    id("org.hiero.gradle.feature.git-properties-file")
-    id("org.hiero.gradle.feature.java-compile")
-    id("org.hiero.gradle.feature.java-execute")
-    id("org.hiero.gradle.feature.test")
-    id("org.hiero.gradle.report.test-logger")
+    id("org.hiero.gradle.module.library")
     id("org.hiero.gradle.feature.test-fixtures")
     id("org.hiero.gradle.feature.test-integration")
     id("org.hiero.gradle.feature.protobuf")
 }
 
 description = "Consensus Otter Test Framework"
 
+@Suppress("UnstableApiUsage")
+testing {
+    javaModuleTesting.whitebox(suites["test"]) { //
+        sourcesUnderTest = sourceSets.testFixtures.get()
+    }
+    javaModuleTesting.whitebox(suites["testIntegration"]) {
+        sourcesUnderTest = sourceSets.testFixtures.get()
+    }
+    suites.register<JvmTestSuite>("testOtter") {
+        // Runs tests against the Container environment
+        targets.register("testContainer") {
+            testTask {
+                dependsOn(":consensus-otter-docker-app:copyDockerizedApp")
+                systemProperty("otter.env", "container")
+            }
+        }
+
+        // Runs tests against the Turtle environment
+        targets.register("testTurtle") { testTask { systemProperty("otter.env", "turtle") } }
+    }
+}
+
 testModuleInfo {
     requires("com.swirlds.base")
     requires("com.swirlds.base.test.fixtures")
     requires("com.swirlds.common.test.fixtures")
     requires("com.swirlds.platform.core.test.fixtures")
-    requires("org.hiero.otter.fixtures")
     requires("org.assertj.core")
     requires("org.junit.jupiter.params")
     requires("org.mockito")
@@ -38,41 +47,6 @@ testModuleInfo {
     requires("org.apache.logging.log4j")
 }
 
-testing.suites {
-    val testOtter by
-        registering(JvmTestSuite::class) {
-            useJUnitJupiter()
-
-            dependencies {
-                implementation(project())
-                implementation(project.dependencies.testFixtures(project()))
-                implementation(project(":swirlds-common"))
-                implementation(project(":swirlds-platform-core"))
-                implementation(project(":base-crypto"))
-                implementation("org.junit.jupiter:junit-jupiter-params")
-                implementation("com.github.spotbugs:spotbugs-annotations")
-                runtimeOnly("io.grpc:grpc-netty-shaded")
-            }
-
-            targets {
-                all {
-                    testTask.configure {
-                        // Disable all parallelism
-                        systemProperty("junit.jupiter.execution.parallel.enabled", false)
-                        systemProperty(
-                            "junit.jupiter.testclass.order.default",
-                            "org.junit.jupiter.api.ClassOrderer\$OrderAnnotation",
-                        )
-
-                        // Limit heap and number of processors
-                        maxHeapSize = "8g"
-                        jvmArgs("-XX:ActiveProcessorCount=6")
-                    }
-                }
-            }
-        }
-}
-
 testIntegrationModuleInfo {
     requires("com.swirlds.common.test.fixtures")
     requires("com.swirlds.logging")
@@ -85,70 +59,15 @@ testIntegrationModuleInfo {
     runtimeOnly("io.grpc.netty.shaded")
 }
 
+extensions.getByName<GradleOnlyDirectives>("testOtterModuleInfo").apply {
+    runtimeOnly("io.grpc.netty.shaded")
+}
+
+tasks.withType<Test>().configureEach { maxHeapSize = "8g" }
+
 // This should probably not be necessary (Log4j issue?)
 // https://github.com/apache/logging-log4j2/pull/3053
 tasks.compileTestFixturesJava {
     options.compilerArgs.add("-Alog4j.graalvm.groupId=${project.group}")
     options.compilerArgs.add("-Alog4j.graalvm.artifactId=${project.name}")
 }
-
-// Runs tests against the Turtle environment
-tasks.register<Test>("testTurtle") {
-    useJUnitPlatform()
-    testClassesDirs = sourceSets.named("testOtter").get().output.classesDirs
-    classpath = sourceSets.named("testOtter").get().runtimeClasspath
-
-    // Disable all parallelism
-    systemProperty("junit.jupiter.execution.parallel.enabled", false)
-    systemProperty(
-        "junit.jupiter.testclass.order.default",
-        "org.junit.jupiter.api.ClassOrderer\$OrderAnnotation",
-    )
-    // Tell our launcher to target a Turtle network
-    systemProperty("otter.env", "turtle")
-
-    // Limit heap and number of processors
-    maxHeapSize = "8g"
-    jvmArgs("-XX:ActiveProcessorCount=6")
-}
-
-// Runs tests against the Container environment
-tasks.register<Test>("testContainer") {
-    dependsOn(":consensus-otter-docker-app:copyDockerizedApp")
-
-    useJUnitPlatform()
-    testClassesDirs = sourceSets.named("testOtter").get().output.classesDirs
-    classpath = sourceSets.named("testOtter").get().runtimeClasspath
-
-    // Disable all parallelism
-    systemProperty("junit.jupiter.execution.parallel.enabled", false)
-    systemProperty(
-        "junit.jupiter.testclass.order.default",
-        "org.junit.jupiter.api.ClassOrderer\$OrderAnnotation",
-    )
-
-    // Tell our launcher to target a testcontainer-based network
-    systemProperty("otter.env", "container")
-
-    // Limit heap and number of processors
-    maxHeapSize = "8g"
-    jvmArgs("-XX:ActiveProcessorCount=6")
-}
-
-// Configure the default testIntegration task with proper memory settings
-tasks.testIntegration {
-    useJUnitPlatform()
-    testClassesDirs = sourceSets.testIntegration.get().output.classesDirs
-    classpath = sourceSets.testIntegration.get().runtimeClasspath
-
-    // Disable all parallelism
-    systemProperty("junit.jupiter.execution.parallel.enabled", false)
-    systemProperty(
-        "junit.jupiter.testclass.order.default",
-        "org.junit.jupiter.api.ClassOrderer\$OrderAnnotation",
-    )
-
-    // Limit heap and number of processors
-    maxHeapSize = "8g"
-    jvmArgs("-XX:ActiveProcessorCount=6")
-}

platform-sdk/consensus-otter-tests/build.gradle.kts

@@ -2,6 +2,7 @@
 module org.hiero.otter.fixtures {
     requires transitive com.hedera.node.hapi;
     requires transitive com.hedera.pbj.runtime;
+    requires transitive com.swirlds.base.test.fixtures;
     requires transitive com.swirlds.base;
     requires transitive com.swirlds.common.test.fixtures;
     requires transitive com.swirlds.common;
@@ -25,7 +26,6 @@
     requires transitive org.junit.jupiter.api;
     requires transitive org.testcontainers;
     requires com.hedera.node.app.hapi.utils;
-    requires com.swirlds.base.test.fixtures;
     requires com.swirlds.config.extensions;
     requires com.swirlds.platform.core.test.fixtures;
     requires org.hiero.consensus.utility;
@@ -51,13 +51,20 @@
     exports org.hiero.otter.fixtures.result;
     exports org.hiero.otter.fixtures.container.proto;
     exports org.hiero.otter.fixtures.app;
-    exports org.hiero.otter.fixtures.logging.internal to
-            org.hiero.consensus.otter.docker.app;
+    exports org.hiero.otter.fixtures.logging.internal;
     exports org.hiero.otter.fixtures.internal.helpers to
             org.hiero.consensus.otter.docker.app;
     exports org.hiero.otter.fixtures.util;
     exports org.hiero.otter.fixtures.container.utils to
             org.hiero.consensus.otter.docker.app;
     exports org.hiero.otter.fixtures.network.utils;
     exports org.hiero.otter.fixtures.app.state;
+    exports org.hiero.otter.fixtures.container;
+    exports org.hiero.otter.fixtures.internal;
+    exports org.hiero.otter.fixtures.internal.network;
+    exports org.hiero.otter.fixtures.turtle;
+    exports org.hiero.otter.fixtures.turtle.logging;
+    exports org.hiero.otter.fixtures.turtle.gossip;
+    exports org.hiero.otter.fixtures.internal.result;
+    exports org.hiero.otter.fixtures.app.services.consistency;
 }

platform-sdk/consensus-otter-tests/src/main/java/module-info.java

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+open module org.hiero.otter.test {
+    requires com.swirlds.common;
+    requires com.swirlds.platform.core;
+    requires org.hiero.base.crypto;
+    requires org.hiero.otter.fixtures;
+    requires org.junit.jupiter.params;
+    requires static com.github.spotbugs.annotations;
+}

platform-sdk/consensus-otter-tests/src/testFixtures/java/module-info.java

@@ -68,7 +68,8 @@
             com.swirlds.config.impl,
             com.swirlds.platform.core.test.fixtures,
             com.hedera.node.app,
-            org.hiero.otter.fixtures;
+            org.hiero.otter.fixtures,
+            org.hiero.otter.test;
     exports com.swirlds.platform.event.linking to
             com.swirlds.common,
             com.swirlds.platform.core.test.fixtures;
@@ -106,6 +107,7 @@
     exports com.swirlds.platform.config.internal;
     exports com.swirlds.platform.freeze;
     exports com.swirlds.platform.network.protocol.rpc;
+    exports com.swirlds.platform.state.iss to org.hiero.otter.test;
 
     requires transitive com.hedera.node.hapi;
     requires transitive com.hedera.pbj.runtime;

platform-sdk/consensus-otter-tests/src/testOtter/java/module-info.java

@@ -1,6 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://central.sonatype.com/repository/maven-snapshots")
+    }
+}
+
+buildscript {
+    configurations.classpath { resolutionStrategy.cacheChangingModulesFor(0, "seconds") }
+}
+
 plugins {
-    id("org.hiero.gradle.build") version "0.6.0"
+    id("org.hiero.gradle.build") version "0.6.1-SNAPSHOT"
     id("com.hedera.pbj.pbj-compiler") version "0.12.2" apply false
 }