chore: rewrite tests to use selfie where possible

Author: simschla

app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIModeTest.java

@@ -34,7 +34,7 @@ void applyModeChangesFilesAndExitsWithCode0() throws IOException {
                 .withStep(GoogleJavaFormat.class)
                 .run();
 
-        assertFile("Java.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test");
+        selfie().expectResource("Java.java").toMatchDisk();
         assertThat(result.exitCode()).isEqualTo(0);
     }
 
@@ -48,7 +48,7 @@ void checkModeLeavesFilesUnchangedAndExitsWithCode1() throws IOException {
                 .withStep(GoogleJavaFormat.class)
                 .runAndFail();
 
-        assertFile("Java.java").sameAsResource("java/googlejavaformat/JavaCodeUnformatted.test");
+        selfie().expectResource("Java.java").toMatchDisk();
         assertThat(result.exitCode()).isEqualTo(1);
     }
 }

app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatNativeProcessTest.java

@@ -18,7 +18,4 @@
 import com.diffplug.spotless.tag.CliNativeTest;
 
 @CliNativeTest
-public class GoogleJavaFormatNativeProcessTest extends GoogleJavaFormatTest {
-
-    // TODO include the correct google-java-format class to be available in native
-}
+public class GoogleJavaFormatNativeProcessTest extends GoogleJavaFormatTest {}

app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatTest.java

@@ -33,6 +33,6 @@ void formattingWithGoogleJavaFormatWorks() throws IOException {
                 .withStep(GoogleJavaFormat.class)
                 .run();
 
-        assertFile("Java.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test");
+        selfie().expectResource("Java.java").toMatchDisk();
     }
 }

app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderTest.java

@@ -47,7 +47,9 @@ void assertHeaderIsApplied() {
                 .withOption("--header", "/* License */")
                 .run();
 
-        assertFile("TestFile.java").hasContent("/* License */\npublic class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("""
+/* License */
+public class TestFile {}""");
     }
 
     @Test
@@ -61,7 +63,9 @@ void assertHeaderFileIsApplied() {
                 .withOption("--header-file", "header.txt")
                 .run();
 
-        assertFile("TestFile.java").hasContent("/* License */\npublic class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("""
+/* License */
+public class TestFile {}""");
     }
 
     @Test
@@ -75,7 +79,10 @@ void assertDelimiterIsApplied() {
                 .withOption("--delimiter", "\\/\\* keep me")
                 .run();
 
-        assertFile("TestFile.java").hasContent("/* License */\n/* keep me */\npublic class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("""
+/* License */
+/* keep me */
+public class TestFile {}""");
     }
 
     @Test
@@ -120,7 +127,11 @@ void assertSkipLinesMatchingIsApplied() {
                 .withOption("--skip-lines-matching", ".*skip me.*")
                 .run();
 
-        assertFile("TestFile.java").hasContent("/* skip me */\n/* License */\npublic class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("""
+/* skip me */
+/* License */
+public class TestFile {}
+""");
     }
 
     @Test
@@ -134,7 +145,9 @@ void assertPreserveModeIsApplied() {
                 .withOption("--year-mode", LicenseHeaderStep.YearMode.PRESERVE.toString())
                 .run();
 
-        assertFile("TestFile.java").hasContent("/* License (c) 2022 */\npublic class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("""
+/* License (c) 2022 */
+public class TestFile {}""");
     }
 
     @Test
@@ -148,7 +161,9 @@ void assertContentPatternIsAppliedIfMatching() {
                 .withOption("--content-pattern", ".*TestFile.*")
                 .run();
 
-        assertFile("TestFile.java").hasContent("/* License */\npublic class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("""
+/* License */
+public class TestFile {}""");
     }
 
     @Test
@@ -162,6 +177,6 @@ void assertContentPatternIsNotAppliedIfNotMatching() {
                 .withOption("--content-pattern", ".*NonExistent.*")
                 .run();
 
-        assertFile("TestFile.java").hasContent("public class TestFile {}");
+        selfie().expectResource("TestFile.java").toBe("public class TestFile {}");
     }
 }

app/src/test/java/com/diffplug/spotless/cli/steps/PrettierTest.java

@@ -37,7 +37,7 @@ void itRunsPrettierForTsFilesWithOptions() throws IOException {
                 .withOption("--prettier-config-option", "parser=typescript")
                 .run();
 
-        assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+        selfie().expectResource("test.ts").toMatchDisk();
     }
 
     @Test
@@ -51,6 +51,6 @@ void itRunsPrettierForTsFilesWithOptionFile() throws Exception {
                 .withOption("--prettier-config-path", ".prettierrc.yml")
                 .run();
 
-        assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+        selfie().expectResource("test.ts").toMatchDisk();
     }
 }

app/src/test/resources/com/diffplug/spotless/cli/SpotlessCLIModeTest.ss

@@ -0,0 +1,31 @@
+╔═ applyModeChangesFilesAndExitsWithCode0 ═╗
+import mylib.UsedA;
+import mylib.UsedB;
+
+public class Java {
+  /** Some javadoc. */
+  public static void main(String[] args) {
+    System.out.println(
+        "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+    UsedB.someMethod();
+    UsedA.someMethod();
+  }
+}
+
+╔═ checkModeLeavesFilesUnchangedAndExitsWithCode1 ═╗
+
+import mylib.Unused;
+import mylib.UsedB;
+import mylib.UsedA;
+
+public class Java {
+/**
+ * Some javadoc.
+ */
+public static void main(String[] args) {
+System.out.println("A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+UsedB.someMethod();
+UsedA.someMethod();
+}
+}
+╔═ [end of file] ═╗

app/src/test/resources/com/diffplug/spotless/cli/steps/GoogleJavaFormatTest.ss

@@ -0,0 +1,15 @@
+╔═ formattingWithGoogleJavaFormatWorks ═╗
+import mylib.UsedA;
+import mylib.UsedB;
+
+public class Java {
+  /** Some javadoc. */
+  public static void main(String[] args) {
+    System.out.println(
+        "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length.");
+    UsedB.someMethod();
+    UsedA.someMethod();
+  }
+}
+
+╔═ [end of file] ═╗

app/src/test/resources/com/diffplug/spotless/cli/steps/PrettierTest.ss

@@ -0,0 +1,41 @@
+╔═ itRunsPrettierForTsFilesWithOptionFile ═╗
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
+  extends AbstractController
+  implements
+    DisposeAware,
+    CallbackAware
+{
+  public myValue: string[];
+
+  constructor(
+    private myService: Service,
+    name: string,
+    private field: any
+  ) {
+    super(name);
+  }
+
+  //...
+}
+
+╔═ itRunsPrettierForTsFilesWithOptions ═╗
+export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary
+  extends AbstractController
+  implements
+    DisposeAware,
+    CallbackAware
+{
+  public myValue: string[];
+
+  constructor(
+    private myService: Service,
+    name: string,
+    private field: any
+  ) {
+    super(name);
+  }
+
+  //...
+}
+
+╔═ [end of file] ═╗