You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ma...@apache.org on 2026/08/25 19:39:22 UTC
(grails-core) branch feat/move-to-testFixtures created (now 14f546cc9c)
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a change to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
at 14f546cc9c docs: Update gsonTesting.adoc to correct description of the JsonViewTest trait
This branch includes the following new commits:
new 319b5cb818 build: Move JSON view test helpers to test fixtures
new 6a020c390b build: Move GraphQL test helpers to test fixtures
new b9ab07fd20 build: Move `grails-core` test helpers to test fixtures
new 954e60cec9 build: Preserve test-fixtures variants during functional test substitution
new bc7c51edce build: remove redundant dependencies on spring-test
new 011e9da567 build: Move `grails-web-common` test helper to test fixtures
new 64cb2d5235 docs: Update upgrading guide to reflect changes in test helpers and their migration to test fixtures
new 14f546cc9c docs: Update gsonTesting.adoc to correct description of the JsonViewTest trait
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(grails-core) 07/08: docs: Update upgrading guide to reflect changes in test helpers and their migration to test fixtures
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 64cb2d5235e87342bfd368c5ebb10a8a0e9e14a2
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Tue Aug 25 21:33:35 2026 +0200
docs: Update upgrading guide to reflect changes in test helpers and their migration to test fixtures
---
.../src/en/guide/upgrading/upgrading80x.adoc | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/grails-doc/src/en/guide/upgrading/upgrading80x.adoc b/grails-doc/src/en/guide/upgrading/upgrading80x.adoc
index a799bc829a..3db1dd7839 100644
--- a/grails-doc/src/en/guide/upgrading/upgrading80x.adoc
+++ b/grails-doc/src/en/guide/upgrading/upgrading80x.adoc
@@ -748,6 +748,35 @@ If your test infrastructure registers it explicitly, remove the registration; Sp
Update the import.
A new `RestTestClient` and corresponding `@AutoConfigureRestTestClient` annotation are also available as a fluent alternative.
+==== 17.1 Test Helpers Moved to Test Fixtures
+
+Several legacy Grails test helpers are no longer included in the production classpath.
+They are published as Gradle test fixtures instead, so applications and plugins that use them directly must request the fixture variant explicitly.
+
+This affects the following helpers:
+
+* `grails.plugin.json.view.test.JsonViewTest` and related JSON view test helpers
+* `org.grails.gorm.graphql.testing.GraphQLSchemaSpec`
+* `org.grails.gorm.graphql.testing.MockDataFetchingEnvironment`
+* `grails.util.GrailsWebMockUtil`
+* Mock resource and plugin helpers from `grails-core`, including `MockResourceLoader`, `MockStringResourceLoader`, `MockFileResource`, `MockPluginDiscovery`, and `MockGrailsPluginManager`
+
+If your tests import one of these classes, add the corresponding `testFixtures(...)` dependency to the configuration that compiles those tests:
+
+[source,groovy]
+.build.gradle
+----
+dependencies {
+ testImplementation testFixtures('org.apache.grails:grails-core')
+ testImplementation testFixtures('org.apache.grails.web:grails-web-common')
+ testImplementation testFixtures('org.apache.grails:grails-views-gson')
+ testImplementation testFixtures('org.apache.grails.data:grails-data-graphql-core')
+}
+----
+
+Only add the fixture dependencies that provide helpers used by the project.
+Do not add them to `implementation`, because these artifacts contain test infrastructure and should not be part of the application runtime classpath.
+
==== 18. DevTools Live Reload Disabled by Default
Spring Boot 4 changed the default of `spring.devtools.livereload.enabled` from `true` to `false`.
(grails-core) 02/08: build: Move GraphQL test helpers to test fixtures
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 6a020c390b8379cf5d00b6c9cdc233648d85edfb
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Thu Aug 20 16:51:11 2026 +0200
build: Move GraphQL test helpers to test fixtures
---
grails-data-graphql/core/build.gradle | 2 ++
.../groovy/org/grails/gorm/graphql/testing/GraphQLSchemaSpec.groovy | 0
.../org/grails/gorm/graphql/testing/MockDataFetchingEnvironment.groovy | 0
3 files changed, 2 insertions(+)
diff --git a/grails-data-graphql/core/build.gradle b/grails-data-graphql/core/build.gradle
index 9d88322dc5..3418a457fb 100644
--- a/grails-data-graphql/core/build.gradle
+++ b/grails-data-graphql/core/build.gradle
@@ -20,6 +20,7 @@
plugins {
id 'groovy'
id 'java-library'
+ id 'java-test-fixtures'
id 'org.apache.grails.buildsrc.properties'
id 'org.apache.grails.buildsrc.compile'
id 'org.apache.grails.buildsrc.publish'
@@ -39,6 +40,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
+ testFixturesImplementation platform(project(':grails-bom'))
api project(':grails-datamapping-core'), {
// api: ConstrainedProperty, GormEntity, MappingContext, PersistentEntity, PersistentProperty
diff --git a/grails-data-graphql/core/src/main/groovy/org/grails/gorm/graphql/testing/GraphQLSchemaSpec.groovy b/grails-data-graphql/core/src/testFixtures/groovy/org/grails/gorm/graphql/testing/GraphQLSchemaSpec.groovy
similarity index 100%
rename from grails-data-graphql/core/src/main/groovy/org/grails/gorm/graphql/testing/GraphQLSchemaSpec.groovy
rename to grails-data-graphql/core/src/testFixtures/groovy/org/grails/gorm/graphql/testing/GraphQLSchemaSpec.groovy
diff --git a/grails-data-graphql/core/src/main/groovy/org/grails/gorm/graphql/testing/MockDataFetchingEnvironment.groovy b/grails-data-graphql/core/src/testFixtures/groovy/org/grails/gorm/graphql/testing/MockDataFetchingEnvironment.groovy
similarity index 100%
rename from grails-data-graphql/core/src/main/groovy/org/grails/gorm/graphql/testing/MockDataFetchingEnvironment.groovy
rename to grails-data-graphql/core/src/testFixtures/groovy/org/grails/gorm/graphql/testing/MockDataFetchingEnvironment.groovy
(grails-core) 05/08: build: remove redundant dependencies on spring-test
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit bc7c51edcefc98859493fc078b9d4136845605d7
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Tue Aug 25 21:25:01 2026 +0200
build: remove redundant dependencies on spring-test
---
grails-codecs/build.gradle | 3 ---
grails-converters/build.gradle | 3 ---
grails-core/build.gradle | 1 -
grails-data-hibernate7/dbmigration/build.gradle | 1 -
grails-databinding/build.gradle | 3 ---
grails-datasource/build.gradle | 3 ---
grails-domain-class/build.gradle | 3 ---
grails-i18n/build.gradle | 3 ---
grails-interceptors/build.gradle | 3 ---
grails-mimetypes/build.gradle | 3 ---
grails-rest-transforms/build.gradle | 3 ---
grails-services/build.gradle | 3 ---
grails-test-core/build.gradle | 3 ---
grails-url-mappings/build.gradle | 3 ---
grails-validation/build.gradle | 3 ---
grails-web-boot/build.gradle | 3 ---
grails-web-common/build.gradle | 5 -----
grails-web-core/build.gradle | 3 ---
grails-web-databinding/build.gradle | 3 ---
grails-web-mvc/build.gradle | 3 ---
grails-web-url-mappings/build.gradle | 3 ---
21 files changed, 61 deletions(-)
diff --git a/grails-codecs/build.gradle b/grails-codecs/build.gradle
index 8473b1e7d4..78e5b7c6af 100644
--- a/grails-codecs/build.gradle
+++ b/grails-codecs/build.gradle
@@ -45,9 +45,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-converters/build.gradle b/grails-converters/build.gradle
index 18b234ecd3..f3c3508932 100644
--- a/grails-converters/build.gradle
+++ b/grails-converters/build.gradle
@@ -55,9 +55,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-core/build.gradle b/grails-core/build.gradle
index 23128ada4f..8bf444114a 100644
--- a/grails-core/build.gradle
+++ b/grails-core/build.gradle
@@ -69,7 +69,6 @@ dependencies {
api 'org.springframework:spring-context'
api 'org.springframework.boot:spring-boot-autoconfigure'
- compileOnly 'org.springframework:spring-test'
compileOnly 'org.apache.groovy:groovy-templates'
api project(':grails-common')
diff --git a/grails-data-hibernate7/dbmigration/build.gradle b/grails-data-hibernate7/dbmigration/build.gradle
index ef0d22f552..cc8e0b5720 100644
--- a/grails-data-hibernate7/dbmigration/build.gradle
+++ b/grails-data-hibernate7/dbmigration/build.gradle
@@ -97,7 +97,6 @@ dependencies {
compileOnly 'org.apache.groovy:groovy-sql'
compileOnly 'org.apache.groovy:groovy-xml'
- compileOnly 'org.springframework:spring-test'
compileOnly 'org.springframework:spring-jdbc'
compileOnly 'org.springframework:spring-beans'
compileOnly 'org.springframework:spring-context'
diff --git a/grails-databinding/build.gradle b/grails-databinding/build.gradle
index cf718ac0af..a7a9e9a13f 100644
--- a/grails-databinding/build.gradle
+++ b/grails-databinding/build.gradle
@@ -52,9 +52,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-datasource/build.gradle b/grails-datasource/build.gradle
index 0e91d9be5f..62454f174e 100644
--- a/grails-datasource/build.gradle
+++ b/grails-datasource/build.gradle
@@ -51,9 +51,6 @@ dependencies {
api project(':grails-core')
compileOnly 'jakarta.servlet:jakarta.servlet-api'
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'com.h2database:h2'
testImplementation 'jakarta.servlet:jakarta.servlet-api'
diff --git a/grails-domain-class/build.gradle b/grails-domain-class/build.gradle
index 69b7b019cc..5a1ba46912 100644
--- a/grails-domain-class/build.gradle
+++ b/grails-domain-class/build.gradle
@@ -62,9 +62,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-i18n/build.gradle b/grails-i18n/build.gradle
index 933a353b94..af0d0515fd 100644
--- a/grails-i18n/build.gradle
+++ b/grails-i18n/build.gradle
@@ -47,9 +47,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
compileOnly 'org.springframework.boot:spring-boot-webmvc'
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-interceptors/build.gradle b/grails-interceptors/build.gradle
index e623abba4e..eac2fdb4ee 100644
--- a/grails-interceptors/build.gradle
+++ b/grails-interceptors/build.gradle
@@ -45,9 +45,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-mimetypes/build.gradle b/grails-mimetypes/build.gradle
index 08e61b7ebe..1a060163d8 100644
--- a/grails-mimetypes/build.gradle
+++ b/grails-mimetypes/build.gradle
@@ -43,9 +43,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-rest-transforms/build.gradle b/grails-rest-transforms/build.gradle
index 32cbb005b8..9fe054a63b 100644
--- a/grails-rest-transforms/build.gradle
+++ b/grails-rest-transforms/build.gradle
@@ -59,9 +59,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-services/build.gradle b/grails-services/build.gradle
index 10841e55bd..68b33fbebd 100644
--- a/grails-services/build.gradle
+++ b/grails-services/build.gradle
@@ -46,9 +46,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-test-core/build.gradle b/grails-test-core/build.gradle
index 269617e63d..f3575a302c 100644
--- a/grails-test-core/build.gradle
+++ b/grails-test-core/build.gradle
@@ -60,9 +60,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.jline:jline' // command line requirements
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
// Logging
api 'org.slf4j:slf4j-api'
diff --git a/grails-url-mappings/build.gradle b/grails-url-mappings/build.gradle
index 6fe078eddd..695c1a39b9 100644
--- a/grails-url-mappings/build.gradle
+++ b/grails-url-mappings/build.gradle
@@ -48,9 +48,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-validation/build.gradle b/grails-validation/build.gradle
index 1bf03f925b..a03623b4b0 100644
--- a/grails-validation/build.gradle
+++ b/grails-validation/build.gradle
@@ -44,9 +44,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-web-boot/build.gradle b/grails-web-boot/build.gradle
index 2f7c401b07..5069ceb71b 100644
--- a/grails-web-boot/build.gradle
+++ b/grails-web-boot/build.gradle
@@ -49,9 +49,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-web-common/build.gradle b/grails-web-common/build.gradle
index 33aad6cd07..b7824f0ff3 100644
--- a/grails-web-common/build.gradle
+++ b/grails-web-common/build.gradle
@@ -51,17 +51,12 @@ dependencies {
api 'org.apache.groovy:groovy'
api 'org.apache.groovy:groovy-templates'
compileOnly 'jakarta.servlet:jakarta.servlet-api'
- testCompileOnly 'org.springframework:spring-test'
api 'org.springframework:spring-webmvc'
api 'org.springframework:spring-context-support'
implementation 'com.github.ben-manes.caffeine:caffeine'
compileOnly 'jakarta.servlet:jakarta.servlet-api'
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
-
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
testImplementation 'jakarta.servlet:jakarta.servlet-api'
diff --git a/grails-web-core/build.gradle b/grails-web-core/build.gradle
index 55acbce608..5159bdb2fb 100644
--- a/grails-web-core/build.gradle
+++ b/grails-web-core/build.gradle
@@ -53,9 +53,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-web-databinding/build.gradle b/grails-web-databinding/build.gradle
index 672e2f7d28..47615395d0 100644
--- a/grails-web-databinding/build.gradle
+++ b/grails-web-databinding/build.gradle
@@ -57,9 +57,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-web-mvc/build.gradle b/grails-web-mvc/build.gradle
index 1c925e09ca..2edf112cfd 100644
--- a/grails-web-mvc/build.gradle
+++ b/grails-web-mvc/build.gradle
@@ -45,9 +45,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-web-url-mappings/build.gradle b/grails-web-url-mappings/build.gradle
index 6b1de96a36..3e463bb2b5 100644
--- a/grails-web-url-mappings/build.gradle
+++ b/grails-web-url-mappings/build.gradle
@@ -77,9 +77,6 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test', {
- // MockHttpServletRequest/Response/Context used in many classes
- }
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
(grails-core) 06/08: build: Move `grails-web-common` test helper to test fixtures
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 011e9da5671f243567e570a8c85723fde938e924
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Tue Aug 25 21:26:59 2026 +0200
build: Move `grails-web-common` test helper to test fixtures
---
grails-async/plugin/build.gradle | 3 ++-
grails-controllers/build.gradle | 2 +-
grails-gsp/grails-web-gsp/build.gradle | 7 ++++---
grails-gsp/plugin/build.gradle | 3 +++
grails-interceptors/build.gradle | 2 ++
grails-mimetypes/build.gradle | 3 ++-
grails-rest-transforms/build.gradle | 3 ++-
grails-test-core/build.gradle | 4 +++-
grails-test-examples/gorm/build.gradle | 7 ++++---
grails-test-examples/gsp-layout/build.gradle | 4 ++++
.../hibernate5/grails-database-per-tenant/build.gradle | 2 ++
.../grails-partitioned-multi-tenancy/build.gradle | 4 +++-
grails-test-suite-persistence/build.gradle | 1 +
grails-test-suite-uber/build.gradle | 1 +
grails-test-suite-web/build.gradle | 1 +
grails-testing-support-web/build.gradle | 3 ++-
grails-web-common/build.gradle | 13 ++++++++-----
.../groovy/grails/util/GrailsWebMockUtil.groovy | 0
grails-web-core/build.gradle | 3 ++-
grails-web-url-mappings/build.gradle | 3 ++-
20 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/grails-async/plugin/build.gradle b/grails-async/plugin/build.gradle
index c19f7c6c85..bf78074ba5 100644
--- a/grails-async/plugin/build.gradle
+++ b/grails-async/plugin/build.gradle
@@ -58,10 +58,11 @@ dependencies {
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testImplementation 'org.spockframework:spock-core'
testImplementation 'org.springframework:spring-test'
+ testImplementation testFixtures(project(':grails-web-common'))
}
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-controllers/build.gradle b/grails-controllers/build.gradle
index 91651c16ba..490613186a 100644
--- a/grails-controllers/build.gradle
+++ b/grails-controllers/build.gradle
@@ -58,8 +58,8 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
- compileOnly 'org.springframework:spring-test'
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
testImplementation 'org.springframework.boot:spring-boot-test'
diff --git a/grails-gsp/grails-web-gsp/build.gradle b/grails-gsp/grails-web-gsp/build.gradle
index 12aaa14cb6..2075958b5a 100644
--- a/grails-gsp/grails-web-gsp/build.gradle
+++ b/grails-gsp/grails-web-gsp/build.gradle
@@ -42,6 +42,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
+ testImplementation platform(project(':grails-bom'))
compileOnlyApi 'jakarta.servlet:jakarta.servlet-api' // api needed downstream to compile GSPs, and exposed by GroovyPageView/PageRenderer/GroovyPagesServlet
compileOnly 'org.apache.ant:ant'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
@@ -118,9 +119,7 @@ dependencies {
// compileOnly 'org.apache.groovy:groovy'
//
testImplementation testFixtures(project(':grails-core'))
- testImplementation 'jakarta.servlet:jakarta.servlet-api'
- testImplementation 'net.bytebuddy:byte-buddy'
- testImplementation project(':grails-web-common'), { // GrailsWebMockUtil
+ testImplementation testFixtures(project(':grails-web-common')), { // GrailsWebMockUtil
// API dependencies in grails-web-common
exclude group: 'org.apache.grails', module: 'grails-core'
exclude group: 'org.apache.grails', module: 'grails-databinding'
@@ -129,6 +128,8 @@ dependencies {
exclude group: 'org.springframework', module: 'spring-webmvc'
exclude group: 'org.springframework', module: 'spring-context-support'
}
+ testImplementation 'jakarta.servlet:jakarta.servlet-api'
+ testImplementation 'net.bytebuddy:byte-buddy'
testImplementation 'org.apache.groovy:groovy-xml'
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testImplementation 'org.spockframework:spock-core'
diff --git a/grails-gsp/plugin/build.gradle b/grails-gsp/plugin/build.gradle
index 5d7194faad..b25550095f 100644
--- a/grails-gsp/plugin/build.gradle
+++ b/grails-gsp/plugin/build.gradle
@@ -178,6 +178,9 @@ dependencies {
testImplementation project(':grails-testing-support-core')
testImplementation project(':grails-testing-support-web')
testImplementation testFixtures(project(':grails-core'))
+ testImplementation testFixtures(project(':grails-web-common')), {
+ // GrailsWebMockUtil
+ }
testCompileOnly 'jakarta.annotation:jakarta.annotation-api'
testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
diff --git a/grails-interceptors/build.gradle b/grails-interceptors/build.gradle
index eac2fdb4ee..0165ea3056 100644
--- a/grails-interceptors/build.gradle
+++ b/grails-interceptors/build.gradle
@@ -37,6 +37,7 @@ group = 'org.apache.grails'
dependencies {
implementation platform(project(':grails-bom'))
+ testImplementation platform(project(':grails-bom'))
api project(':grails-controllers')
api project(':grails-url-mappings')
@@ -46,6 +47,7 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
diff --git a/grails-mimetypes/build.gradle b/grails-mimetypes/build.gradle
index 1a060163d8..abe0d0dc9f 100644
--- a/grails-mimetypes/build.gradle
+++ b/grails-mimetypes/build.gradle
@@ -44,6 +44,7 @@ dependencies {
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
@@ -65,4 +66,4 @@ dependencies {
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-rest-transforms/build.gradle b/grails-rest-transforms/build.gradle
index 9fe054a63b..4f429b779a 100644
--- a/grails-rest-transforms/build.gradle
+++ b/grails-rest-transforms/build.gradle
@@ -52,6 +52,7 @@ dependencies {
}
implementation 'com.github.ben-manes.caffeine:caffeine'
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation project(':grails-url-mappings')
testImplementation project(':grails-test-suite-base')
@@ -81,4 +82,4 @@ dependencies {
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-test-core/build.gradle b/grails-test-core/build.gradle
index f3575a302c..8545a0338b 100644
--- a/grails-test-core/build.gradle
+++ b/grails-test-core/build.gradle
@@ -51,12 +51,14 @@ dependencies {
api project(':grails-mimetypes')
api project(':grails-web-core')
api project(':grails-converters')
- api 'org.apache.groovy:groovy'
+ api 'org.apache.groovy:groovy'
// needed for Spock
api 'org.objenesis:objenesis'
+ implementation testFixtures(project(':grails-web-common'))
+
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.jline:jline' // command line requirements
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
diff --git a/grails-test-examples/gorm/build.gradle b/grails-test-examples/gorm/build.gradle
index 992f84c26e..15c20b6ae2 100644
--- a/grails-test-examples/gorm/build.gradle
+++ b/grails-test-examples/gorm/build.gradle
@@ -32,6 +32,7 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp'
dependencies {
implementation platform(project(':grails-bom'))
+ testImplementation platform(project(':grails-bom'))
implementation 'org.apache.grails:grails-dependencies-starter-web'
implementation 'com.h2database:h2'
@@ -58,12 +59,12 @@ dependencies {
testImplementation 'org.apache.grails:grails-testing-support-web'
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
-
- integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
integrationTestImplementation project(':grails-testing-support-http-client')
+ integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
+ integrationTestImplementation testFixtures('org.apache.grails.web:grails-web-common')
}
apply {
from rootProject.layout.projectDirectory.file('gradle/functional-test-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/grails-extension-gradle-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-test-examples/gsp-layout/build.gradle b/grails-test-examples/gsp-layout/build.gradle
index 90b18cda6f..f77f84267f 100644
--- a/grails-test-examples/gsp-layout/build.gradle
+++ b/grails-test-examples/gsp-layout/build.gradle
@@ -38,6 +38,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
+ testImplementation platform(project(':grails-bom'))
implementation 'org.apache.grails:grails-core'
implementation 'org.apache.grails:grails-controllers'
@@ -66,6 +67,9 @@ dependencies {
integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
testImplementation testFixtures('org.apache.grails:grails-core')
+ testImplementation testFixtures('org.apache.grails.web:grails-web-common'), {
+ // GrailsWebMockUtil
+ }
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.springframework:spring-test'
testImplementation 'org.spockframework:spock-core'
diff --git a/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle b/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
index 302368fbbc..d1e7dca769 100644
--- a/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
+++ b/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
@@ -32,6 +32,7 @@ group = 'examples'
dependencies {
implementation platform(project(':grails-bom'))
+ testImplementation platform(project(':grails-bom'))
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.apache.grails:grails-core'
@@ -58,6 +59,7 @@ dependencies {
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
+ testImplementation testFixtures('org.apache.grails.web:grails-web-common')
testImplementation 'org.spockframework:spock-core'
}
diff --git a/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle b/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
index 2dc81a46d6..7d4bc16357 100644
--- a/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
+++ b/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
@@ -32,6 +32,7 @@ group = 'examples'
dependencies {
implementation platform(project(':grails-bom'))
+ testImplementation platform(project(':grails-bom'))
implementation 'org.apache.grails:grails-data-hibernate5'
implementation 'org.apache.grails:grails-core'
@@ -58,10 +59,11 @@ dependencies {
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.apache.grails.testing:grails-testing-support-core'
+ testImplementation testFixtures('org.apache.grails.web:grails-web-common')
}
apply {
from rootProject.layout.projectDirectory.file('gradle/functional-test-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-webjar-asset-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/grails-extension-gradle-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle
index 2817335fb8..2b676794dc 100644
--- a/grails-test-suite-persistence/build.gradle
+++ b/grails-test-suite-persistence/build.gradle
@@ -63,6 +63,7 @@ dependencies {
}
testImplementation project(':grails-testing-support-core')
testImplementation testFixtures(project(':grails-core'))
+ testImplementation testFixtures(project(':grails-web-common'))
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.springframework:spring-test', {
diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle
index 74369b5e5b..37eab7a744 100644
--- a/grails-test-suite-uber/build.gradle
+++ b/grails-test-suite-uber/build.gradle
@@ -45,6 +45,7 @@ dependencies {
testImplementation project(':grails-spring')
testImplementation project(':grails-test-suite-base')
testImplementation project(':grails-testing-support-core')
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'org.apache.groovy:groovy'
testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
diff --git a/grails-test-suite-web/build.gradle b/grails-test-suite-web/build.gradle
index 0207088bcc..6ad190c5d4 100644
--- a/grails-test-suite-web/build.gradle
+++ b/grails-test-suite-web/build.gradle
@@ -48,6 +48,7 @@ dependencies {
exclude group: 'org.apache.grails', module: 'grails-rest-transforms'
}
testImplementation testFixtures(project(':grails-core'))
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'org.spockframework:spock-core'
testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
diff --git a/grails-testing-support-web/build.gradle b/grails-testing-support-web/build.gradle
index 5e845a802c..512bd74adc 100755
--- a/grails-testing-support-web/build.gradle
+++ b/grails-testing-support-web/build.gradle
@@ -53,6 +53,7 @@ dependencies {
implementation project(':grails-web-jsp'), {
// impl: TagLibraryResolverImpl
}
+ implementation testFixtures(project(':grails-web-common'))
compileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
}
@@ -60,4 +61,4 @@ dependencies {
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-web-common/build.gradle b/grails-web-common/build.gradle
index b7824f0ff3..3e1e518923 100644
--- a/grails-web-common/build.gradle
+++ b/grails-web-common/build.gradle
@@ -20,6 +20,7 @@
plugins {
id 'groovy'
id 'java-library'
+ id 'java-test-fixtures'
id 'project-report'
id 'org.apache.grails.buildsrc.properties'
id 'org.apache.grails.buildsrc.dependency-validator'
@@ -37,20 +38,19 @@ group = 'org.apache.grails.web'
dependencies {
implementation platform(project(':grails-bom'))
+ testFixturesImplementation platform(project(':grails-bom'))
api project(':grails-core'), {
exclude group:'org.apache.grails', module:'grails-spring'
}
api project(':grails-databinding-core')
api project(':grails-encoder')
- compileOnly 'org.apache.grails.views:grails-gsp-core', {
- exclude group:'org.apache.grails', module: 'grails-encoder'
- exclude group:'org.apache.grails', module: 'grails-core'
+ api project(':grails-gsp-core'), {
+ // api: ResourceAwareTemplateEngine
}
api 'org.apache.groovy:groovy'
api 'org.apache.groovy:groovy-templates'
- compileOnly 'jakarta.servlet:jakarta.servlet-api'
api 'org.springframework:spring-webmvc'
api 'org.springframework:spring-context-support'
@@ -75,9 +75,12 @@ dependencies {
// Testing
testImplementation 'org.slf4j:slf4j-simple'
testImplementation 'org.spockframework:spock-core'
+
+ testFixturesApi 'jakarta.servlet:jakarta.servlet-api'
+ testFixturesApi 'org.springframework:spring-test'
}
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-web-common/src/main/groovy/grails/util/GrailsWebMockUtil.groovy b/grails-web-common/src/testFixtures/groovy/grails/util/GrailsWebMockUtil.groovy
similarity index 100%
rename from grails-web-common/src/main/groovy/grails/util/GrailsWebMockUtil.groovy
rename to grails-web-common/src/testFixtures/groovy/grails/util/GrailsWebMockUtil.groovy
diff --git a/grails-web-core/build.gradle b/grails-web-core/build.gradle
index 5159bdb2fb..c26b321aee 100644
--- a/grails-web-core/build.gradle
+++ b/grails-web-core/build.gradle
@@ -56,6 +56,7 @@ dependencies {
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
@@ -76,4 +77,4 @@ dependencies {
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-web-url-mappings/build.gradle b/grails-web-url-mappings/build.gradle
index 3e463bb2b5..4538a6fcc5 100644
--- a/grails-web-url-mappings/build.gradle
+++ b/grails-web-url-mappings/build.gradle
@@ -80,6 +80,7 @@ dependencies {
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.springframework:spring-test'
+ testImplementation testFixtures(project(':grails-web-common'))
testImplementation 'org.apache.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
@@ -100,4 +101,4 @@ dependencies {
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
(grails-core) 04/08: build: Preserve test-fixtures variants during functional test substitution
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 954e60cec9138ff2fbd26faa32eebcb8538adfb4
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Tue Aug 25 17:08:41 2026 +0200
build: Preserve test-fixtures variants during functional test substitution
---
gradle/functional-test-config.gradle | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gradle/functional-test-config.gradle b/gradle/functional-test-config.gradle
index 7b11bbdfa2..20b39db9ca 100644
--- a/gradle/functional-test-config.gradle
+++ b/gradle/functional-test-config.gradle
@@ -30,7 +30,8 @@ if (!rootProject.ext.has('substitutableFunctionalTestProjectsCache')) {
name: subproject.name,
group: subproject.group,
artifactId: subproject.findProperty('pomArtifactId') ?: subproject.name,
- cliArtifactId: subproject.findProperty('cliArtifactId')
+ cliArtifactId: subproject.findProperty('cliArtifactId'),
+ hasTestFixtures: subproject.plugins.hasPlugin('java-test-fixtures')
]
}
)
@@ -42,12 +43,9 @@ configurations.configureEach {
// included will be substituted with the local projects in this repository instead of pulling upstream.
for (def substitutionInfo : substitutableProjects) {
def substitutedArtifact = "${substitutionInfo.group}:${substitutionInfo.artifactId}" as String
- //TODO: This does not handle libraries that are both test fixtures & a libraries like grails-data-mongodb,
- // see grails-test-examples-mongodb-base, & grails-test-examples-mongodb-hibernate5 for project() workaround
if (substitutionInfo.name == 'grails-bom') {
substitute module(substitutedArtifact) using platform(project(':grails-bom'))
- }
- else if(substitutionInfo.name == 'grails-geb') {
+ } else if (substitutionInfo.hasTestFixtures) {
def selector = substitution.variant(module(substitutedArtifact)) { details ->
details.capabilities { handler ->
handler.requireCapability("${substitutedArtifact}-test-fixtures" as String)
@@ -59,8 +57,7 @@ configurations.configureEach {
}
}
substitute selector using replacement
- }
- else {
+ } else {
substitute module(substitutedArtifact) using project(":${substitutionInfo.name}")
}
(grails-core) 08/08: docs: Update gsonTesting.adoc to correct description of the JsonViewTest trait
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 14f546cc9cb4a64cf0ca65cf5df9f4423a647161
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Tue Aug 25 21:38:46 2026 +0200
docs: Update gsonTesting.adoc to correct description of the JsonViewTest trait
---
grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc b/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc
index 9b732f1901..93ab65a9b8 100644
--- a/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc
+++ b/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
////
-Although generally testing can be done using functional tests via an HTTP client, the JSON views plugin also provides a trait which helps in writing either unit or integration tests. Add the `org.apache.grails:grails-views-gson` test-fixtures dependency to use this legacy trait:
+Although generally testing can be done using functional tests via an HTTP client, the JSON views plugin also provides a trait which helps in writing either unit or integration tests. Add the `org.apache.grails:grails-views-gson` test-fixtures dependency to use this trait:
[source,groovy]
dependencies {
(grails-core) 03/08: build: Move `grails-core` test helpers to test fixtures
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit b9ab07fd205528d774aa9c1e7ffa8f37446348f4
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Fri Aug 21 08:24:24 2026 +0200
build: Move `grails-core` test helpers to test fixtures
---
.../java}/org/grails/core/io/MockFileResource.java | 0
.../java}/org/grails/core/io/MockResourceLoader.java | 0
.../java}/org/grails/core/io/MockStringResourceLoader.java | 0
.../java}/org/grails/plugins/MockGrailsPluginManager.java | 0
.../java}/org/grails/plugins/MockPluginDiscovery.java | 0
grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle | 3 ++-
grails-data-neo4j/examples/grails3-neo4j/build.gradle | 3 ++-
grails-gsp/core/build.gradle | 3 ++-
grails-gsp/grails-layout/build.gradle | 3 ++-
grails-gsp/grails-web-gsp/build.gradle | 1 +
grails-gsp/plugin/build.gradle | 1 +
grails-test-examples/gsp-layout/build.gradle | 3 ++-
grails-test-suite-persistence/build.gradle | 1 +
grails-test-suite-web/build.gradle | 1 +
14 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/grails-core/src/main/groovy/org/grails/core/io/MockFileResource.java b/grails-core/src/testFixtures/java/org/grails/core/io/MockFileResource.java
similarity index 100%
rename from grails-core/src/main/groovy/org/grails/core/io/MockFileResource.java
rename to grails-core/src/testFixtures/java/org/grails/core/io/MockFileResource.java
diff --git a/grails-core/src/main/groovy/org/grails/core/io/MockResourceLoader.java b/grails-core/src/testFixtures/java/org/grails/core/io/MockResourceLoader.java
similarity index 100%
rename from grails-core/src/main/groovy/org/grails/core/io/MockResourceLoader.java
rename to grails-core/src/testFixtures/java/org/grails/core/io/MockResourceLoader.java
diff --git a/grails-core/src/main/groovy/org/grails/core/io/MockStringResourceLoader.java b/grails-core/src/testFixtures/java/org/grails/core/io/MockStringResourceLoader.java
similarity index 100%
rename from grails-core/src/main/groovy/org/grails/core/io/MockStringResourceLoader.java
rename to grails-core/src/testFixtures/java/org/grails/core/io/MockStringResourceLoader.java
diff --git a/grails-core/src/main/groovy/org/grails/plugins/MockGrailsPluginManager.java b/grails-core/src/testFixtures/java/org/grails/plugins/MockGrailsPluginManager.java
similarity index 100%
rename from grails-core/src/main/groovy/org/grails/plugins/MockGrailsPluginManager.java
rename to grails-core/src/testFixtures/java/org/grails/plugins/MockGrailsPluginManager.java
diff --git a/grails-core/src/main/groovy/org/grails/plugins/MockPluginDiscovery.java b/grails-core/src/testFixtures/java/org/grails/plugins/MockPluginDiscovery.java
similarity index 100%
rename from grails-core/src/main/groovy/org/grails/plugins/MockPluginDiscovery.java
rename to grails-core/src/testFixtures/java/org/grails/plugins/MockPluginDiscovery.java
diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle
index c9086ef579..7f416a6b4c 100644
--- a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle
+++ b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle
@@ -44,6 +44,7 @@ dependencies {
runtimeOnly "org.apache.tomcat:tomcat-jdbc:9.0.36"
testImplementation project(':grails-testing-support-datamapping')
+ testImplementation testFixtures('org.apache.grails:grails-core')
testImplementation ("org.apache.grails:grails-testing-support-web:$testingSupportVersion") {
exclude group: "org.spockframework", module: "spock-core"
}
@@ -85,4 +86,4 @@ webdriverBinaries {
apply {
from rootProject.layout.projectDirectory.file('gradle/test-webjar-asset-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-data-neo4j/examples/grails3-neo4j/build.gradle b/grails-data-neo4j/examples/grails3-neo4j/build.gradle
index 0bd81e77c4..573db836b7 100644
--- a/grails-data-neo4j/examples/grails3-neo4j/build.gradle
+++ b/grails-data-neo4j/examples/grails3-neo4j/build.gradle
@@ -43,6 +43,7 @@ dependencies {
exclude group: "org.spockframework", module: "spock-core"
}
testImplementation project(':grails-testing-support-datamapping')
+ testImplementation testFixtures('org.apache.grails:grails-core')
testImplementation ("org.apache.grails:grails-testing-support-web:$testingSupportVersion") {
exclude group: "org.spockframework", module: "spock-core"
}
@@ -87,4 +88,4 @@ webdriverBinaries {
apply {
from rootProject.layout.projectDirectory.file('gradle/test-webjar-asset-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-gsp/core/build.gradle b/grails-gsp/core/build.gradle
index aa382206cb..d24b83f15a 100644
--- a/grails-gsp/core/build.gradle
+++ b/grails-gsp/core/build.gradle
@@ -91,6 +91,7 @@ dependencies {
// }
// implementation 'org.springframework:spring-context' // ApplicationContext
//
+ testImplementation testFixtures(project(':grails-core'))
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation and tests
testImplementation 'org.spockframework:spock-core'
@@ -100,4 +101,4 @@ dependencies {
apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-gsp/grails-layout/build.gradle b/grails-gsp/grails-layout/build.gradle
index e4cb4f4517..5dec1ea8fb 100644
--- a/grails-gsp/grails-layout/build.gradle
+++ b/grails-gsp/grails-layout/build.gradle
@@ -62,6 +62,7 @@ dependencies {
// impl: MockHttpServletRequest
}
testImplementation project(':grails-testing-support-web')
+ testImplementation testFixtures(project(':grails-core'))
testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
@@ -73,4 +74,4 @@ apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/grails-extension-gradle-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-gsp/grails-web-gsp/build.gradle b/grails-gsp/grails-web-gsp/build.gradle
index 9f1d35a3a6..12aaa14cb6 100644
--- a/grails-gsp/grails-web-gsp/build.gradle
+++ b/grails-gsp/grails-web-gsp/build.gradle
@@ -117,6 +117,7 @@ dependencies {
// compileOnly 'org.apache.ant:ant' // BuildException, DirectoryScanner, MatchingTask, Path, Reference
// compileOnly 'org.apache.groovy:groovy'
//
+ testImplementation testFixtures(project(':grails-core'))
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'net.bytebuddy:byte-buddy'
testImplementation project(':grails-web-common'), { // GrailsWebMockUtil
diff --git a/grails-gsp/plugin/build.gradle b/grails-gsp/plugin/build.gradle
index d18d85fd6f..5d7194faad 100644
--- a/grails-gsp/plugin/build.gradle
+++ b/grails-gsp/plugin/build.gradle
@@ -177,6 +177,7 @@ dependencies {
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation project(':grails-testing-support-core')
testImplementation project(':grails-testing-support-web')
+ testImplementation testFixtures(project(':grails-core'))
testCompileOnly 'jakarta.annotation:jakarta.annotation-api'
testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
diff --git a/grails-test-examples/gsp-layout/build.gradle b/grails-test-examples/gsp-layout/build.gradle
index 6f20012a7e..90b18cda6f 100644
--- a/grails-test-examples/gsp-layout/build.gradle
+++ b/grails-test-examples/gsp-layout/build.gradle
@@ -65,6 +65,7 @@ dependencies {
integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
+ testImplementation testFixtures('org.apache.grails:grails-core')
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.springframework:spring-test'
testImplementation 'org.spockframework:spock-core'
@@ -78,4 +79,4 @@ apply {
from rootProject.layout.projectDirectory.file('gradle/functional-test-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-webjar-asset-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/grails-extension-gradle-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle
index 476fd2609b..2817335fb8 100644
--- a/grails-test-suite-persistence/build.gradle
+++ b/grails-test-suite-persistence/build.gradle
@@ -62,6 +62,7 @@ dependencies {
exclude module:'grails-testing-support-core'
}
testImplementation project(':grails-testing-support-core')
+ testImplementation testFixtures(project(':grails-core'))
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.springframework:spring-test', {
diff --git a/grails-test-suite-web/build.gradle b/grails-test-suite-web/build.gradle
index 8281c284b5..0207088bcc 100644
--- a/grails-test-suite-web/build.gradle
+++ b/grails-test-suite-web/build.gradle
@@ -47,6 +47,7 @@ dependencies {
exclude group: 'org.apache.grails', module: 'grails-testing-support-core'
exclude group: 'org.apache.grails', module: 'grails-rest-transforms'
}
+ testImplementation testFixtures(project(':grails-core'))
testImplementation 'org.spockframework:spock-core'
testCompileOnly 'org.slf4j:slf4j-nop' // Prevents warning about missing slf4j implementation during compilation
(grails-core) 01/08: build: Move JSON view test helpers to test fixtures
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch feat/move-to-testFixtures
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 319b5cb8188bbde5f87c3c8a74fe4f849cd4faab
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Thu Aug 20 11:08:08 2026 +0200
build: Move JSON view test helpers to test fixtures
---
grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc | 7 ++++++-
grails-testing-support-views-gson/build.gradle | 2 +-
grails-views-gson/build.gradle | 4 +++-
.../groovy/grails/plugin/json/view/test/JsonRenderResult.groovy | 0
.../groovy/grails/plugin/json/view/test/JsonViewTest.groovy | 0
.../groovy/grails/plugin/json/view/test/TestLinkGenerator.groovy | 0
.../grails/plugin/json/view/test/TestRequestConfigurer.groovy | 0
7 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc b/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc
index 3550182db6..9b732f1901 100644
--- a/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc
+++ b/grails-doc/src/en/guide/theWebLayer/gson/gsonTesting.adoc
@@ -17,7 +17,12 @@ specific language governing permissions and limitations
under the License.
////
-Although generally testing can be done using functional tests via an HTTP client, the JSON views plugin also provides a trait which helps in writing either unit or integration tests.
+Although generally testing can be done using functional tests via an HTTP client, the JSON views plugin also provides a trait which helps in writing either unit or integration tests. Add the `org.apache.grails:grails-views-gson` test-fixtures dependency to use this legacy trait:
+
+[source,groovy]
+dependencies {
+ testImplementation testFixtures('org.apache.grails:grails-views-gson')
+}
To use the trait import the `grails.plugin.json.view.test.JsonViewTest` class and apply it to any Spock or JUnit test:
diff --git a/grails-testing-support-views-gson/build.gradle b/grails-testing-support-views-gson/build.gradle
index eacdd0266f..72f7c50cbf 100644
--- a/grails-testing-support-views-gson/build.gradle
+++ b/grails-testing-support-views-gson/build.gradle
@@ -41,7 +41,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
- api project(':grails-views-gson') // Used in public API
+ api testFixtures(project(':grails-views-gson')) // Used in public API
api 'org.springframework:spring-web' // Used in public API
api project(':grails-datastore-core') // Used in public API
api 'org.spockframework:spock-core' // Used in public API
diff --git a/grails-views-gson/build.gradle b/grails-views-gson/build.gradle
index fa83481697..6139b51f37 100644
--- a/grails-views-gson/build.gradle
+++ b/grails-views-gson/build.gradle
@@ -18,6 +18,7 @@
*/
plugins {
+ id 'java-test-fixtures'
id 'org.apache.grails.buildsrc.properties'
id 'org.apache.grails.buildsrc.dependency-validator'
id 'org.apache.grails.gradle.grails-plugin'
@@ -38,6 +39,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
+ testFixturesImplementation platform(project(':grails-bom'))
api project(':grails-views-core') // Used in public API
api project(':grails-rest-transforms') // Used in public API
@@ -77,4 +79,4 @@ apply {
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/grails-extension-gradle-config.gradle')
-}
\ No newline at end of file
+}
diff --git a/grails-views-gson/src/main/groovy/grails/plugin/json/view/test/JsonRenderResult.groovy b/grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/JsonRenderResult.groovy
similarity index 100%
rename from grails-views-gson/src/main/groovy/grails/plugin/json/view/test/JsonRenderResult.groovy
rename to grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/JsonRenderResult.groovy
diff --git a/grails-views-gson/src/main/groovy/grails/plugin/json/view/test/JsonViewTest.groovy b/grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/JsonViewTest.groovy
similarity index 100%
rename from grails-views-gson/src/main/groovy/grails/plugin/json/view/test/JsonViewTest.groovy
rename to grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/JsonViewTest.groovy
diff --git a/grails-views-gson/src/main/groovy/grails/plugin/json/view/test/TestLinkGenerator.groovy b/grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/TestLinkGenerator.groovy
similarity index 100%
rename from grails-views-gson/src/main/groovy/grails/plugin/json/view/test/TestLinkGenerator.groovy
rename to grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/TestLinkGenerator.groovy
diff --git a/grails-views-gson/src/main/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy b/grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy
similarity index 100%
rename from grails-views-gson/src/main/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy
rename to grails-views-gson/src/testFixtures/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy