You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ar...@apache.org on 2006/04/20 08:32:33 UTC
svn commit: r395508 - in /maven/plugins/trunk/maven-deploy-plugin: pom.xml
src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoUnitTest.java
src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
Author: aramirez
Date: Wed Apr 19 23:32:30 2006
New Revision: 395508
URL: http://svn.apache.org/viewcvs?rev=395508&view=rev
Log:
PR:MDEPLOY-30
-removed the maven-tools dependency
-improved the basic test for deploy mojo
-renamed all DeployFileMojoUnitTest referenced in DeployFileMojoUnitTest.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoUnitTest.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=395508&r1=395507&r2=395508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Wed Apr 19 23:32:30 2006
@@ -37,10 +37,5 @@
<scope>test</scope>
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-tools</artifactId>
- <version>2.1-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoUnitTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoUnitTest.java?rev=395508&r1=395507&r2=395508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoUnitTest.java (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoUnitTest.java Wed Apr 19 23:32:30 2006
@@ -29,7 +29,7 @@
* @author <a href="jerome@coffeebreaks.org">Jerome Lacoste</a>
* @version $Id$
*/
-public class DeployFileMojoTest
+public class DeployFileMojoUnitTest
extends TestCase
{
public static void main( String[] args )
@@ -39,7 +39,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite( DeployFileMojoTest.class );
+ TestSuite suite = new TestSuite( DeployFileMojoUnitTest.class );
return suite;
}
Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java?rev=395508&r1=395507&r2=395508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java Wed Apr 19 23:32:30 2006
@@ -1,6 +1,9 @@
package org.apache.maven.plugin.deploy;
import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.deploy.DeployMojo;
@@ -17,7 +20,9 @@
{
private File remoteRepo;
- private final String LOCAL_REPO = "/target/local-repo/";
+ private String LOCAL_REPO = getBasedir() + "/target/local-repo";
+
+ private String REMOTE_REPO = getBasedir() + "/target/remote-repo";
MavenProjectStub project = new MavenProjectStub();
@@ -26,7 +31,7 @@
{
super.setUp();
- remoteRepo = new File( getBasedir(), "target/remote-repo" );
+ remoteRepo = new File( REMOTE_REPO );
remoteRepo.mkdirs();
}
@@ -62,12 +67,9 @@
String packaging = ( String ) getVariableValueFromObject( mojo, "packaging" );
- artifact.setFile( file );
+ assertEquals( "jar", packaging );
- File deployedArtifact = new File( getBasedir(),
- "target/remote-repo/" + artifact.getGroupId().replace( '.', '/' ) +
- "/" + artifact.getArtifactId() + "/" + artifact.getVersion() +
- "/" + artifact.getArtifactId() + "-" + artifact.getVersion() + "." + packaging );
+ artifact.setFile( file );
ArtifactRepository repo = ( ArtifactRepository ) getVariableValueFromObject( mojo, "deploymentRepository" );
@@ -79,9 +81,104 @@
assertEquals( "file://" + getBasedir() + "/target/remote-repo", repo.getUrl() );
mojo.execute();
+
+ //check the artifact in local repository
+ List expectedFiles = new ArrayList();
+ List fileList = new ArrayList();
+
+ expectedFiles.add( "org" );
+ expectedFiles.add( "apache" );
+ expectedFiles.add( "maven" );
+ expectedFiles.add( "test" );
+ expectedFiles.add( "maven-deploy-test" );
+ expectedFiles.add( "1.0-SNAPSHOT" );
+ expectedFiles.add( "maven-metadata-deploy-test.xml" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.jar" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.pom" );
+
+ File localRepo = new File( LOCAL_REPO );
+
+ File[] files = localRepo.listFiles();
+
+ for( int i=0; i<files.length; i++ )
+ {
+ addFileToList( files[i], fileList );
+ }
+
+ assertEquals( expectedFiles.size(), fileList.size() );
+
+ assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) );
+
+ //check the artifact in remote repository
+ expectedFiles = new ArrayList();
+ fileList = new ArrayList();
+
+ expectedFiles.add( "org" );
+ expectedFiles.add( "apache" );
+ expectedFiles.add( "maven" );
+ expectedFiles.add( "test" );
+ expectedFiles.add( "maven-deploy-test" );
+ expectedFiles.add( "1.0-SNAPSHOT" );
+ expectedFiles.add( "maven-metadata.xml" );
+ expectedFiles.add( "maven-metadata.xml.md5" );
+ expectedFiles.add( "maven-metadata.xml.sha1" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.jar" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.jar.md5" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.jar.sha1" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.pom" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.pom.md5" );
+ expectedFiles.add( "maven-deploy-test-1.0-SNAPSHOT.pom.sha1" );
+
+ files = remoteRepo.listFiles();
+
+ for( int i=0; i<files.length; i++ )
+ {
+ addFileToList( files[i], fileList );
+ }
- assertTrue( "Artifact has been deployed", deployedArtifact.exists() );
+ assertEquals( expectedFiles.size(), fileList.size() );
+
+ assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) );
}
+
+ private void addFileToList( File file, List fileList )
+ {
+ System.out.println( ">> " + file.getName() );
+ if( !file.isDirectory() )
+ {
+ fileList.add( file.getName() );
+ }
+ else
+ {
+ fileList.add( file.getName() );
+
+ File[] files = file.listFiles();
+
+ for( int i=0; i<files.length; i++ )
+ {
+ addFileToList( files[i], fileList );
+ }
+ }
+ }
+
+ private int getSizeOfExpectedFiles( List fileList, List expectedFiles )
+ {
+ for( Iterator iter=fileList.iterator(); iter.hasNext(); )
+ {
+ String fileName = ( String ) iter.next();
+
+ if( expectedFiles.contains( fileName ) )
+ {
+ expectedFiles.remove( fileName );
+ assertFalse( expectedFiles.contains( fileName ) );
+ }
+ else
+ {
+ fail( fileName + " is not included in the expected files" );
+ }
+ }
+ return expectedFiles.size();
+ }
public void tearDown()
throws Exception