svn commit: r1095177 - /maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java

[hb...@apache.org]

Author: hboutemy
Date: Tue Apr 19 19:45:30 2011
New Revision: 1095177

URL: http://svn.apache.org/viewvc?rev=1095177&view=rev
Log:
trying to fix unit test on grid

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1095177&r1=1095176&r2=1095177&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Tue Apr 19 19:45:30 2011
@@ -34,6 +34,7 @@ import org.apache.maven.plugin.javadoc.P
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Settings;
+import org.apache.webdav.lib.properties.GetLastModifiedProperty;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -762,7 +763,7 @@ public class JavadocReportTest
     public void testProxy()
         throws Exception
     {
-        final boolean isMavenSiteOnline =
+        boolean isMavenSiteOnline =
             JavadocUtilTest.isWebSiteOnline( null, getContainer().getLogger(),
                                              "http://maven.apache.org/shared/maven-filtering/apidocs/package-list" );
 
@@ -832,11 +833,18 @@ public class JavadocReportTest
             assertTrue( readed.indexOf( "-J-Dhttp.proxyPort=" + proxyServer.getPort() ) != -1 );
 
             optionsContent = readFile( options );
+            isMavenSiteOnline =
+                JavadocUtilTest.isWebSiteOnline( settings, getContainer().getLogger(),
+                                                 "http://maven.apache.org/shared/maven-filtering/apidocs/package-list" );
             if ( isMavenSiteOnline )
             {
                 // -link http://maven.apache.org/shared/maven-filtering/apidocs/package-list
                 assertTrue( optionsContent.contains( "-link 'http://maven.apache.org/shared/maven-filtering/apidocs'" ) );
             }
+            else
+            {
+                getContainer().getLogger().warn( "unable to reach maven.apache.org: link detection test unavailable." );
+            }
             assertTrue( true );
         }
         catch ( Exception e )