Merge pull request #362 from takahirom/remove-unneeded-cache-invalida…

…tion Remove unneeded cache invalidation
takahirom · May 17, 2024 · fbf270d · fbf270d
2 parents 53bc135 + 679b6b8
commit fbf270d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 35 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
@@ -54,14 +54,12 @@ class RoborazziGradleProjectTest {
   }
 
   @Test
-  fun recordWhenRemovedOutput() {
+  fun whenRecordAndRemovedOutputAndRecordThenSkipAndRestoreTheImages() {
     RoborazziGradleProject(testProjectDir).apply {
       record()
       removeRoborazziOutputDir()
-      // should not be skipped even if tests and sources are not changed
-      // when output directory is removed
       val output = record().output
-      assertNotSkipped(output)
+      assertSkipped(output)
 
       checkResultsSummaryFileExists()
       checkRecordedFileExists("$screenshotAndName.testCapture.png")
@@ -92,10 +90,6 @@ class RoborazziGradleProjectTest {
   fun recordWhenRunTwice() {
     RoborazziGradleProject(testProjectDir).apply {
       record()
-      // files are changed so should not be skipped
-      val output1 = record().output
-      assertNotSkipped(output1)
-      // files are not changed so should be skipped
       val output2 = record().output
       assertSkipped(output2)
 
@@ -112,10 +106,6 @@ class RoborazziGradleProjectTest {
       val customDirFromGradle = "src/screenshots/roborazzi_customdir_from_gradle"
       appBuildFile.customOutputDirPath = customDirFromGradle
       record()
-      // files are changed so should not be skipped
-      val output1 = record().output
-      assertNotSkipped(output1)
-      // files are not changed so should be skipped
       val output2 = record().output
       assertSkipped(output2)
 

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
@@ -300,23 +300,6 @@ abstract class RoborazziPlugin : Plugin<Project> {
       testTaskProvider
         .configureEach { test ->
           val resultsDir = resultDirFileProperty.get().asFile
-          if (restoreOutputDirRoborazziTaskProvider.isPresent) {
-            test.inputs.dir(restoreOutputDirRoborazziTaskProvider.map {
-              if (!it.outputDir.get().asFile.exists()) {
-                it.outputDir.get().asFile.mkdirs()
-              }
-              test.infoln("Roborazzi: Set input dir ${it.outputDir.get()} to test task")
-              it.outputDir
-            })
-          } else {
-            test.inputs.dir(outputDir.map {
-              if (!it.asFile.exists()) {
-                it.asFile.mkdirs()
-              }
-              test.infoln("Roborazzi: Set input dir $it to test task")
-              it
-            })
-          }
           test.outputs.dir(intermediateDirForEachVariant.map {
             test.infoln("Roborazzi: Set output dir $it to test task")
             it
@@ -343,12 +326,6 @@ abstract class RoborazziPlugin : Plugin<Project> {
               "roborazziProperties" to roborazziProperties,
             )
           )
-          test.outputs.upToDateWhen {
-            val doesRoborazziRun = doesRoborazziRunProvider.get()
-            val inputDirEmpty = outputDir.get().asFile.listFiles()?.isEmpty() ?: true
-            test.infoln("Roborazzi: test.outputs.upToDateWhen !(doesRoborazziRun:$doesRoborazziRun && inputDirEmpty:$inputDirEmpty)")
-            !(doesRoborazziRun && inputDirEmpty)
-          }
           test.doFirst {
             val doesRoborazziRun =
               doesRoborazziRunProvider.get()