You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/05/12 13:15:35 UTC

(grails-core) 14/14: Update GrailsTestPlugin

This is an automated email from the ASF dual-hosted git repository.

borinquenkid pushed a commit to branch 8.0.x-hibernate7_gorm_enhance
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit 24a87de0633289c23b1b7e976f714e5a50a10d6b
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Tue May 12 08:10:57 2026 -0500

    Update GrailsTestPlugin
---
 ISSUES.md                                          | 156 ++++-----------------
 .../apache/grails/buildsrc/GrailsTestPlugin.groovy |  62 ++++++++
 .../grails/buildsrc/GrailsTestPluginSpec.groovy    | 107 ++++++++++++++
 build.gradle                                       |   2 +-
 4 files changed, 194 insertions(+), 133 deletions(-)

diff --git a/ISSUES.md b/ISSUES.md
index 558e3bf02e..c04263fec2 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -1,6 +1,6 @@
 # Hibernate 7 / MongoDB Migration — Issue Tracker
 
-**CURRENT FOCUS**: MongoDB module compilation and test failures.
+**CURRENT FOCUS**: Batch-based local test workflow and stale tracker cleanup.
 
 ---
 
@@ -19,9 +19,13 @@
 | `grails-data-mongodb-core` | ✅ 100% passing | Fixed versioning, dirty checking, and embedded conflicts. Added `GormRegistry.reset()` to multi-tenancy specs to resolve test isolation issues. |
 | `grails-data-mongodb` + siblings | ✅ 100% passing | All integration and example tests passing |
 
-**Run command** (quarterly batches — full suite hangs):
+**Run command** (use only for small selected batches):
 ```bash
-python3 run_quarter.py specs_q1.txt --timeout 600
+# Set grails.test.modules in local.properties, then run selected modules:
+./gradlew -I local-init.gradle testSelected
+
+# For reliable continuation after a failure, run a single module directly:
+./gradlew :<module>:test --continue
 ```
 
 ---
@@ -130,7 +134,7 @@ All 12 H7 example modules pass ✅
 
 ### Build & Environment
 - **Dependency Resolution**: Updated `grails-spring-security` to `7.0.3-SNAPSHOT` to resolve missing artifacts.
-- **Memory Management**: Provided flattened sequential test command for 16GB RAM laptop verification.
+- **Memory Management**: Added isolation-mode guidance for smaller laptops; prefer selected-module runs over the full suite.
 
 ---
 
@@ -139,35 +143,25 @@ All 12 H7 example modules pass ✅
 1. **Can modify `grails-datamapping-core`** — must run all 253 tests before committing.
 2. **Never modify `grails-datastore-core`** — changes affect H5 and MongoDB.
 3. **`local.properties`** — never delete; comment out old values, append new ones.
-4. **No `git push`** until full suite passes.
-5. Full suite hangs — run specs in quarters via `run_quarter.py` with `specs_q{1..4}.txt`.
+4. **No `git push`** until the relevant selected-module run and aggregate report pass.
+5. Full-suite local runs with `-I` OOM the daemon on this laptop — avoid running everything that way.
+
+## Local workflow
+1. Uncomment a small module batch in `local.properties`.
+2. Run `./gradlew -I local-init.gradle testSelected` for that batch only.
+3. If a test fails, switch to `./gradlew :<module>:test --continue` for reliable continuation.
+4. Do not run the full suite with `-I` on this laptop; it OOMs the daemon.
+
+## Run All
+Use the `runAll` task to execute the selected modules one at a time in separate Gradle invocations:
+
+```bash
+./gradlew -I local-init.gradle runAll
+```
 
-## Running tests locally
+If `grails.test.modules` is set in `local.properties`, only those modules are run. Otherwise, `runAll` discovers every subproject with a `test` task, runs them sequentially, and still finishes by writing `TEST_FAILURES.md`.
 
 export GRADLE_OPTS="-Xmx6G -XX:MaxMetaspaceSize=1G" && \
