From c797df31c6438c9e535cf0e850843090153bde02 Mon Sep 17 00:00:00 2001
From: Sterling Greene <sterling@gradle.com>
Date: Tue, 19 Nov 2024 17:29:08 -0500
Subject: [PATCH] Move time related test fixtures to :time

---
 platforms/core-runtime/launcher/build.gradle.kts                | 1 +
 platforms/core-runtime/logging/build.gradle.kts                 | 2 ++
 .../testFixtures/java}/org/gradle/internal/time/FixedClock.java | 0
 .../testFixtures/java}/org/gradle/internal/time/MockClock.java  | 0
 platforms/software/testing-base-infrastructure/build.gradle.kts | 2 +-
 subprojects/core/build.gradle.kts                               | 1 +
 6 files changed, 5 insertions(+), 1 deletion(-)
 rename {subprojects/core/src/testFixtures/groovy => platforms/core-runtime/time/src/testFixtures/java}/org/gradle/internal/time/FixedClock.java (100%)
 rename {subprojects/core/src/testFixtures/groovy => platforms/core-runtime/time/src/testFixtures/java}/org/gradle/internal/time/MockClock.java (100%)

diff --git a/platforms/core-runtime/launcher/build.gradle.kts b/platforms/core-runtime/launcher/build.gradle.kts
index b4242c9a74de5..ebc0eba4c7e03 100644
--- a/platforms/core-runtime/launcher/build.gradle.kts
+++ b/platforms/core-runtime/launcher/build.gradle.kts
@@ -68,6 +68,7 @@ dependencies {
     testImplementation(projects.internalIntegTesting)
     testImplementation(testFixtures(projects.serialization))
     testImplementation(testFixtures(projects.core))
+    testImplementation(testFixtures(projects.time))
     testImplementation(testFixtures(projects.logging))
     testImplementation(testFixtures(projects.toolingApi))
     testImplementation(testFixtures(projects.daemonProtocol))
diff --git a/platforms/core-runtime/logging/build.gradle.kts b/platforms/core-runtime/logging/build.gradle.kts
index 3f4adb05eecb1..5f68d77a681cd 100644
--- a/platforms/core-runtime/logging/build.gradle.kts
+++ b/platforms/core-runtime/logging/build.gradle.kts
@@ -45,6 +45,7 @@ dependencies {
     runtimeOnly(libs.log4jToSlf4j)
 
     testImplementation(testFixtures(projects.core))
+    testImplementation(testFixtures(projects.time))
     testImplementation(testFixtures(projects.testingJvm))
     testImplementation(libs.groovyDatetime)
     testImplementation(libs.groovyDateUtil)
@@ -56,6 +57,7 @@ dependencies {
     testFixturesImplementation(projects.baseServices)
     testFixturesImplementation(projects.enterpriseWorkers)
     testFixturesImplementation(testFixtures(projects.core))
+    testFixturesImplementation(testFixtures(projects.time))
     testFixturesImplementation(libs.slf4jApi)
 
     integTestDistributionRuntimeOnly(projects.distributionsCore)
diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/internal/time/FixedClock.java b/platforms/core-runtime/time/src/testFixtures/java/org/gradle/internal/time/FixedClock.java
similarity index 100%
rename from subprojects/core/src/testFixtures/groovy/org/gradle/internal/time/FixedClock.java
rename to platforms/core-runtime/time/src/testFixtures/java/org/gradle/internal/time/FixedClock.java
diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/internal/time/MockClock.java b/platforms/core-runtime/time/src/testFixtures/java/org/gradle/internal/time/MockClock.java
similarity index 100%
rename from subprojects/core/src/testFixtures/groovy/org/gradle/internal/time/MockClock.java
rename to platforms/core-runtime/time/src/testFixtures/java/org/gradle/internal/time/MockClock.java
diff --git a/platforms/software/testing-base-infrastructure/build.gradle.kts b/platforms/software/testing-base-infrastructure/build.gradle.kts
index 5efe18c41bbb6..f53edf04dcae0 100644
--- a/platforms/software/testing-base-infrastructure/build.gradle.kts
+++ b/platforms/software/testing-base-infrastructure/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 
     testImplementation(projects.serviceRegistryImpl)
     testImplementation(libs.commonsIo)
-    testImplementation(testFixtures(projects.core))
+    testImplementation(testFixtures(projects.time))
     testImplementation(testFixtures(projects.serialization))
 
     integTestDistributionRuntimeOnly(projects.distributionsCore)
diff --git a/subprojects/core/build.gradle.kts b/subprojects/core/build.gradle.kts
index 182580e0d447f..6bb831ba0ffed 100644
--- a/subprojects/core/build.gradle.kts
+++ b/subprojects/core/build.gradle.kts
@@ -271,6 +271,7 @@ dependencies {
     testImplementation(testFixtures(projects.diagnostics))
     testImplementation(testFixtures(projects.snapshots))
     testImplementation(testFixtures(projects.execution))
+    testImplementation(testFixtures(projects.time))
 
     integTestImplementation(projects.workers)
     integTestImplementation(projects.dependencyManagement)