Fix order of copy

takahirom · Nov 4, 2024 · acfc5d5 · acfc5d5
1 parent a42223d
commit acfc5d5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/...ugin/src/integrationTest/java/io/github/takahirom/roborazzi/RoborazziGradleProjectTest.kt b/...ugin/src/integrationTest/java/io/github/takahirom/roborazzi/RoborazziGradleProjectTest.kt
@@ -446,7 +446,7 @@ class RoborazziGradleProjectTest {
   }
 
   @Test
-  fun ifWeUseDeleteOldScreenshotsTheScreenshotsShouldNotExitOldScreenshot() {
+  fun ifWeUseDeleteOldScreenshotsTheOldScreenshotsShouldNotExit() {
     RoborazziGradleRootProject(testProjectDir).appModule.apply {
       recordWithDeleteOldScreenshots()
       removeTests()

diff --git a/...ld/roborazzi-gradle-plugin/src/main/java/io/github/takahirom/roborazzi/RoborazziPlugin.kt b/...ld/roborazzi-gradle-plugin/src/main/java/io/github/takahirom/roborazzi/RoborazziPlugin.kt
@@ -396,17 +396,6 @@ abstract class RoborazziPlugin : Plugin<Project> {
                 // Run only root suite
                 return
               }
-              // Copy all files from outputDir to intermediateDir
-              // so that we can use Gradle's output caching
-              test.infoln("Roborazzi: test.doLast Copy files from ${outputDir.get()} to ${intermediateDir.get()}")
-              // outputDir.get().asFileTree.forEach {
-              //   println("Copy file ${finalizeTask.absolutePath} to ${intermediateDir.get()}")
-              // }
-              outputDir.get().asFile.mkdirs()
-              outputDir.get().asFile.copyRecursively(
-                target = intermediateDir.get().asFile,
-                overwrite = true
-              )
 
               val results: List<CaptureResult> = resultDirFileTree.get().mapNotNull {
                 if (it.name.endsWith(".json")) {
@@ -432,6 +421,18 @@ abstract class RoborazziPlugin : Plugin<Project> {
                 outputDir = outputDir,
                 roborazziResults = roborazziResults,
               )
+
+              // Copy all files from outputDir to intermediateDir
+              // so that we can use Gradle's output caching
+              test.infoln("Roborazzi: test.doLast Copy files from ${outputDir.get()} to ${intermediateDir.get()}")
+              // outputDir.get().asFileTree.forEach {
+              //   println("Copy file ${finalizeTask.absolutePath} to ${intermediateDir.get()}")
+              // }
+              outputDir.get().asFile.mkdirs()
+              outputDir.get().asFile.copyRecursively(
+                target = intermediateDir.get().asFile,
+                overwrite = true
+              )
             }
 
             override fun beforeTest(testDescriptor: TestDescriptor?) {