This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-542
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/MJAVADOC-542 by this push:
new 3c9401e Fix tests for Java 11
3c9401e is described below
commit 3c9401ec17c8b0984b928774bf1a8d5b013f3f3f
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Nov 24 11:17:45 2018 +0100
Fix tests for Java 11
---
Jenkinsfile | 2 +-
src/it/projects/MJAVADOC-427/verify.groovy | 2 +-
src/it/projects/MJAVADOC-538/pom.xml | 2 +-
.../javadoc/AggregatorJavadocReportTest.java | 12 ++++++-
.../maven/plugins/javadoc/JavadocJarTest.java | 6 +++-
.../maven/plugins/javadoc/JavadocReportTest.java | 39 ++++++++++++++++------
6 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cc4e4ff..e9f05f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild(jdk:['7','8','9','10'])
+asfMavenTlpPlgnBuild()
diff --git a/src/it/projects/MJAVADOC-427/verify.groovy
b/src/it/projects/MJAVADOC-427/verify.groovy
index 8e3c9ab..035c4d6 100644
--- a/src/it/projects/MJAVADOC-427/verify.groovy
+++ b/src/it/projects/MJAVADOC-427/verify.groovy
@@ -23,4 +23,4 @@ assert file.exists()
// assert that javadoc of class correctly contains link, just like method
details
assert file.text =~ /Link to slf4j <a
href=".*?".*?><code>LoggerFactory<\/code><\/a>/
-assert file.text =~ /<pre>public.*?<a
href=".*?".*?>LoggerFactory<\/a>.*?getLoggerFactory.*?\(\)<\/pre>/
+assert file.text =~ /<pre[^<]*>public.*?<a
href=".*?".*?>LoggerFactory<\/a>.*?getLoggerFactory.*?\(\)<\/pre>/
diff --git a/src/it/projects/MJAVADOC-538/pom.xml
b/src/it/projects/MJAVADOC-538/pom.xml
index 05e8ac1..ecac918 100644
--- a/src/it/projects/MJAVADOC-538/pom.xml
+++ b/src/it/projects/MJAVADOC-538/pom.xml
@@ -49,7 +49,7 @@
<profiles>
<profile>
<activation>
- <jdk>[10,)</jdk>
+ <jdk>10</jdk>
</activation>
<build>
<pluginManagement>
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
index 706b26e..1bfad67 100644
---
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -31,6 +31,7 @@ import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.languages.java.version.JavaVersion;
import org.codehaus.plexus.util.FileUtils;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -231,7 +232,16 @@ public class AggregatorJavadocReportTest
File apidocs = new File( getBasedir(),
"target/test/unit/aggregate-resources-test/target/site/apidocs" );
// Test overview
- File overviewSummary = new File( apidocs, "overview-summary.html" );
+ File overviewSummary;
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
+ {
+ overviewSummary = new File( apidocs, "overview-summary.html" );
+ }
+ else
+ {
+ overviewSummary = new File( apidocs, "index.html" );
+ }
+
assertTrue( overviewSummary.exists() );
String overview = readFile( overviewSummary ).toLowerCase();
assertTrue( overview.contains( "<a
href=\"resources/test/package-summary.html\">resources.test</a>" ) );
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
index 18e71cc..16d7a4e 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
@@ -112,7 +112,11 @@ public class JavadocJarTest
assertTrue( set.contains( "javadocjar/def/package-use.html" ) );
assertTrue( set.contains( "javadocjar/def/package-tree.html" ) );
assertTrue( set.contains( "javadocjar/def/package-summary.html" ) );
- assertTrue( set.contains( "javadocjar/def/package-frame.html" ) );
+ // package frame not generated anymore since Java 11
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
+ {
+ assertTrue( set.contains( "javadocjar/def/package-frame.html" ) );
+ }
assertTrue( set.contains( "javadocjar/def/class-use/AppSample.html" )
);
assertTrue( set.contains( "index.html" ) );
assertTrue( set.contains( "javadocjar/def/App.html" ) );
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index e541fc0..c4d66b9 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -232,18 +232,23 @@ public class JavadocReportTest
}
assertTrue( new File( apidocs, "def/configuration/AppSample.html"
).exists() );
- assertTrue( new File( apidocs, "def/configuration/package-frame.html"
).exists() );
assertTrue( new File( apidocs,
"def/configuration/package-summary.html" ).exists() );
assertTrue( new File( apidocs, "def/configuration/package-tree.html"
).exists() );
assertTrue( new File( apidocs, "def/configuration/package-use.html"
).exists() );
+ // package-frame and allclasses-(no)frame not generated anymore since
Java 11
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
+ {
+ assertTrue( new File( apidocs,
"def/configuration/package-frame.html" ).exists() );
+ assertTrue( new File( apidocs, "allclasses-frame.html" ).exists()
);
+ assertTrue( new File( apidocs, "allclasses-noframe.html"
).exists() );
+ }
+
// class level generated javadoc files
assertTrue( new File( apidocs, "def/configuration/class-use/App.html"
).exists() );
assertTrue( new File( apidocs,
"def/configuration/class-use/AppSample.html" ).exists() );
// project level generated javadoc files
- assertTrue( new File( apidocs, "allclasses-frame.html" ).exists() );
- assertTrue( new File( apidocs, "allclasses-noframe.html" ).exists() );
assertTrue( new File( apidocs, "constant-values.html" ).exists() );
assertTrue( new File( apidocs, "deprecated-list.html" ).exists() );
assertTrue( new File( apidocs, "help-doc.html" ).exists() );
@@ -728,9 +733,15 @@ public class JavadocReportTest
String readed = readFile( app );
assertTrue( readed.contains( ">To do something:</" ) );
assertTrue( readed.contains( ">Generator Class:</" ) );
- assertTrue( readed.contains( ">Version:</" ) );
- assertTrue( readed.toLowerCase().contains( "</dt>" + LINE_SEPARATOR +
" <dd>1.0</dd>" )
- || readed.toLowerCase().contains( "</dt>" + LINE_SEPARATOR +
"<dd>1.0</dd>" /* JDK 8 */) );
+
+ // In javadoc-options-javadoc-resources.xml tag 'version' has only a
name,
+ // which is not enough for Java 11 anymore
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
+ {
+ assertTrue( readed.contains( ">Version:</" ) );
+ assertTrue( readed.toLowerCase().contains( "</dt>" +
LINE_SEPARATOR + " <dd>1.0</dd>" )
+ || readed.toLowerCase().contains( "</dt>" + LINE_SEPARATOR +
"<dd>1.0</dd>" /* JDK 8 */) );
+ }
}
/**
@@ -790,12 +801,20 @@ public class JavadocReportTest
mojo.execute();
File apidocs = new File( getBasedir(),
"target/test/unit/jdk6-test/target/site/apidocs" );
-
assertTrue( new File( apidocs, "index.html" ).exists() );
- File overviewSummary = new File( apidocs, "overview-summary.html" );
- assertTrue( overviewSummary.exists() );
- String content = readFile( overviewSummary );
+ File overview;
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "11" ) )
+ {
+ overview = new File( apidocs, "overview-summary.html" );
+ }
+ else
+ {
+ overview = new File( apidocs, "index.html" );
+ }
+
+ assertTrue( overview.exists() );
+ String content = readFile( overview );
assertTrue( content.contains( "Top - Copyright © All rights
reserved." ) );
assertTrue( content.contains( "Header - Copyright © All rights
reserved." ) );
assertTrue( content.contains( "Footer - Copyright © All rights
reserved." ) );