-./gradlew clean -I local-init.gradle && \
-./gradlew :grails-async:test --continue -I local-init.gradle && \
-./gradlew :grails-async-core:test --continue -I local-init.gradle && \
-./gradlew :grails-async-gpars:test --continue -I local-init.gradle && \
-./gradlew :grails-async-rxjava:test --continue -I local-init.gradle && \
-./gradlew :grails-async-rxjava2:test --continue -I local-init.gradle && \
-./gradlew :grails-async-rxjava3:test --continue -I local-init.gradle && \
-./gradlew :grails-bootstrap:test --continue -I local-init.gradle && \
-./gradlew :grails-cache:test --continue -I local-init.gradle && \
-./gradlew :grails-codecs:test --continue -I local-init.gradle && \
-./gradlew :grails-codecs-core:test --continue -I local-init.gradle && \
-./gradlew :grails-common:test --continue -I local-init.gradle && \
-./gradlew :grails-console:test --continue -I local-init.gradle && \
-./gradlew :grails-controllers:test --continue -I local-init.gradle && \
-./gradlew :grails-converters:test --continue -I local-init.gradle && \
-./gradlew :grails-core:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate5:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate5-core:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate5-dbmigration:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate5-spring-boot:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate5-spring-orm:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate7:test --continue -I local-init.gradle && \
-./gradlew :grails-data-hibernate7-core:test --continue -I local-init.gradle && \
 ./gradlew :grails-data-hibernate7-dbmigration:test --continue -I local-init.gradle && \
 ./gradlew :grails-data-hibernate7-spring-boot:test --continue -I local-init.gradle && \
 ./gradlew :grails-data-hibernate7-spring-orm:test --continue -I local-init.gradle && \
@@ -223,105 +217,3 @@ export GRADLE_OPTS="-Xmx6G -XX:MaxMetaspaceSize=1G" && \
 ./gradlew :grails-profiles-web-plugin:test --continue -I local-init.gradle && \
 ./gradlew :grails-rest-transforms:test --continue -I local-init.gradle && \
 ./gradlew :grails-scaffolding:test --continue -I local-init.gradle && \
-./gradlew :grails-services:test --continue -I local-init.gradle && \
-./gradlew :grails-shell-cli:test --continue -I local-init.gradle && \
-./gradlew :grails-spring:test --continue -I local-init.gradle && \
-./gradlew :grails-taglib:test --continue -I local-init.gradle && \
-./gradlew :grails-test-core:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-app1:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-app2:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-app3:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-app4:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-app5:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-async-events-pubsub-demo:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-cache:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-database-cleanup:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-datasources:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-demo33:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-exploded:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-external-configuration:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-geb:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-geb-context-path:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-geb-gebconfig:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-gorm:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-gsp-layout:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-data-service:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-data-service-multi-datasource:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-database-per-tenant:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-hibernate:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-hibernate-groovy-proxy:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-multiple-datasources:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-multitenant-multi-datasource:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-partitioned-multi-tenancy:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-grails-schema-per-tenant:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-issue450:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-spring-boot-hibernate:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate5-standalone-hibernate:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-data-service:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-data-service-multi-datasource:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-database-per-tenant:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-hibernate:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-hibernate-groovy-proxy:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-multiple-datasources:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-multitenant-multi-datasource:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-partitioned-multi-tenancy:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-grails-schema-per-tenant:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-issue450:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-spring-boot-hibernate:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hibernate7-standalone-hibernate:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-hyphenated:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-issue-11102:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-issue-11767:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-issue-15228:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-issue-698-domain-save-npe:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-issue-views-182:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-micronaut:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-micronaut-groovy-only:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-mongodb-base:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-mongodb-database-per-tenant:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-mongodb-gson-templates:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-mongodb-hibernate5:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-mongodb-springboot:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-mongodb-test-data-service:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-namespaces:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-exploded:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-issue-11767:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-issue11005:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-loadafter:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-loadfirst:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-loadsecond:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-plugins-micronaut-singleton:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-scaffolding:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-scaffolding-fields:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-test-phases:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-views-functional-tests:test --continue -I local-init.gradle && \
-./gradlew :grails-test-examples-views-functional-tests-plugin:test --continue -I local-init.gradle && \
-./gradlew :grails-test-suite-base:test --continue -I local-init.gradle && \
-./gradlew :grails-test-suite-persistence:test --continue -I local-init.gradle && \
-./gradlew :grails-test-suite-uber:test --continue -I local-init.gradle && \
-./gradlew :grails-test-suite-web:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-core:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-datamapping:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-dbcleanup-core:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-dbcleanup-h2:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-dbcleanup-postgresql:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-http-client:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-mongodb:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-views-gson:test --continue -I local-init.gradle && \
-./gradlew :grails-testing-support-web:test --continue -I local-init.gradle && \
-./gradlew :grails-url-mappings:test --continue -I local-init.gradle && \
-./gradlew :grails-validation:test --continue -I local-init.gradle && \
-./gradlew :grails-views-core:test --continue -I local-init.gradle && \
-./gradlew :grails-views-gson:test --continue -I local-init.gradle && \
-./gradlew :grails-views-markup:test --continue -I local-init.gradle && \
-./gradlew :grails-web-boot:test --continue -I local-init.gradle && \
-./gradlew :grails-web-common:test --continue -I local-init.gradle && \
-./gradlew :grails-web-core:test --continue -I local-init.gradle && \
-./gradlew :grails-web-databinding:test --continue -I local-init.gradle && \
-./gradlew :grails-web-gsp:test --continue -I local-init.gradle && \
-./gradlew :grails-web-gsp-taglib:test --continue -I local-init.gradle && \
-./gradlew :grails-web-jsp:test --continue -I local-init.gradle && \
-./gradlew :grails-web-mvc:test --continue -I local-init.gradle && \
-./gradlew :grails-web-taglib:test --continue -I local-init.gradle && \
-./gradlew :grails-web-url-mappings:test --continue -I local-init.gradle && \
-./gradlew aggregateTestFailures aggregateStyleViolations -I local-init.gradle
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsTestPlugin.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsTestPlugin.groovy
index 1e7f251ff9..27c2bdf26d 100644
--- a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsTestPlugin.groovy
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsTestPlugin.groovy
@@ -21,6 +21,8 @@ package org.apache.grails.buildsrc
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import groovy.xml.XmlSlurper
+import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
@@ -34,6 +36,46 @@ class GrailsTestPlugin implements Plugin<Project> {
             return
         }
 
