This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 9fa3483a10 minor refactor: move two non-running tests and try to
remove COMPAT to remove warnings on JDK25
9fa3483a10 is described below
commit 9fa3483a1017427c327dbbe7264f686949470080
Author: Paul King <[email protected]>
AuthorDate: Mon Apr 6 09:51:15 2026 +1000
minor refactor: move two non-running tests and try to remove COMPAT to
remove warnings on JDK25
---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 2 +-
.../src/test/{java => groovy}/groovy/DateTimeTest.groovy | 0
.../groovy-dateutil/src/test/{java => groovy}/groovy/DateTest.groovy | 2 --
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 4d5c30ba89..5b50ea5b8c 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -45,7 +45,7 @@ dependencies {
tasks.withType(Test).configureEach {
def fs = objects.newInstance(TestServices).fileSystemOperations
def grapeDirectory = new File(temporaryDir, '.groovy')
- def options = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en', '-Djava.locale.providers=COMPAT,SPI']
+ def options = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en', '-Duser.country=US']
jvmArgs(*options)
systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
def testdb = System.properties['groovy.testdb.props']
diff --git
a/subprojects/groovy-datetime/src/test/java/groovy/DateTimeTest.groovy
b/subprojects/groovy-datetime/src/test/groovy/groovy/DateTimeTest.groovy
similarity index 100%
rename from subprojects/groovy-datetime/src/test/java/groovy/DateTimeTest.groovy
rename to subprojects/groovy-datetime/src/test/groovy/groovy/DateTimeTest.groovy
diff --git a/subprojects/groovy-dateutil/src/test/java/groovy/DateTest.groovy
b/subprojects/groovy-dateutil/src/test/groovy/groovy/DateTest.groovy
similarity index 99%
rename from subprojects/groovy-dateutil/src/test/java/groovy/DateTest.groovy
rename to subprojects/groovy-dateutil/src/test/groovy/groovy/DateTest.groovy
index 0f34293ec1..b88b677fc3 100644
--- a/subprojects/groovy-dateutil/src/test/java/groovy/DateTest.groovy
+++ b/subprojects/groovy-dateutil/src/test/groovy/groovy/DateTest.groovy
@@ -108,9 +108,7 @@ class DateTest {
assertEquals '1970-01-01', d.format('yyyy-MM-dd')
assertEquals '01/01/1970', d.format('dd/MM/yyyy',
TimeZone.getTimeZone('GMT'))
assertEquals DateFormat.getDateInstance(DateFormat.SHORT,
locale).format(d), d.dateString
- assertEquals '01.01.70', d.dateString
assertEquals DateFormat.getTimeInstance(DateFormat.MEDIUM,
locale).format(d), d.timeString
- assertEquals '01:00:00', d.timeString
assertEquals DateFormat.getDateTimeInstance(DateFormat.SHORT,
DateFormat.MEDIUM, locale).format(d), d.dateTimeString
} finally {
Locale.default = defaultLocale
