Merge pull request #1901 from Bananeweizen/newline

Recognize `\R` for multiline regex in groovy parsers

Author: uhafner

plugin/src/main/java/io/jenkins/plugins/analysis/warnings/groovy/GroovyParser.java

@@ -1,12 +1,5 @@
 package io.jenkins.plugins.analysis.warnings.groovy;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -20,6 +13,12 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import groovy.lang.Script;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -38,7 +37,7 @@
 import io.jenkins.plugins.util.ValidationUtilities;
 
 /**
- * Defines the properties of a warnings parser that uses a Groovy script to parse the warnings log.
+ * Defines the properties of a warning parser that uses a Groovy script to parse the console log.
  *
  * @author Ullrich Hafner
  */
@@ -86,7 +85,7 @@ public GroovyParser(final String id, final String name,
     }
 
     private static boolean containsNewline(final String expression) {
-        return StringUtils.contains(expression, "\\n") || StringUtils.contains(expression, "\\r");
+        return StringUtils.containsAny(expression, "\\n", "\\r", "\\R");
     }
 
     /**

plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/GroovyParserTest.java

@@ -1,16 +1,18 @@
 package io.jenkins.plugins.analysis.warnings.groovy;
 
-import java.io.IOException;
-import java.io.StringReader;
-
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.analysis.IssueParser;
 import edu.hm.hafner.analysis.Report;
 import edu.hm.hafner.util.SerializableTest;
 
+import java.io.IOException;
+import java.io.StringReader;
+
 import hudson.model.Run;
 
 import io.jenkins.plugins.analysis.core.util.ConsoleLogReaderFactory;
@@ -55,15 +57,16 @@ void shouldShortenExample() {
     /**
      * Tries to expose JENKINS-35262: multi-line regular expression parser.
      *
+     * @param regexp
+     *         the regular expression to check
+     *
      * @see <a href="https://issues.jenkins-ci.org/browse/JENKINS-35262">Issue 35262</a>
      */
-    @Test
-    void issue35262() throws IOException {
-        matchMultiLine("(make(?:(?!make)[\\s\\S])*?make-error:.*(?:\\n|\\r\\n?))");
-        matchMultiLine("(make(?:(?!make)[\\s\\S])*?make-error:.*(?:\\r?))");
-    }
-
-    private void matchMultiLine(final String multiLineRegexp) throws IOException {
+    @Issue("JENKINS-35262")
+    @ParameterizedTest(name = "{index}: Regular expression should be multiline \"{0}\"")
+    @ValueSource(strings = {"\\n|\\r\\n", "\\r", "\\R"})
+    void issue35262(final String regexp) throws IOException {
+        var multiLineRegexp = String.format("(make(?:(?!make)[\\s\\S])*?make-error:.*(?:%s?))", regexp);
         String textToMatch = toString("issue35262.log");
         String script = toString("issue35262.groovy");