+        project.tasks.register('runAll') { task ->
+            task.group = 'verification'
+            task.description = 'Runs selected test modules sequentially in isolated Gradle invocations'
+
+            task.finalizedBy('aggregateTestFailures')
+
+            task.doLast {
+                List<String> modulePaths = resolveModulePaths(project)
+                if (modulePaths.isEmpty()) {
+                    project.logger.lifecycle('No test modules were configured.')
+                    return
+                }
+
+                File gradleExecutable = resolveGradleExecutable(project)
+                File initScript = project.layout.projectDirectory.file('local-init.gradle').asFile
+                List<String> failedModules = []
+
+                modulePaths.each { modulePath ->
+                    project.logger.lifecycle("Running ${modulePath}:test")
+                    def result = project.exec { exec ->
+                        exec.workingDir = project.rootDir
+                        List<String> commandLine = [gradleExecutable.absolutePath, '--no-daemon', '-PmaxTestParallel=1']
+                        if (initScript.exists()) {
+                            commandLine.addAll(['-I', initScript.absolutePath])
+                        }
+                        commandLine.addAll(['--continue', "${modulePath}:test"])
+                        exec.commandLine = commandLine
+                        exec.ignoreExitValue = true
+                    }
+                    if (result.exitValue != 0) {
+                        failedModules << modulePath
+                    }
+                }
+
+                if (!failedModules.isEmpty()) {
+                    throw new GradleException("One or more modules failed: ${failedModules.join(', ')}")
+                }
+            }
+        }
+
         project.tasks.register('aggregateTestFailures') { task ->
             task.group = 'verification'
             task.description = 'Aggregates all test failures across all modules into TEST_FAILURES.md'
@@ -95,6 +137,26 @@ class GrailsTestPlugin implements Plugin<Project> {
         }
     }
 
