maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1096387 - in /maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc: JavadocReportTest.java stubs/ProxyTestMavenProjectStub.java
Date Sun, 24 Apr 2011 23:26:18 GMT
Author: hboutemy
Date: Sun Apr 24 23:26:18 2011
New Revision: 1096387

URL: http://svn.apache.org/viewvc?rev=1096387&view=rev
Log:
use a dependency available during unit-tests both with Maven 2.2 and Maven 3

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
    maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.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=1096387&r1=1096386&r2=1096387&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
Sun Apr 24 23:26:18 2011
@@ -765,7 +765,7 @@ public class JavadocReportTest
         Settings settings = new Settings();
         Proxy proxy = new Proxy();
 
-        //dummy proxy
+        // dummy proxy
         proxy.setActive( true );
         proxy.setHost( "127.0.0.1" );
         proxy.setPort( 80 );
@@ -795,8 +795,8 @@ public class JavadocReportTest
         File options = new File( getBasedir(), "target/test/unit/proxy-test/target/site/apidocs/options"
);
         assertTrue( FileUtils.fileExists( options.getAbsolutePath() ) );
         String optionsContent = readFile( options );
-        // NO -link http://maven.apache.org/shared/maven-filtering/apidocs/package-list
-        assertFalse( optionsContent.contains( "-link 'http://maven.apache.org/shared/maven-filtering/apidocs'"
) );
+        // NO -link expected
+        assertFalse( optionsContent.contains( "-link" ) );
 
         // real proxy
         ProxyServer proxyServer = null;
@@ -825,8 +825,8 @@ public class JavadocReportTest
             assertTrue( readed.contains( "-J-Dhttp.proxyPort=" + proxyServer.getPort() )
);
 
             optionsContent = readFile( options );
-            // -link http://maven.apache.org/shared/maven-filtering/apidocs/package-list
-            assertTrue( optionsContent.contains( "-link 'http://maven.apache.org/shared/maven-filtering/apidocs'"
) );
+            // -link expected
+            assertTrue( optionsContent.contains( "-link 'http://maven.apache.org/plugins/maven-javadoc-plugin/apidocs'"
) );
         }
         finally
         {
@@ -867,8 +867,8 @@ public class JavadocReportTest
             assertTrue( readed.contains( "-J-Dhttp.proxyPassword=\\\"bar\\\"" ) );
 
             optionsContent = readFile( options );
-            // -link http://maven.apache.org/shared/maven-filtering/apidocs/package-list
-            assertTrue( optionsContent.contains( "-link 'http://maven.apache.org/shared/maven-filtering/apidocs'"
) );
+            // -link expected
+            assertTrue( optionsContent.contains( "-link 'http://maven.apache.org/plugins/maven-javadoc-plugin/apidocs'"
) );
         }
         finally
         {

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java?rev=1096387&r1=1096386&r2=1096387&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java
Sun Apr 24 23:26:18 2011
@@ -61,9 +61,9 @@ public class ProxyTestMavenProjectStub
         setCompileSourceRoots( compileSourceRoots );
 
         ArtifactStub artifact = new ArtifactStub();
-        artifact.setGroupId( "org.apache.maven.shared" );
-        artifact.setArtifactId( "maven-filtering" );
-        artifact.setVersion( "1.0-beta-4" );
+        artifact.setGroupId( "org.apache.maven.plugins" );
+        artifact.setArtifactId( "maven-javadoc-plugin" );
+        artifact.setVersion( "2.7" );
         artifact.setScope( Artifact.SCOPE_RUNTIME );
         artifact.setType( "jar" );
         artifact.setFile( getBasedir() );



Mime
View raw message