You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/12/13 20:10:53 UTC
svn commit: r1719819 - in /maven/plugins/trunk/maven-site-plugin/src/test:
java/org/apache/maven/plugins/site/deploy/
java/org/apache/maven/plugins/site/render/
java/org/apache/maven/plugins/site/stubs/ resources/unit/interpolated-site/
Author: hboutemy
Date: Sun Dec 13 19:10:53 2015
New Revision: 1719819
URL: http://svn.apache.org/viewvc?rev=1719819&view=rev
Log:
moved getInterpolatedSiteDescriptorContent() unit test to Doxia Sitetools
Removed:
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/
maven/plugins/trunk/maven-site-plugin/src/test/resources/unit/interpolated-site/
Modified:
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java?rev=1719819&r1=1719818&r2=1719819&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AbstractSiteDeployWebDavTest.java Sun Dec 13 19:10:53 2015
@@ -73,7 +73,7 @@ public abstract class AbstractSiteDeploy
abstract String getMojoName();
- abstract AbstractMojo getMojo( File pluginXmlFile )
+ abstract AbstractMojo getMojo( File pomFile )
throws Exception;
@Test
@@ -85,11 +85,10 @@ public abstract class AbstractSiteDeploy
try
{
- File pluginXmlFile = getTestFile( "src/test/resources/unit/deploy-dav/pom.xml" );
- AbstractMojo mojo = getMojo( pluginXmlFile );
+ File pomFile = getTestFile( "src/test/resources/unit/deploy-dav/pom.xml" );
+ AbstractMojo mojo = getMojo( pomFile );
assertNotNull( mojo );
- SiteMavenProjectStub siteMavenProjectStub =
- new SiteMavenProjectStub( "src/test/resources/unit/deploy-dav/pom.xml" );
+ SiteMavenProjectStub siteMavenProjectStub = new SiteMavenProjectStub( "deploy-dav" );
assertTrue( "dav server port not available: " + simpleDavServerHandler.getPort(),
simpleDavServerHandler.getPort() > 0 );
@@ -126,8 +125,7 @@ public abstract class AbstractSiteDeploy
File pluginXmlFile = getTestFile( "src/test/resources/unit/deploy-dav/pom.xml" );
AbstractMojo mojo = getMojo( pluginXmlFile );
assertNotNull( mojo );
- SiteMavenProjectStub siteMavenProjectStub =
- new SiteMavenProjectStub( "src/test/resources/unit/deploy-dav/pom.xml" );
+ SiteMavenProjectStub siteMavenProjectStub = new SiteMavenProjectStub( "deploy-dav" );
// olamy, Note : toto is something like foo or bar for french folks :-)
String siteUrl = "dav:http://toto.com/site/";
siteMavenProjectStub.getDistributionManagement().getSite().setUrl( siteUrl );
@@ -192,8 +190,7 @@ public abstract class AbstractSiteDeploy
File pluginXmlFile = getTestFile( "src/test/resources/unit/deploy-dav/pom.xml" );
AbstractMojo mojo = getMojo( pluginXmlFile );
assertNotNull( mojo );
- SiteMavenProjectStub siteMavenProjectStub =
- new SiteMavenProjectStub( "src/test/resources/unit/deploy-dav/pom.xml" );
+ SiteMavenProjectStub siteMavenProjectStub = new SiteMavenProjectStub( "deploy-dav" );
siteMavenProjectStub.getDistributionManagement().getSite()
.setUrl( "dav:http://toto.com/site/" );
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java?rev=1719819&r1=1719818&r2=1719819&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployWebDavTest.java Sun Dec 13 19:10:53 2015
@@ -40,10 +40,10 @@ public class SiteDeployWebDavTest
}
@Override
- AbstractMojo getMojo( File pluginXmlFile )
+ AbstractMojo getMojo( File pomXmlFile )
throws Exception
{
- return (SiteDeployMojo) lookupMojo( getMojoName(), pluginXmlFile );
+ return (SiteDeployMojo) lookupMojo( getMojoName(), pomXmlFile );
}
}
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java?rev=1719819&r1=1719818&r2=1719819&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java Sun Dec 13 19:10:53 2015
@@ -23,7 +23,6 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Model;
import org.apache.maven.model.Site;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -38,27 +37,19 @@ import org.codehaus.plexus.util.xml.XmlS
public class SiteMavenProjectStub
extends MavenProjectStub
{
+ private File basedir;
+
DistributionManagement distributionManagement = new DistributionManagement();
- public SiteMavenProjectStub()
- {
- this( null );
- }
-
- public SiteMavenProjectStub( String pomFilePath )
+ public SiteMavenProjectStub( String projectName )
{
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model;
+ basedir = new File( super.getBasedir() + "/src/test/resources/unit/" + projectName );
XmlStreamReader reader = null;
try
{
- File pomFile =
- new File( getBasedir(), pomFilePath == null ? "/src/test/resources/unit/interpolated-site/pom.xml"
- : pomFilePath );
- reader = ReaderFactory.newXmlReader( pomFile );
- model = pomReader.read( reader );
- setModel( model );
+ reader = ReaderFactory.newXmlReader( new File( getBasedir(), "pom.xml" ) );
+ setModel( new MavenXpp3Reader().read( reader ) );
}
catch ( Exception e )
{
@@ -94,4 +85,15 @@ public class SiteMavenProjectStub
{
return distributionManagement;
}
+
+ /** {@inheritDoc} */
+ public File getBasedir()
+ {
+ return basedir;
+ }
+
+ public void setBasedir( File basedir )
+ {
+ this.basedir = basedir;
+ }
}