+    private static List<String> resolveModulePaths(Project project) {
+        def configuredModules = project.findProperty('grails.test.modules')?.toString()?.trim()
+        if (configuredModules) {
+            return configuredModules.split(',').collect { it.trim() }.findAll { it }
+        }
+
+        return project.subprojects.findAll { it.tasks.findByName('test') != null }
+                .collect { it.path }
+                .sort()
+    }
+
+    private static File resolveGradleExecutable(Project project) {
+        def executableName = Os.isFamily(Os.FAMILY_WINDOWS) ? 'gradlew.bat' : 'gradlew'
+        def executable = project.rootProject.layout.projectDirectory.file(executableName).asFile
+        if (!executable.exists()) {
+            throw new GradleException("Missing Gradle wrapper at ${executable.absolutePath}")
+        }
+        return executable
+    }
+
     @CompileDynamic
     private void writeReport(Project project, List failures) {
         def reportFile = project.layout.projectDirectory.file('TEST_FAILURES.md').asFile
diff --git a/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsTestPluginSpec.groovy b/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsTestPluginSpec.groovy
new file mode 100644
index 0000000000..7c1c7ebfa1
--- /dev/null
+++ b/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsTestPluginSpec.groovy
@@ -0,0 +1,107 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.grails.buildsrc
+
+import org.gradle.testkit.runner.GradleRunner
+import spock.lang.Specification
+import spock.lang.TempDir
+
+import java.nio.file.Path
+
+class GrailsTestPluginSpec extends Specification {
+
+    @TempDir
+    Path testProjectDir
+
+    def "runAll runs modules sequentially and still aggregates failures"() {
+        given:
+        testProjectDir.resolve('settings.gradle').toFile().text = "rootProject.name = 'test-project'"
+        testProjectDir.resolve('build.gradle').toFile().text = """
+            plugins {
+                id 'org.apache.grails.gradle.test-aggregation'
+            }
+
+            ext['grails.test.modules'] = ':module-a,:module-b'
+        """
+        createGradleWrapper()
+
+        when:
+        def result = GradleRunner.create()
+                .withProjectDir(testProjectDir.toFile())
+                .withArguments('runAll', '--stacktrace')
+                .withPluginClasspath()
+                .buildAndFail()
+
+        then:
+        result.output.contains('Running :module-a:test')
+        result.output.contains('Running :module-b:test')
+
+        and:
+        testProjectDir.resolve('invocations.log').toFile().readLines() == [
+                '--no-daemon -PmaxTestParallel=1 --continue :module-a:test',
+                '--no-daemon -PmaxTestParallel=1 --continue :module-b:test'
+        ]
+
+        and:
+        def report = testProjectDir.resolve('TEST_FAILURES.md').toFile().text
+        report.contains('## Module: module-a')
+        report.contains('com.example.ModuleASpec')
+        report.contains('boom')
+        !report.contains('## Module: module-b')
+    }
+
+    private void createGradleWrapper() {
+        def wrapper = testProjectDir.resolve('gradlew').toFile()
+        wrapper.text = """#!/usr/bin/env bash
+set -euo pipefail
+
+printf '%s\\n' "\$*" >> invocations.log
+
+case "\$*" in
+  *:module-a:test*)
+    mkdir -p module-a/build/test-results/test
+    cat > module-a/build/test-results/test/TEST-module-a.xml <<'XML'
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="module-a" tests="1" failures="1" errors="0" skipped="0">
+  <testcase classname="com.example.ModuleASpec" name="fails">
+    <failure message="boom" type="org.opentest4j.AssertionFailedError">boom</failure>
+  </testcase>
+</testsuite>
+XML
+    exit 1
+    ;;
+  *:module-b:test*)
+    mkdir -p module-b/build/test-results/test
+    cat > module-b/build/test-results/test/TEST-module-b.xml <<'XML'
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="module-b" tests="1" failures="0" errors="0" skipped="0">
+  <testcase classname="com.example.ModuleBSpec" name="passes"/>
+</testsuite>
+XML
+    exit 0
+    ;;
+  *)
+    echo "unexpected invocation: \$*" >&2
+    exit 2
+    ;;
+esac
+"""
+        wrapper.setExecutable(true)
+    }
+}
diff --git a/build.gradle b/build.gradle
index 82165ea344..90f53227ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ import javax.inject.Inject
 import org.apache.tools.ant.taskdefs.condition.Os
 
 ext {
-    if (file('local.properties').exists()) {
+    if (!System.getenv().containsKey('CI') && file('local.properties').exists()) {
         def props = new Properties()
         file('local.properties').withInputStream { props.load(it) }
         props.each { key, value ->