(creadur-rat) branch feature/RAT-336 updated: RAT-336: Start to migrate tests in first module

[pottlinger]

This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch feature/RAT-336
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git


The following commit(s) were added to refs/heads/feature/RAT-336 by this push:
     new 96bb168c RAT-336: Start to migrate tests in first module
96bb168c is described below

commit 96bb168cf262aa4422ebacd394b639e1c86e71a1
Author: P. Ottlinger <pottlin...@apache.org>
AuthorDate: Tue Jun 4 23:29:29 2024 +0200

    RAT-336: Start to migrate tests in first module
---
 .../org/apache/rat/analysis/DefaultAnalyserFactoryTest.java    |  3 ++-
 .../org/apache/rat/analysis/license/AbstractLicenseTest.java   | 10 ++++------
 .../org/apache/rat/analysis/license/GeneratedLicenseTest.java  |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
 
b/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
index b576868f..a890cb8a 100644
--- 
a/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
+++ 
b/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.analysis;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -81,7 +82,7 @@ public class DefaultAnalyserFactoryTest {
         reporter.report(document);
         String result = out.toString();
         for (String exp : expected) {
-            assertTrue(result.contains(exp), () -> exp);
+            assertThat(result.contains(exp)).isTrue();
         }
     }
 
diff --git 
a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
 
b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index 39d512fe..c88d3be5 100644
--- 
a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ 
b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.rat.analysis.license;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
@@ -75,8 +74,8 @@ abstract public class AbstractLicenseTest {
             for (String[] target : targets) {
                 if (processText(license, target[TEXT])) {
                     data.reportOnLicense(license);
-                    assertEquals(1, data.licenses().count());
-                    assertEquals(license, data.licenses().findFirst().get());
+                    assertThat(data.licenses()).hasSize(1);
+                    
assertThat(data.licenses().findFirst()).isPresent().hasValue(license);
                 } else {
                     fail(license + " was not matched by " + target[NAME]);
                 }
@@ -108,8 +107,7 @@ abstract public class AbstractLicenseTest {
                 for (String fmt : formats) {
                     boolean found = processText(license, String.format(fmt, 
target[TEXT]));
                     license.reset();
-                    assertTrue(found, () -> String.format("%s %s did not match 
pattern '%s' for target string %s", id,
-                            name, fmt, target[NAME]));
+                    assertThat(found).isTrue();
                 }
             }
         } finally {
diff --git 
a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
 
b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
index 431db58d..df0a7547 100644
--- 
a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
+++ 
b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.params.provider.Arguments;
 public class GeneratedLicenseTest extends AbstractLicenseTest {
     private static String id = "GEN";
     private static String name = "Generated Files";
-    private static String notes = "Files that are autmoatically generated.";
+    private static String notes = "Files that are automatically generated.";
     private static String[][] targets = { { "Cayenne", "generated by Cayenne" 
}, { "JJTree", "Generated By:JJTree" },
             { "JavaCC", "Generated By:JavaCC" }, { "AUTOMATIC", "THIS FILE IS 
AUTOMATICALLY GENERATED" },
             { "XBeans", "NOTE: this file is autogenerated by XBeans" },