[maven-javadoc-plugin] branch master updated: Make unittests more solid

[rf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 9809cf1  Make unittests more solid
9809cf1 is described below

commit 9809cf172071db21fd0f0482d944fd963dd2a2b3
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Jan 6 13:39:09 2018 +0100

    Make unittests more solid
---
 .../apache/maven/plugins/javadoc/JavadocReportTest.java   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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 19d6fa9..a521839 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -27,6 +27,8 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -228,7 +230,15 @@ public class JavadocReportTest
 
         File generatedFile = new File( apidocs, "def/configuration/App.html" );
         assertTrue( generatedFile.exists() );
-        assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ).contains( "/docs/api/java/lang/Object.html" ) );
+
+        // only test when URL can be reached
+        String url = JavadocReport.DEFAULT_JAVA_API_LINKS.getProperty( "api_9" );
+        HttpURLConnection connection = (HttpURLConnection) new URL( url ).openConnection();
+        connection.setRequestMethod( "HEAD" );
+        if ( connection.getResponseCode() == 200 )
+        {
+            assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ).contains( "/docs/api/java/lang/Object.html" ) );
+        }
 
         assertTrue( new File( apidocs, "def/configuration/AppSample.html" ).exists() );
         assertTrue( new File( apidocs, "def/configuration/package-frame.html" ).exists() );
@@ -654,7 +664,8 @@ public class JavadocReportTest
         if( javadocVersion.compareTo( JavadocVersion.parse( "1.8" ) ) >= 0  && javadocVersion.compareTo( JavadocVersion.parse( "10" ) ) < 0)
         {
             // https://bugs.openjdk.java.net/browse/JDK-8032205
-            assertTrue( "This bug appeared in JDK8 and was planned to be fixed in JDK9, see JDK-8032205",
+            assertTrue( "Javadoc runtime version: " + javadocVersion
+                + "\nThis bug appeared in JDK8 and was planned to be fixed in JDK9, see JDK-8032205",
                         new File( apidocs, "resources/test/doc-files/maven-feather.png" ).exists() );
         }
         else

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].