From 23a1d1b01073966e7df08880db2b8b4e9e5b5acf Mon Sep 17 00:00:00 2001 From: Matthias Balke Date: Thu, 22 Feb 2018 20:03:23 +0100 Subject: [PATCH] use assertFile instead of assertThat.isEqualTo for all tests --- .../maven/generic/LicenseHeaderTest.java | 8 +++----- .../spotless/maven/generic/ReplaceRegexTest.java | 8 +++----- .../spotless/maven/generic/ReplaceTest.java | 8 +++----- .../generic/TrimTrailingWhitespaceTest.java | 8 +++----- .../maven/java/EclipseFormatStepTest.java | 5 +++-- .../maven/java/GoogleJavaFormatTest.java | 13 ++++++++----- .../spotless/maven/java/ImportOrderTest.java | 5 +++-- .../maven/java/RemoveUnusedImportsStepTest.java | 5 +++-- .../spotless/maven/scala/ScalafmtTest.java | 16 ++++++++++------ .../resources/lineEndings/JavaCode-UNIX.test | 5 ----- .../resources/lineEndings/JavaCode-WINDOWS.test | 5 ----- 11 files changed, 39 insertions(+), 47 deletions(-) delete mode 100644 testlib/src/main/resources/lineEndings/JavaCode-UNIX.test delete mode 100644 testlib/src/main/resources/lineEndings/JavaCode-WINDOWS.test diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderTest.java index 728829c237..957bbd2e5c 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/LicenseHeaderTest.java @@ -15,8 +15,6 @@ */ package com.diffplug.spotless.maven.generic; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import com.diffplug.spotless.maven.MavenIntegrationTest; @@ -82,9 +80,9 @@ public void fromContentFormat() throws Exception { } private void runTest() throws Exception { - setFile("src/main/java/test.java").toResource("license/MissingLicense.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("license/MissingLicense.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - String actual = read("src/main/java/test.java"); - assertThat(actual).isEqualTo(getTestResource("license/HasLicense.test")); + assertFile(path).sameAsResource("license/HasLicense.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceRegexTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceRegexTest.java index 91f4a8f5f2..c408e9e892 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceRegexTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceRegexTest.java @@ -15,8 +15,6 @@ */ package com.diffplug.spotless.maven.generic; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import com.diffplug.spotless.maven.MavenIntegrationTest; @@ -35,9 +33,9 @@ public void fromContent() throws Exception { } private void runTest() throws Exception { - setFile("src/main/java/test.java").toResource("replace/JavaCodeUnformatted.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("replace/JavaCodeUnformatted.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - String actual = read("src/main/java/test.java"); - assertThat(actual).isEqualTo(getTestResource("replace/JavaCodeFormatted.test")); + assertFile(path).sameAsResource("replace/JavaCodeFormatted.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceTest.java index 4444919ae6..78e2d30668 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/ReplaceTest.java @@ -15,8 +15,6 @@ */ package com.diffplug.spotless.maven.generic; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import com.diffplug.spotless.maven.MavenIntegrationTest; @@ -35,9 +33,9 @@ public void fromContent() throws Exception { } private void runTest() throws Exception { - setFile("src/main/java/test.java").toResource("replace/JavaCodeUnformatted.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("replace/JavaCodeUnformatted.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - String actual = read("src/main/java/test.java"); - assertThat(actual).isEqualTo(getTestResource("replace/JavaCodeFormatted.test")); + assertFile(path).sameAsResource("replace/JavaCodeFormatted.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/TrimTrailingWhitespaceTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/TrimTrailingWhitespaceTest.java index 16800f40d8..28dd8530af 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/TrimTrailingWhitespaceTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/TrimTrailingWhitespaceTest.java @@ -15,8 +15,6 @@ */ package com.diffplug.spotless.maven.generic; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import com.diffplug.spotless.maven.MavenIntegrationTest; @@ -31,10 +29,10 @@ public void fromContentToTabs() throws Exception { } private void runTest() throws Exception { - setFile("src/main/java/test.java").toResource("trailingWhitespace/JavaCodeUnformated.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("trailingWhitespace/JavaCodeUnformated.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - String actual = read("src/main/java/test.java"); - assertThat(actual).isEqualTo(getTestResource("trailingWhitespace/JavaCodeFormated.test")); + assertFile(path).sameAsResource("trailingWhitespace/JavaCodeFormated.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/EclipseFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/EclipseFormatStepTest.java index f97dc2d664..af9f06e15d 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/EclipseFormatStepTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/EclipseFormatStepTest.java @@ -30,8 +30,9 @@ public void testEclipse() throws Exception { ""); setFile("formatter.xml").toResource("java/eclipse/formatter.xml"); - setFile("src/main/java/test.java").toResource("java/eclipse/JavaCodeUnformatted.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("java/eclipse/JavaCodeUnformatted.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/java/test.java").sameAsResource("java/eclipse/JavaCodeFormatted.test"); + assertFile(path).sameAsResource("java/eclipse/JavaCodeFormatted.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java index e32fde7e00..137cf4c7fc 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java @@ -27,9 +27,7 @@ public void specificVersionDefaultStyle() throws Exception { " 1.2", ""); - setFile("src/main/java/test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test"); - mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/java/test.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test"); + runTest("java/googlejavaformat/JavaCodeFormatted.test"); } @Test @@ -40,8 +38,13 @@ public void specificVersionSpecificStyle() throws Exception { " ", ""); - setFile("src/main/java/test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test"); + runTest("java/googlejavaformat/JavaCodeFormattedAOSP.test"); + } + + private void runTest(String targetResource) throws Exception { + String path = "src/main/java/test.java"; + setFile(path).toResource("java/googlejavaformat/JavaCodeUnformatted.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/java/test.java").sameAsResource("java/googlejavaformat/JavaCodeFormattedAOSP.test"); + assertFile(path).sameAsResource(targetResource); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/ImportOrderTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/ImportOrderTest.java index 99a5bb219d..aa9db93793 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/ImportOrderTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/ImportOrderTest.java @@ -40,8 +40,9 @@ public void order() throws Exception { } private void runTest() throws Exception { - setFile("src/main/java/test.java").toResource("java/importsorter/JavaCodeUnsortedImports.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("java/importsorter/JavaCodeUnsortedImports.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/java/test.java").sameAsResource("java/importsorter/JavaCodeSortedImports.test"); + assertFile(path).sameAsResource("java/importsorter/JavaCodeSortedImports.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java index 9ef2134582..4cad34ef90 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java @@ -25,8 +25,9 @@ public class RemoveUnusedImportsStepTest extends MavenIntegrationTest { public void testRemoveUnusedInports() throws Exception { writePomWithJavaSteps(""); - setFile("src/main/java/test.java").toResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test"); + String path = "src/main/java/test.java"; + setFile(path).toResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test"); mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/java/test.java").sameAsResource("java/removeunusedimports/JavaCodeWithPackageFormatted.test"); + assertFile(path).sameAsResource("java/removeunusedimports/JavaCodeWithPackageFormatted.test"); } } diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/scala/ScalafmtTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/scala/ScalafmtTest.java index d070a92f0f..50be37addb 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/scala/ScalafmtTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/scala/ScalafmtTest.java @@ -24,21 +24,25 @@ public class ScalafmtTest extends MavenIntegrationTest { public void testScalafmtWithDefaultConfig() throws Exception { writePomWithScalaSteps(""); - setFile("src/main/scala/test.scala").toResource("scala/scalafmt/basic.dirty"); - mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/scala/test.scala").sameAsResource("scala/scalafmt/basic.clean"); + runTest("scala/scalafmt/basic.clean"); } @Test public void testScalafmtWithCustomConfig() throws Exception { + setFile("scalafmt.conf").toResource("scala/scalafmt/scalafmt.conf"); + writePomWithScalaSteps( "", " ${project.basedir}/scalafmt.conf", ""); - setFile("scalafmt.conf").toResource("scala/scalafmt/scalafmt.conf"); - setFile("src/main/scala/test.scala").toResource("scala/scalafmt/basic.dirty"); + runTest("scala/scalafmt/basic.cleanWithCustomConf"); + } + + private void runTest(String s) throws Exception { + String path = "src/main/scala/test.scala"; + setFile(path).toResource("scala/scalafmt/basic.dirty"); mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile("src/main/scala/test.scala").sameAsResource("scala/scalafmt/basic.cleanWithCustomConf"); + assertFile(path).sameAsResource(s); } } diff --git a/testlib/src/main/resources/lineEndings/JavaCode-UNIX.test b/testlib/src/main/resources/lineEndings/JavaCode-UNIX.test deleted file mode 100644 index fc8b92a1ea..0000000000 --- a/testlib/src/main/resources/lineEndings/JavaCode-UNIX.test +++ /dev/null @@ -1,5 +0,0 @@ -public class Java { - public static void main(String[] args) { - System.out.println("hello"); - } -} \ No newline at end of file diff --git a/testlib/src/main/resources/lineEndings/JavaCode-WINDOWS.test b/testlib/src/main/resources/lineEndings/JavaCode-WINDOWS.test deleted file mode 100644 index fc8b92a1ea..0000000000 --- a/testlib/src/main/resources/lineEndings/JavaCode-WINDOWS.test +++ /dev/null @@ -1,5 +0,0 @@ -public class Java { - public static void main(String[] args) { - System.out.println("hello"); - } -} \ No newline at end of file