You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/05/14 00:32:55 UTC
[groovy] branch GROOVY_3_0_X updated: GROOVY-9547: groovydoc:
resolve tags later for Groovy source code (make test cross-platform)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 8b26073 GROOVY-9547: groovydoc: resolve tags later for Groovy source code (make test cross-platform)
8b26073 is described below
commit 8b26073ec5d2a645666ed71eab76181d1c237848
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu May 14 10:31:22 2020 +1000
GROOVY-9547: groovydoc: resolve tags later for Groovy source code (make test cross-platform)
---
.../groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
index a8be2c7..979cea0 100644
--- a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
+++ b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
@@ -22,6 +22,7 @@ import groovy.test.GroovyTestCase;
import org.codehaus.groovy.groovydoc.GroovyClassDoc;
import org.codehaus.groovy.groovydoc.GroovyMethodDoc;
import org.codehaus.groovy.groovydoc.GroovyRootDoc;
+import org.codehaus.groovy.runtime.StringGroovyMethods;
import org.codehaus.groovy.tools.groovydoc.gstringTemplates.GroovyDocTemplateInfo;
import java.nio.charset.Charset;
@@ -993,7 +994,7 @@ public class GroovyDocToolTest extends GroovyTestCase {
htmlTool.renderToOutput(output, MOCK_DIR);
final String groovydoc = output.getText(MOCK_DIR + "/" + base + "/GroovyInterface1.html");
- final String javadoc = output.getText(MOCK_DIR + "/" + base + "/JavaClassWithDiamond.html");
+ final String javadoc = StringGroovyMethods.normalize(output.getText(MOCK_DIR + "/" + base + "/JavaClassWithDiamond.html"));
final Matcher groovyClassComment = Pattern.compile(Pattern.quote(
"<p> <a href='../../../../../../org/codehaus/groovy/tools/groovydoc/testfiles/JavaClassWithDiamond.html#link()' title='Java'>Java</a> " +