RAT-541: create testhelpers.data package

apache-rat-core/src/it/java/org/apache/rat/ReportTest.java

@@ -80,15 +80,15 @@
  *      associated with the exception.</li>
  * </ul>
  */
-public class ReportTest {
+class ReportTest {
 
     private String[] asArgs(final List<String> argsList) {
         return argsList.toArray(new String[0]);
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("args")
-    public void integrationTest(String testName, Document commandLineDoc) throws Exception {
+    void integrationTest(String testName, Document commandLineDoc) throws Exception {
         DefaultLog.getInstance().log(Log.Level.INFO, "Running test for " + testName);
         File baseDir = new File(commandLineDoc.getName().getName()).getParentFile();
 
@@ -119,9 +119,11 @@ public void integrationTest(String testName, Document commandLineDoc) throws Exc
 
             File expectedMsg = new File(baseDir, "expected-message.txt");
             if (expectedMsg.exists()) {
-                String msg = IOUtils.readLines(new FileReader(expectedMsg)).get(0).trim();
-                assertThrows(RatDocumentAnalysisException.class, () -> Report.main(asArgs(argsList)),
-                        msg);
+                try (FileReader fr = new FileReader(expectedMsg)) {
+                    String msg = IOUtils.readLines(fr).get(0).trim();
+                    assertThrows(RatDocumentAnalysisException.class, () -> Report.main(asArgs(argsList)),
+                            msg);
+                }
             } else {
                 Report.main(asArgs(argsList));
             }
@@ -142,7 +144,7 @@ public void integrationTest(String testName, Document commandLineDoc) throws Exc
             try {
                 Object value = shell.run(groovyScript, new String[]{outputFile.getAbsolutePath(), logFile.getAbsolutePath()});
                 if (value != null) {
-                    fail(String.format("%s", value));
+                    fail(String.format("%s: %s", testName, value));
                 }
             } catch (AssertionError e) {
                 throw new AssertionError(String.format("%s: %s", testName, e.getMessage()), e);
@@ -204,6 +206,7 @@ public static class FileLog implements Log {
          *
          * @param level the level to use when writing messages.
          */
+        @Override
         public void setLevel(final Level level) {
             this.level = level;
         }

apache-rat-core/src/it/resources/ReportTest/RAT_406/commandLine.txt

@@ -1,2 +1,3 @@
 --licenses-denied
 DOJO
+--

apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java

@@ -527,7 +527,7 @@ public void setStyleSheet(final IODescriptor<InputStream> styleSheet) {
      */
     public void setFrom(final Defaults defaults) {
         licenseSetFactory.add(defaults.getLicenseSetFactory());
-        if (getStyleSheet() == null) {
+        if (getStyleSheetDescriptor() == null) {
             setStyleSheet(StyleSheets.PLAIN.getStyleSheet());
         }
         defaults.getStandardExclusion().forEach(this::addExcludedCollection);

apache-rat-core/src/main/java/org/apache/rat/commandline/Arg.java

@@ -165,7 +165,6 @@ public enum Arg {
             .build()),
             (context, selected) ->
                   context.getConfiguration().addApprovedLicenseIds(context.getParsedOptionValue(selected))
-
     ),
 
     /**

apache-rat-core/src/main/java/org/apache/rat/commandline/Converters.java

@@ -117,7 +117,7 @@ public DocumentName apply(final String fileName) throws NullPointerException {
             } else {
                 builder.setBaseName(workingDirectory);
             }
-            return  builder.setName(normalizedFileName).build();
+            return builder.setName(normalizedFileName).build();
         }
     }
 }

apache-rat-core/src/main/java/org/apache/rat/commandline/StyleSheets.java

@@ -49,8 +49,11 @@ public enum StyleSheets {
     /**
      * The pretty-printed XML style sheet.
      */
-    XML("xml", "Produces output in pretty-printed XML.");
-
+    XML("xml", "Produces output in pretty-printed XML."),
+    /**
+     * Official HTML5 stylesheet.
+     */
+    XHTML5("xhtml5", "Produces a HTML5 report");
     /**
      * The name of the style sheet. Must map to bundled resource XSLT file
      */

apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java

@@ -138,9 +138,9 @@ private void resetLastMatcher() {
      */
     public ExclusionProcessor addIncludedPatterns(final Iterable<String> patterns) {
         if (patterns != null) {
-        DefaultLog.getInstance().debug(format("Including patterns: %s", String.join(", ", patterns)));
-        patterns.forEach(includedPatterns::add);
-        resetLastMatcher();
+            DefaultLog.getInstance().debug(format("Including patterns: %s", String.join(", ", patterns)));
+            patterns.forEach(includedPatterns::add);
+            resetLastMatcher();
         }
         return this;
     }
@@ -193,9 +193,9 @@ public ExclusionProcessor addIncludedCollection(final StandardCollection collect
      */
     public ExclusionProcessor addExcludedPatterns(final Iterable<String> patterns) {
         if (patterns != null) {
-        DefaultLog.getInstance().debug(format("Excluding patterns: %s", String.join(", ", patterns)));
-        patterns.forEach(excludedPatterns::add);
-        resetLastMatcher();
+            DefaultLog.getInstance().debug(format("Excluding patterns: %s", String.join(", ", patterns)));
+            patterns.forEach(excludedPatterns::add);
+            resetLastMatcher();
         }
         return this;
     }

apache-rat-core/src/test/java/org/apache/rat/testhelpers/FileUtils.java → apache-rat-core/src/main/java/org/apache/rat/utils/FileUtils.java

@@ -16,42 +16,46 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */
-package org.apache.rat.testhelpers;
+package org.apache.rat.utils;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.assertj.core.api.Fail.fail;
 
-public class FileUtils {
+public final class FileUtils {
+    private FileUtils() {
+        // do not instantiate
+    }
 
     /**
      * Creates a directory if it does not exist.
      * @param dir the directory to make.
      */
-    public static void mkDir(File dir) {
+    public static void mkDir(final File dir) {
         boolean ignored = dir.mkdirs();
     }
 
     /**
      * Deletes a file if it exists.
      * @param file the file to delete.
      */
-    public static void delete(File file) {
+    public static void delete(final File file) {
         if (file.exists()) {
-            if (file.isDirectory()) {
-                try {
+            try {
+                if (file.isDirectory()) {
                     org.apache.commons.io.FileUtils.deleteDirectory(file);
-                } catch (IOException ignore) {
-                    //
+                } else {
+                    Files.delete(file.toPath());
                 }
-            } else {
-                boolean ignored = file.delete();
+            } catch (IOException ignore) {
+                //
             }
+
         }
     }
 
@@ -62,15 +66,16 @@ public static void delete(File file) {
      * @param lines the lines to write into the file.
      * @return the new File.
      */
-    static public File writeFile(File dir, final String name, final Iterable<String> lines) {
+    public static  File writeFile(final File dir, final String name, final Iterable<String> lines) {
         if (dir == null) {
-            fail("base directory not specified");
+            throw new IllegalArgumentException("base directory not specified");
         }
+        mkDir(dir);
         File file = new File(dir, name);
         try (PrintWriter writer = new PrintWriter(new FileWriter(file))) {
             lines.forEach(writer::println);
         } catch (IOException e) {
-            fail(e.getMessage());
+            throw new RuntimeException(e.getMessage(), e);
         }
         return file;
     }
@@ -82,7 +87,7 @@ static public File writeFile(File dir, final String name, final Iterable<String>
      * @param lines the lines to write into the file.
      * @return the new File.
      */
-    static public File writeFile(File dir, final String name, final String... lines) {
+    public static File writeFile(final File dir, final String name, final String... lines) {
         return writeFile(dir, name, Arrays.asList(lines));
     }
 
@@ -92,7 +97,7 @@ static public File writeFile(File dir, final String name, final String... lines)
      * @param name the name of the file.
      * @return the new file.
      */
-    public static File writeFile(File dir, String name) {
+    public static File writeFile(final File dir, final String name) {
         return writeFile(dir, name, Collections.singletonList(name));
     }
 }

apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java

@@ -20,12 +20,15 @@
 package org.apache.rat.walker;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.SortedSet;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
@@ -34,9 +37,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
-import org.apache.rat.document.ArchiveEntryDocument;
 import org.apache.rat.document.ArchiveEntryName;
 import org.apache.rat.document.DocumentName;
+import org.apache.rat.document.DocumentNameMatcher;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.utils.DefaultLog;
 
@@ -87,13 +90,29 @@ public Collection<Document> getDocuments() throws RatException {
             ArchiveEntry entry;
             while ((entry = input.getNextEntry()) != null) {
                 if (!entry.isDirectory() && input.canReadEntryData(entry)) {
-                    DocumentName innerName = DocumentName.builder().setName(entry.getName())
+                    final DocumentName innerName = DocumentName.builder().setName(entry.getName())
                             .setBaseName(".").build();
-                    if (this.getDocument().getNameMatcher().matches(innerName)) {
+                    final DocumentNameMatcher documentNameMatcher = getDocument().getNameMatcher();
+                    if (documentNameMatcher.matches(innerName)) {
+                        ArchiveEntryName entryName = new ArchiveEntryName(getDocument().getName(), entry.getName());
                         ByteArrayOutputStream baos = new ByteArrayOutputStream();
                         IOUtils.copy(input, baos);
-                        ArchiveEntryName entryName = new ArchiveEntryName(getDocument().getName(), entry.getName());
-                        result.add(new ArchiveEntryDocument(entryName, baos.toByteArray(), getDocument().getNameMatcher()));
+                        result.add(new Document(entryName, documentNameMatcher) {
+                            @Override
+                            public InputStream inputStream() {
+                                return new ByteArrayInputStream(baos.toByteArray());
+                            }
+
+                            @Override
+                            public boolean isDirectory() {
+                                return false;
+                            }
+
+                            @Override
+                            public SortedSet<Document> listChildren() {
+                                return Collections.emptySortedSet();
+                            }
+                        });
                     }
                 }
             }