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/02/25 14:23:31 UTC
(grails-core) 02/02: refactor: rename to `grails-testing-support-dbcleanup-*`
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch database-cleanup-feature-feedback
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 3dfc3d6544a147d83c41a3c24dcb1b6cadc456a1
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Wed Feb 25 15:22:41 2026 +0100
refactor: rename to `grails-testing-support-dbcleanup-*`
---
gradle/publish-root-config.gradle | 6 +++---
grails-doc/src/en/guide/testing/integrationTesting.adoc | 8 ++++----
grails-test-examples/database-cleanup/build.gradle | 2 +-
.../README.md | 6 +++---
.../build.gradle | 0
.../grails/testing/cleanup/core/ApplicationContextResolver.groovy | 0
.../org/apache/grails/testing/cleanup/core/DatabaseCleaner.groovy | 0
.../org/apache/grails/testing/cleanup/core/DatabaseCleanup.groovy | 0
.../grails/testing/cleanup/core/DatabaseCleanupContext.groovy | 4 ++--
.../grails/testing/cleanup/core/DatabaseCleanupExtension.groovy | 0
.../grails/testing/cleanup/core/DatabaseCleanupInterceptor.groovy | 0
.../grails/testing/cleanup/core/DatabaseCleanupStats.groovy | 0
.../grails/testing/cleanup/core/DatasourceCleanupMapping.groovy | 0
.../testing/cleanup/core/DefaultApplicationContextResolver.groovy | 0
.../grails/testing/cleanup/core/TestContextHolderListener.groovy | 0
.../org.spockframework.runtime.extension.IGlobalExtension | 0
.../src/main/resources/META-INF/spring.factories | 0
.../grails/testing/cleanup/core/DatabaseCleanupContextSpec.groovy | 0
.../testing/cleanup/core/DatabaseCleanupExtensionSpec.groovy | 0
.../testing/cleanup/core/DatabaseCleanupInterceptorSpec.groovy | 0
.../grails/testing/cleanup/core/DatabaseCleanupStatsSpec.groovy | 0
.../testing/cleanup/core/DatasourceCleanupMappingSpec.groovy | 0
.../cleanup/core/DefaultApplicationContextResolverSpec.groovy | 0
.../README.md | 2 +-
.../build.gradle | 2 +-
.../org/apache/grails/testing/cleanup/h2/H2DatabaseCleaner.groovy | 0
.../grails/testing/cleanup/h2/H2DatabaseCleanupHelper.groovy | 0
.../org.apache.grails.testing.cleanup.core.DatabaseCleaner | 0
.../apache/grails/testing/cleanup/h2/H2DatabaseCleanerSpec.groovy | 0
.../grails/testing/cleanup/h2/H2DatabaseCleanupHelperSpec.groovy | 0
.../README.md | 2 +-
.../build.gradle | 2 +-
.../testing/cleanup/postgresql/PostgresDatabaseCleaner.groovy | 0
.../cleanup/postgresql/PostgresDatabaseCleanupHelper.groovy | 0
.../testing/cleanup/postgresql/PostgresContainerHolder.groovy | 0
.../postgresql/PostgresDatabaseCleanerFunctionalSpec.groovy | 0
.../testing/cleanup/postgresql/PostgresDatabaseCleanerSpec.groovy | 0
.../cleanup/postgresql/PostgresDatabaseCleanupHelperSpec.groovy | 0
settings.gradle | 6 +++---
39 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/gradle/publish-root-config.gradle b/gradle/publish-root-config.gradle
index b3eeb7fd4d..1b56b0ccb8 100644
--- a/gradle/publish-root-config.gradle
+++ b/gradle/publish-root-config.gradle
@@ -76,9 +76,9 @@ def publishedProjects = [
'grails-taglib',
'grails-test-core',
'grails-testing-support-core',
- 'grails-testing-support-cleanup-core',
- 'grails-testing-support-cleanup-h2',
- 'grails-testing-support-cleanup-postgresql',
+ 'grails-testing-support-dbcleanup-core',
+ 'grails-testing-support-dbcleanup-h2',
+ 'grails-testing-support-dbcleanup-postgresql',
'grails-testing-support-mongodb',
'grails-testing-support-views-gson',
'grails-testing-support-web',
diff --git a/grails-doc/src/en/guide/testing/integrationTesting.adoc b/grails-doc/src/en/guide/testing/integrationTesting.adoc
index 732f7be74e..d080dfda1e 100644
--- a/grails-doc/src/en/guide/testing/integrationTesting.adoc
+++ b/grails-doc/src/en/guide/testing/integrationTesting.adoc
@@ -154,12 +154,12 @@ Database cleanup is automatically discovered and applied based on your datasourc
====== H2 Database
-To use `@DatabaseCleanup` with H2 databases, add the `grails-testing-support-cleanup-h2` dependency:
+To use `@DatabaseCleanup` with H2 databases, add the `grails-testing-support-dbcleanup-h2` dependency:
[source,groovy]
----
dependencies {
- integrationTestImplementation 'org.apache.grails:grails-testing-support-cleanup-h2'
+ integrationTestImplementation 'org.apache.grails:grails-testing-support-dbcleanup-h2'
}
----
@@ -167,12 +167,12 @@ This module will clean up schema the specified schema by default, otherwise it w
====== PostgreSQL
-To use `@DatabaseCleanup` with PostgreSQL databases, add the `grails-testing-support-cleanup-postgresql` dependency:
+To use `@DatabaseCleanup` with PostgreSQL databases, add the `grails-testing-support-dbcleanup-postgresql` dependency:
[source,groovy]
----
dependencies {
- integrationTestImplementation 'org.apache.grails:grails-testing-support-cleanup-postgresql'
+ integrationTestImplementation 'org.apache.grails:grails-testing-support-dbcleanup-postgresql'
}
----
diff --git a/grails-test-examples/database-cleanup/build.gradle b/grails-test-examples/database-cleanup/build.gradle
index e88e4f8d3a..08324af9a4 100644
--- a/grails-test-examples/database-cleanup/build.gradle
+++ b/grails-test-examples/database-cleanup/build.gradle
@@ -44,7 +44,7 @@ dependencies {
runtimeOnly 'com.zaxxer:HikariCP'
integrationTestImplementation 'org.apache.grails.testing:grails-testing-support-core'
- integrationTestImplementation project(':grails-testing-support-cleanup-h2')
+ integrationTestImplementation project(':grails-testing-support-dbcleanup-h2')
}
apply {
diff --git a/grails-testing-support-cleanup-core/README.md b/grails-testing-support-dbcleanup-core/README.md
similarity index 94%
rename from grails-testing-support-cleanup-core/README.md
rename to grails-testing-support-dbcleanup-core/README.md
index 140a24e265..db1b6157c9 100644
--- a/grails-testing-support-cleanup-core/README.md
+++ b/grails-testing-support-dbcleanup-core/README.md
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-## grails-testing-support-cleanup-core
+## grails-testing-support-dbcleanup-core
Provides the core database cleanup testing support for Grails integration tests, including the `@DatabaseCleanup` annotation and the `DatabaseCleaner` SPI.
@@ -22,7 +22,7 @@ Provides the core database cleanup testing support for Grails integration tests,
Database cleanup is automatically discovered and applied based on your datasource configuration. The following database implementations are available:
-#### H2 Database (`grails-testing-support-cleanup-h2`)
+#### H2 Database (`grails-testing-support-dbcleanup-h2`)
**Supported Driver**: H2 Database Engine
@@ -41,7 +41,7 @@ jdbc:h2:mem:testdb
jdbc:h2:file:/tmp/testdb
```
-#### PostgreSQL (`grails-testing-support-cleanup-postgresql`)
+#### PostgreSQL (`grails-testing-support-dbcleanup-postgresql`)
**Supported Driver**: PostgreSQL JDBC Driver
diff --git a/grails-testing-support-cleanup-core/build.gradle b/grails-testing-support-dbcleanup-core/build.gradle
similarity index 100%
rename from grails-testing-support-cleanup-core/build.gradle
rename to grails-testing-support-dbcleanup-core/build.gradle
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/ApplicationContextResolver.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/ApplicationContextResolver.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/ApplicationContextResolver.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/ApplicationContextResolver.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleaner.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleaner.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleaner.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleaner.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanup.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanup.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanup.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanup.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContext.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContext.groovy
similarity index 98%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContext.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContext.groovy
index 10fdba73dd..8b276dbb36 100644
--- a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContext.groovy
+++ b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContext.groovy
@@ -129,7 +129,7 @@ class DatabaseCleanupContext {
throw new IllegalStateException(
'No DatabaseCleaner implementation found that supports ' +
"datasource '$beanName'. Ensure that a database-specific " +
- 'cleanup library (e.g., grails-testing-support-cleanup-h2) ' +
+ 'cleanup library (e.g., grails-testing-support-dbcleanup-h2) ' +
'is on the classpath for each database type used in your tests. ' +
"Available cleaners: ${cleanersByType.values()*.databaseType()}"
)
@@ -179,7 +179,7 @@ class DatabaseCleanupContext {
throw new IllegalStateException(
"No DatabaseCleaner implementation found that supports datasource '$dsName'. " +
'Ensure that a database-specific cleanup library ' +
- '(e.g., grails-testing-support-cleanup-h2) is on the classpath, ' +
+ '(e.g., grails-testing-support-dbcleanup-h2) is on the classpath, ' +
"or specify the database type explicitly: '$dsName:type'. " +
"Available cleaners: ${cleanersByType.values()*.databaseType()}"
)
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtension.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtension.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtension.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtension.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptor.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptor.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptor.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptor.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStats.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStats.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStats.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStats.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMapping.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMapping.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMapping.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMapping.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolver.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolver.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolver.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolver.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/TestContextHolderListener.groovy b/grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/TestContextHolderListener.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/TestContextHolderListener.groovy
rename to grails-testing-support-dbcleanup-core/src/main/groovy/org/apache/grails/testing/cleanup/core/TestContextHolderListener.groovy
diff --git a/grails-testing-support-cleanup-core/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/grails-testing-support-dbcleanup-core/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension
rename to grails-testing-support-dbcleanup-core/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension
diff --git a/grails-testing-support-cleanup-core/src/main/resources/META-INF/spring.factories b/grails-testing-support-dbcleanup-core/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from grails-testing-support-cleanup-core/src/main/resources/META-INF/spring.factories
rename to grails-testing-support-dbcleanup-core/src/main/resources/META-INF/spring.factories
diff --git a/grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContextSpec.groovy b/grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContextSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContextSpec.groovy
rename to grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupContextSpec.groovy
diff --git a/grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtensionSpec.groovy b/grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtensionSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtensionSpec.groovy
rename to grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupExtensionSpec.groovy
diff --git a/grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptorSpec.groovy b/grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptorSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptorSpec.groovy
rename to grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupInterceptorSpec.groovy
diff --git a/grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStatsSpec.groovy b/grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStatsSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStatsSpec.groovy
rename to grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatabaseCleanupStatsSpec.groovy
diff --git a/grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMappingSpec.groovy b/grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMappingSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMappingSpec.groovy
rename to grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DatasourceCleanupMappingSpec.groovy
diff --git a/grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolverSpec.groovy b/grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolverSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolverSpec.groovy
rename to grails-testing-support-dbcleanup-core/src/test/groovy/org/apache/grails/testing/cleanup/core/DefaultApplicationContextResolverSpec.groovy
diff --git a/grails-testing-support-cleanup-h2/README.md b/grails-testing-support-dbcleanup-h2/README.md
similarity index 95%
rename from grails-testing-support-cleanup-h2/README.md
rename to grails-testing-support-dbcleanup-h2/README.md
index d36c7a7bfd..b964fb5cff 100644
--- a/grails-testing-support-cleanup-h2/README.md
+++ b/grails-testing-support-dbcleanup-h2/README.md
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-## grails-testing-support-cleanup-h2
+## grails-testing-support-dbcleanup-h2
Provides the H2 database cleanup implementation for the `DatabaseCleaner` SPI, enabling automatic table truncation in H2-backed integration tests.
diff --git a/grails-testing-support-cleanup-h2/build.gradle b/grails-testing-support-dbcleanup-h2/build.gradle
similarity index 97%
rename from grails-testing-support-cleanup-h2/build.gradle
rename to grails-testing-support-dbcleanup-h2/build.gradle
index e2d2e91312..2ca7d1db70 100644
--- a/grails-testing-support-cleanup-h2/build.gradle
+++ b/grails-testing-support-dbcleanup-h2/build.gradle
@@ -39,7 +39,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
- api project(':grails-testing-support-cleanup-core')
+ api project(':grails-testing-support-dbcleanup-core')
implementation 'org.springframework:spring-context'
implementation 'org.slf4j:slf4j-api'
implementation 'org.apache.groovy:groovy-sql'
diff --git a/grails-testing-support-cleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleaner.groovy b/grails-testing-support-dbcleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleaner.groovy
similarity index 100%
rename from grails-testing-support-cleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleaner.groovy
rename to grails-testing-support-dbcleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleaner.groovy
diff --git a/grails-testing-support-cleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelper.groovy b/grails-testing-support-dbcleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelper.groovy
similarity index 100%
rename from grails-testing-support-cleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelper.groovy
rename to grails-testing-support-dbcleanup-h2/src/main/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelper.groovy
diff --git a/grails-testing-support-cleanup-h2/src/main/resources/META-INF/services/org.apache.grails.testing.cleanup.core.DatabaseCleaner b/grails-testing-support-dbcleanup-h2/src/main/resources/META-INF/services/org.apache.grails.testing.cleanup.core.DatabaseCleaner
similarity index 100%
rename from grails-testing-support-cleanup-h2/src/main/resources/META-INF/services/org.apache.grails.testing.cleanup.core.DatabaseCleaner
rename to grails-testing-support-dbcleanup-h2/src/main/resources/META-INF/services/org.apache.grails.testing.cleanup.core.DatabaseCleaner
diff --git a/grails-testing-support-cleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanerSpec.groovy b/grails-testing-support-dbcleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanerSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanerSpec.groovy
rename to grails-testing-support-dbcleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanerSpec.groovy
diff --git a/grails-testing-support-cleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelperSpec.groovy b/grails-testing-support-dbcleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelperSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelperSpec.groovy
rename to grails-testing-support-dbcleanup-h2/src/test/groovy/org/apache/grails/testing/cleanup/h2/H2DatabaseCleanupHelperSpec.groovy
diff --git a/grails-testing-support-cleanup-postgresql/README.md b/grails-testing-support-dbcleanup-postgresql/README.md
similarity index 95%
rename from grails-testing-support-cleanup-postgresql/README.md
rename to grails-testing-support-dbcleanup-postgresql/README.md
index ef44ef9499..fdeec12b64 100644
--- a/grails-testing-support-cleanup-postgresql/README.md
+++ b/grails-testing-support-dbcleanup-postgresql/README.md
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-## grails-testing-support-cleanup-postgresql
+## grails-testing-support-dbcleanup-postgresql
Provides the PostgreSQL database cleanup implementation for the `DatabaseCleaner` SPI, enabling automatic table truncation in PostgreSQL-backed integration tests.
diff --git a/grails-testing-support-cleanup-postgresql/build.gradle b/grails-testing-support-dbcleanup-postgresql/build.gradle
similarity index 97%
rename from grails-testing-support-cleanup-postgresql/build.gradle
rename to grails-testing-support-dbcleanup-postgresql/build.gradle
index 15b977b2c1..0dc8365e19 100644
--- a/grails-testing-support-cleanup-postgresql/build.gradle
+++ b/grails-testing-support-dbcleanup-postgresql/build.gradle
@@ -38,7 +38,7 @@ ext {
dependencies {
implementation platform(project(':grails-bom'))
- api project(':grails-testing-support-cleanup-core')
+ api project(':grails-testing-support-dbcleanup-core')
implementation 'org.springframework:spring-context'
implementation 'org.slf4j:slf4j-api'
implementation 'org.apache.groovy:groovy-sql'
diff --git a/grails-testing-support-cleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleaner.groovy b/grails-testing-support-dbcleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleaner.groovy
similarity index 100%
rename from grails-testing-support-cleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleaner.groovy
rename to grails-testing-support-dbcleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleaner.groovy
diff --git a/grails-testing-support-cleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelper.groovy b/grails-testing-support-dbcleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelper.groovy
similarity index 100%
rename from grails-testing-support-cleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelper.groovy
rename to grails-testing-support-dbcleanup-postgresql/src/main/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelper.groovy
diff --git a/grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresContainerHolder.groovy b/grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresContainerHolder.groovy
similarity index 100%
rename from grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresContainerHolder.groovy
rename to grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresContainerHolder.groovy
diff --git a/grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerFunctionalSpec.groovy b/grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerFunctionalSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerFunctionalSpec.groovy
rename to grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerFunctionalSpec.groovy
diff --git a/grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerSpec.groovy b/grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerSpec.groovy
rename to grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanerSpec.groovy
diff --git a/grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelperSpec.groovy b/grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelperSpec.groovy
similarity index 100%
rename from grails-testing-support-cleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelperSpec.groovy
rename to grails-testing-support-dbcleanup-postgresql/src/test/groovy/org/apache/grails/testing/cleanup/postgresql/PostgresDatabaseCleanupHelperSpec.groovy
diff --git a/settings.gradle b/settings.gradle
index 1357cc651b..ee920e9ec2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -171,9 +171,9 @@ include(
// Testing Support
'grails-testing-support-datamapping',
- 'grails-testing-support-cleanup-core',
- 'grails-testing-support-cleanup-h2',
- 'grails-testing-support-cleanup-postgresql',
+ 'grails-testing-support-dbcleanup-core',
+ 'grails-testing-support-dbcleanup-h2',
+ 'grails-testing-support-dbcleanup-postgresql',
// Test Report
'grails-data-test-report',