You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/01/21 06:40:05 UTC

svn commit: r736224 - in /maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury: plexus/DefaultPlexusMercuryTest.java repository/tests/VirtualRepositoryReaderIntegratedTest.java

Author: ogusakov
Date: Tue Jan 20 21:40:05 2009
New Revision: 736224

URL: http://svn.apache.org/viewvc?rev=736224&view=rev
Log:
[MERCURY-72] - added other no metadata tests to ITs

Modified:
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=736224&r1=736223&r2=736224&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Tue Jan 20 21:40:05 2009
@@ -219,6 +219,23 @@
     assertNull( res );
   }
   //-------------------------------------------------------------------------------------
+  public void testResolveNonExistent()
+  {
+    ArtifactMetadata bmd = new ArtifactMetadata( "does.not:exist:1.0" );
+    
+    Collection<ArtifactMetadata> res = null;
+    try
+    {
+        res = pm.resolve( repos, ArtifactScopeEnum.compile, bmd );
+    }
+    catch ( RepositoryException e )
+    {
+        fail( "reading non-existent artifact should not raise an exception, got "+e.getMessage() );
+    }
+    
+    assertNull( res );
+  }
+  //-------------------------------------------------------------------------------------
   public void testResolve()
   throws Exception
   {

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java?rev=736224&r1=736223&r2=736224&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java Tue Jan 20 21:40:05 2009
@@ -28,8 +28,10 @@
 
 import org.apache.maven.mercury.MavenDependencyProcessor;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
+import org.apache.maven.mercury.repository.api.ArtifactResults;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.api.RepositoryException;
 import org.apache.maven.mercury.repository.api.RepositoryUpdateIntervalPolicy;
@@ -44,6 +46,7 @@
 import org.apache.maven.mercury.spi.http.server.HttpTestServer;
 import org.apache.maven.mercury.transport.api.Server;
 import org.apache.maven.mercury.util.FileUtil;
+import org.apache.maven.mercury.util.Util;
 
 public class VirtualRepositoryReaderIntegratedTest
 extends TestCase
@@ -184,9 +187,9 @@
     }
   }
   //-------------------------------------------------------------------------
-  public void testReadBadMetadata()
+  public void testReadBadVersions()
   {
-    ArtifactBasicMetadata bmd = new ArtifactBasicMetadata("r:r:1");
+    ArtifactBasicMetadata bmd = new ArtifactBasicMetadata("does.not:exist:1.0");
     List<ArtifactBasicMetadata> q = THelper.toList( bmd );
     
     ArtifactBasicResults vres = null;
@@ -203,5 +206,44 @@
     
   }
   //-------------------------------------------------------------------------
+  public void testReadBadDependencies()
+  {
+    ArtifactBasicMetadata bmd = new ArtifactBasicMetadata("does.not:exist:1.0");
+    
+    ArtifactMetadata vres = null;
+    try
+    {
+        vres = _vr.readDependencies( bmd );
+    }
+    catch ( Exception e )
+    {
+        fail("reading non-existing artifact throws an exception");
+    }
+     
+    assertTrue( Util.isEmpty( vres.getDependencies() ) );
+    
+  }
+  //-------------------------------------------------------------------------
+  public void testReadBadArtifact()
+  {
+      ArtifactBasicMetadata bmd = new ArtifactBasicMetadata("does.not:exist:1.0");
+      List<ArtifactBasicMetadata> q = THelper.toList( bmd );
+      
+    ArtifactResults vres = null;
+    try
+    {
+        vres = _vr.readArtifacts(  q );
+    }
+    catch ( Exception e )
+    {
+        fail("reading non-existing artifact throws an exception");
+    }
+    
+    assertNotNull( vres );
+    
+    assertFalse( vres.hasResults() );
+    
+  }
+  //-------------------------------------------------------------------------
   //-------------------------------------------------------------------------
 }