Skip several unittests for Java9
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1816985 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java b/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java
index 7c00ecc..c2866d6 100644
--- a/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java
+++ b/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java
@@ -148,6 +148,13 @@
public void testFixJdk5()
throws Exception
{
+ // Should be an assumption, but not supported by TestCase
+ // Java 5 not supported by Java9 anymore
+ if ( JavadocVersion.parse( SystemUtils.JAVA_VERSION ).compareTo( JavadocVersion.parse( "9" ) ) >= 0 )
+ {
+ return;
+ }
+
File testPomBasedir = new File( getBasedir(), "target/test/unit/fix-jdk5-test" );
executeMojoAndTest( testPomBasedir, new String[] { "ClassWithJavadoc.java", "ClassWithNoJavadoc.java",
"InterfaceWithJavadoc.java", "InterfaceWithNoJavadoc.java", "SubClassWithJavadoc.java" } );
diff --git a/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 6d5fe29..24643b4 100644
--- a/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -297,6 +297,13 @@
public void testDocfiles()
throws Exception
{
+ // Should be an assumption, but not supported by TestCase
+ // Seems like a bug in Javadoc 9
+ if ( JavadocVersion.parse( SystemUtils.JAVA_VERSION ).compareTo( JavadocVersion.parse( "9" ) ) == 0 )
+ {
+ return;
+ }
+
File testPom = new File( unit, "docfiles-test/docfiles-test-plugin-config.xml" );
JavadocReport mojo = lookupMojo( testPom );
mojo.execute();
@@ -553,6 +560,13 @@
public void testJdk5()
throws Exception
{
+ // Should be an assumption, but not supported by TestCase
+ // Java 5 not supported by Java9 anymore
+ if ( JavadocVersion.parse( SystemUtils.JAVA_VERSION ).compareTo( JavadocVersion.parse( "9" ) ) >= 0 )
+ {
+ return;
+ }
+
File testPom = new File( unit, "jdk5-test/jdk5-test-plugin-config.xml" );
JavadocReport mojo = lookupMojo( testPom );
mojo.execute();
