refactor: AssertJ best practices

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.testing.assertj.Assertj?organizationId=TW9kZXJuZQ%3D%3D Co-authored-by: Moderne <[email protected]>
moderneinc · May 29, 2024 · 656a351 · 656a351
1 parent ea91df4
commit 656a351
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/test/java/io/moderne/jenkins/ingest/MergerTest.java b/src/test/java/io/moderne/jenkins/ingest/MergerTest.java
@@ -6,7 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class MergerTest {
 
@@ -33,13 +33,13 @@ void mergeDatatables(@TempDir Path tempdir) throws Exception {
         Merger.mergeDatatables(repos, new_);
 
         String actual = Files.readString(repos);
-        assertEquals("""
+        assertThat(actual).isEqualTo("""
                 scmHost,repoName,repoBranch,mavenTool,gradleTool,jdkTool,repoStyle,repoBuildAction,repoSkip,skipReason
                 ,foo,keep-java-when-not-empty,maven,gradle,java8,style,build,,
                 ,foo,set-java-when-empty,maven,gradle,java17,style,build,,
                 ,foo,skip-when-archived,maven,gradle,java17,style,build,TRUE,archived
                 ,foo,trim-leading-origin,maven,gradle,java17,style,build,,
-                """, actual);
+                """);
     }
 
     @Test
@@ -59,10 +59,10 @@ void deduplicateNewMasterBranch(@TempDir Path tempdir) throws Exception {
         Merger.mergeDatatables(repos, new_);
 
         String actual = Files.readString(repos);
-        assertEquals("""
+        assertThat(actual).isEqualTo("""
                 scmHost,repoName,repoBranch,mavenTool,gradleTool,jdkTool,repoStyle,repoBuildAction,repoSkip,skipReason
                 ,jakartaee/validation,main,,,,,,,
-                """, actual);
+                """);
     }
 
     @Test
@@ -93,7 +93,7 @@ void mergeBgjug(@TempDir Path tempdir) throws Exception {
 
         Merger.mergeDatatables(repos, new_);
         String actual = Files.readString(repos);
-        assertEquals("""
+        assertThat(actual).isEqualTo("""
                 scmHost,repoName,repoBranch,mavenTool,gradleTool,jdkTool,repoStyle,repoBuildAction,repoSkip,skipReason
                 ,bgiegel/Starpoints-app,master,maven,,java8,,,,
                 ,bgjug/common-cdi-extension,master,,,java17,,,,
@@ -108,6 +108,6 @@ void mergeBgjug(@TempDir Path tempdir) throws Exception {
                 ,bgjug/repo-maven-plugin,master,,,java17,,,,
                 ,bgjug/spring-boot-forge-addon,master,,,java17,,,,
                 ,bgogetap/StickyHeaders,master,,,java8,,,,
-                """, actual);
+                """);
     }
 }
diff --git a/src/test/java/io/moderne/jenkins/ingest/ParserTest.java b/src/test/java/io/moderne/jenkins/ingest/ParserTest.java
@@ -7,7 +7,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class ParserTest {
 
@@ -36,7 +36,7 @@ void updateCsvWithDatatable(@TempDir Path tempDir) throws IOException {
                 """);
         Parser.updateReposBasedOnDatatable(reposFile, datatableFile);
         String updatedCsv = Files.readString(reposFile);
-        assertEquals("""
+        assertThat(updatedCsv).isEqualTo("""
                 scmHost,repoName,repoBranch,mavenTool,gradleTool,jdkTool,repoStyle,repoBuildAction,repoSkip,skipReason
                 ,apache/cassandra-accord,trunk,,,java11,,,,
                 ,apache/helix,master,maven,,java11,,,,
@@ -45,7 +45,7 @@ void updateCsvWithDatatable(@TempDir Path tempDir) throws IOException {
                 ,apache/servicemix5,trunk,maven,,java8,,,,
                 ,apache/shenyu,master,maven,,java8,,,TRUE,Maven wrapper 3.2.0 is not supported
                 ,apache/maven,master,maven,,java8,,,,
-                """, updatedCsv);
+                """);
     }
 
 }