From 2b603d1779481d5c53c130ce3bffa1f6b20c96ec Mon Sep 17 00:00:00 2001
From: Sam Snyder <sam@moderne.io>
Date: Mon, 9 Sep 2024 20:26:12 -0700
Subject: [PATCH] Ensure android test works on Windows (git file permission
 defaults come out differently)

---
 .../org/openrewrite/gradle/RewriteDryRunTest.kt     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/plugin/src/test/kotlin/org/openrewrite/gradle/RewriteDryRunTest.kt b/plugin/src/test/kotlin/org/openrewrite/gradle/RewriteDryRunTest.kt
index 88736e5d6..45f836e48 100644
--- a/plugin/src/test/kotlin/org/openrewrite/gradle/RewriteDryRunTest.kt
+++ b/plugin/src/test/kotlin/org/openrewrite/gradle/RewriteDryRunTest.kt
@@ -26,6 +26,7 @@ import org.junit.jupiter.params.provider.ValueSource
 import org.openrewrite.Issue
 import java.io.File
 
+@Suppress("GroovyUnusedAssignment")
 class RewriteDryRunTest : RewritePluginTest {
     @TempDir
     lateinit var projectDir: File
@@ -244,7 +245,7 @@ class RewriteDryRunTest : RewritePluginTest {
     fun `rewriteDryRun is compatible with AGP version 4 and over`(pluginVersion: String) {
         if (lessThanGradle6_1()) {
             // @DisabledIf doesn't seem to work with @ParameterizedTest
-            return;
+            return
         }
         gradleProject(projectDir) {
             buildGradle(
@@ -289,19 +290,11 @@ class RewriteDryRunTest : RewritePluginTest {
         val patchFile = File(projectDir, "build/reports/rewrite/rewrite.patch")
         assertThat(patchFile).exists()
         assertThat(patchFile.readText().trim())
-            .isEqualTo(
+            .containsOnlyOnce(
                 """
-                diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java
-                index d8a9002..7e3e2a0 100644
-                --- a/src/main/java/HelloWorld.java
-                +++ b/src/main/java/HelloWorld.java
-                @@ -1,5 +1,5 @@ org.openrewrite.java.OrderImports
                 -import java.util.List;
                  import java.util.Collections;
                 +import java.util.List;
-                 
-                 class HelloWorld {
-                     HelloWorld() {
                 """.trimIndent()
             )