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 2014/06/22 10:33:34 UTC
svn commit: r1604549 - in
/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site:
deploy/ render/ stubs/
Author: hboutemy
Date: Sun Jun 22 08:33:33 2014
New Revision: 1604549
URL: http://svn.apache.org/r1604549
Log:
code formatting
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/AuthAsyncProxyServlet.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.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=1604549&r1=1604548&r2=1604549&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 Jun 22 08:33:33 2014
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* @author Olivier Lamy
* @version $Id$
*/
-@RunWith(JUnit4.class)
+@RunWith( JUnit4.class )
public abstract class AbstractSiteDeployWebDavTest
extends AbstractMojoTestCase
{
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java?rev=1604549&r1=1604548&r2=1604549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java Sun Jun 22 08:33:33 2014
@@ -129,7 +129,7 @@ public class AuthAsyncProxyServlet
// nop
}
}
- String authPass = this.authentications.get(user);
+ String authPass = this.authentications.get( user );
if ( password.equals( authPass ) )
{
String targetPath = request.getServletPath();
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java?rev=1604549&r1=1604548&r2=1604549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java Sun Jun 22 08:33:33 2014
@@ -78,7 +78,7 @@ public class SimpleDavServerHandler
@SuppressWarnings( "rawtypes" )
Enumeration headerNames = request.getHeaderNames();
- while (headerNames.hasMoreElements())
+ while ( headerNames.hasMoreElements() )
{
String name = (String) headerNames.nextElement();
rq.headers.put( name, request.getHeader( name ) );
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java?rev=1604549&r1=1604548&r2=1604549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java Sun Jun 22 08:33:33 2014
@@ -20,7 +20,7 @@ package org.apache.maven.plugins.site.de
*/
import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.wagon.repository.Repository;
+//import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.PlexusTestCase;
import org.junit.Before;
import org.junit.Test;
@@ -30,13 +30,13 @@ import org.junit.runners.JUnit4;
/**
* @author <a href="mailto:cleclerc@xebia.fr">Cyrille Le Clerc</a>
*/
-@RunWith(JUnit4.class)
+@RunWith( JUnit4.class )
public class SiteDeployMojoTest
extends PlexusTestCase
{
private WagonManager wagonManager;
- private Repository repository;
+ //private Repository repository;
@Before
public void setUp()
@@ -44,7 +44,7 @@ public class SiteDeployMojoTest
{
super.setUp();
wagonManager = getContainer().lookup( WagonManager.class );
- repository = new Repository( "my-repository", "scp://repository-host/var/maven2" );
+ //repository = new Repository( "my-repository", "scp://repository-host/var/maven2" );
}
@Test
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java?rev=1604549&r1=1604548&r2=1604549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/render/SiteMojoTest.java Sun Jun 22 08:33:33 2014
@@ -70,13 +70,13 @@ public class SiteMojoTest
String siteDescriptorContent = FileUtils.fileRead( descriptorFile );
assertNotNull( siteDescriptorContent );
- assertTrue(siteDescriptorContent.contains("${project.name}"));
+ assertTrue( siteDescriptorContent.contains( "${project.name}" ) );
SiteTool siteTool = (SiteTool) lookup( SiteTool.ROLE );
siteDescriptorContent =
siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, String>(), siteMojo.getProject(),
siteDescriptorContent );
assertNotNull( siteDescriptorContent );
- assertTrue(!siteDescriptorContent.contains("${project.name}"));
+ assertTrue( !siteDescriptorContent.contains( "${project.name}" ) );
}
}
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=1604549&r1=1604548&r2=1604549&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 Jun 22 08:33:33 2014
@@ -43,14 +43,16 @@ public class SiteMavenProjectStub
this( null );
}
- public SiteMavenProjectStub(String pomFilePath)
+ public SiteMavenProjectStub( String pomFilePath )
{
MavenXpp3Reader pomReader = new MavenXpp3Reader();
Model model;
try
{
- File pomFile = new File( getBasedir(),pomFilePath == null ? "/src/test/resources/unit/interpolated-site/pom.xml" : pomFilePath );
+ File pomFile =
+ new File( getBasedir(), pomFilePath == null ? "/src/test/resources/unit/interpolated-site/pom.xml"
+ : pomFilePath );
model = pomReader.read( ReaderFactory.newXmlReader( pomFile ) );
setModel( model );
}