svn commit: r630334 - in /maven/plugins/trunk/maven-deploy-plugin: pom.xml src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java

[olamy]

Author: olamy
Date: Fri Feb 22 14:17:27 2008
New Revision: 630334

URL: http://svn.apache.org/viewvc?rev=630334&view=rev
Log:
fix unit tests due to the change of 
org.apache.maven.plugin.testing.stubs.ArtifactStub which now returns true in 
the method isSnapshot()


Modified:
    maven/plugins/trunk/maven-deploy-plugin/pom.xml
    
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
    
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java

Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=630334&r1=630333&r2=630334&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Fri Feb 22 14:17:27 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>8</version>
+    <version>10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-deploy-plugin</artifactId>

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java?rev=630334&r1=630333&r2=630334&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
 Fri Feb 22 14:17:27 2008
@@ -139,7 +139,9 @@
         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" );
-
+        // as we are in SNAPSHOT the file is here twice
+        expectedFiles.add( "maven-metadata-deploy-test.xml" );
+        
         File localRepo = new File( LOCAL_REPO, "" );
         
         File[] files = localRepo.listFiles();
@@ -172,6 +174,10 @@
         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" );
+        // as we are in SNAPSHOT the file is here twice
+        expectedFiles.add( "maven-metadata.xml" );
+        expectedFiles.add( "maven-metadata.xml.md5" );
+        expectedFiles.add( "maven-metadata.xml.sha1" );
         
         remoteRepo = new File( remoteRepo, "basic-deploy-test" );
         
@@ -226,7 +232,10 @@
         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" );
-  
+        // as we are in SNAPSHOT the file is here twice
+        expectedFiles.add( "maven-metadata.xml" );
+        expectedFiles.add( "maven-metadata.xml.md5" );
+        expectedFiles.add( "maven-metadata.xml.sha1" ); 
         remoteRepo = new File( remoteRepo, "basic-deploy-pom" );
         
         File[] files = remoteRepo.listFiles();
@@ -356,6 +365,10 @@
         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" );
+        // as we are in SNAPSHOT the file is here twice
+        expectedFiles.add( "maven-metadata.xml" );
+        expectedFiles.add( "maven-metadata.xml.md5" );
+        expectedFiles.add( "maven-metadata.xml.sha1" );         
         expectedFiles.add( "attached-artifact-test-0" );
         expectedFiles.add( "1.0-SNAPSHOT" );
         expectedFiles.add( "maven-metadata.xml" );
@@ -363,7 +376,11 @@
         expectedFiles.add( "maven-metadata.xml.sha1" );
         expectedFiles.add( "attached-artifact-test-0-1.0-SNAPSHOT.jar" );
         expectedFiles.add( "attached-artifact-test-0-1.0-SNAPSHOT.jar.md5" );
-        expectedFiles.add( "attached-artifact-test-0-1.0-SNAPSHOT.jar.sha1" ); 
  
+        expectedFiles.add( "attached-artifact-test-0-1.0-SNAPSHOT.jar.sha1" );
+        // as we are in SNAPSHOT the file is here twice
+        expectedFiles.add( "maven-metadata.xml" );
+        expectedFiles.add( "maven-metadata.xml.md5" );
+        expectedFiles.add( "maven-metadata.xml.sha1" );         
         
         remoteRepo = new File( remoteRepo, 
"basic-deploy-with-attached-artifacts" );
         

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java?rev=630334&r1=630333&r2=630334&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/DeployArtifactStub.java
 Fri Feb 22 14:17:27 2008
@@ -123,4 +123,11 @@
     {
         this.release = release;
     }
+
+    /*
+    public boolean isSnapshot()
+    {
+        return false;
+    }
+    */
 }