svn commit: r698421 - in /maven/sandbox/trunk/mercury/mercury-it/src/test: java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java resources/repo/a/a/4/a-4-sources.jar

[og...@apache.org]

Author: ogusakov
Date: Tue Sep 23 20:15:34 2008
New Revision: 698421

URL: http://svn.apache.org/viewvc?rev=698421&view=rev
Log:
cleaned th code a little

Added:
    maven/sandbox/trunk/mercury/mercury-it/src/test/resources/repo/a/a/4/a-4-sources.jar   (with props)
Modified:
    maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java

Modified: maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java?rev=698421&r1=698420&r2=698421&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java Tue Sep 23 20:15:34 2008
@@ -3,14 +3,14 @@
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.builder.api.DependencyProcessor;
-import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
 import org.apache.maven.mercury.repository.api.ArtifactResults;
 import org.apache.maven.mercury.repository.api.LocalRepository;
 import org.apache.maven.mercury.repository.api.RemoteRepository;
@@ -20,13 +20,9 @@
 import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
 import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
 import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
-import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetrievalRequest;
-import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetriever;
 import org.apache.maven.mercury.spi.http.server.HttpTestServer;
 import org.apache.maven.mercury.transport.api.Server;
 
-import junit.framework.TestCase;
-
 /**
  *
  *
@@ -37,6 +33,8 @@
 public class ReadWriteTest
 extends TestCase
 {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger( ReadWriteTest.class ); 
+
   File remoteRepoBase = new File("./target/test-classes/repo");
   public String port;
   HttpTestServer httpServer;
@@ -75,6 +73,7 @@
     localRepoBase = File.createTempFile( "local", "repo" );
     localRepoBase.delete();
     localRepoBase.mkdir();
+    log.info("local repo is in "+localRepoBase);
     
     lr = new LocalRepositoryM2( "lr", localRepoBase );
     writer = lr.getWriter(); 
@@ -93,8 +92,8 @@
   public void testOneArtifact()
   throws IllegalArgumentException, RepositoryException
   {
-    ArtifactBasicMetadata bm = new ArtifactBasicMetadata("a:a:4");
-    query.add( bm );
+    bmd = new ArtifactBasicMetadata("a:a:4");
+    query.add( bmd );
     
     ArtifactResults res = reader.readArtifacts( query );
     
@@ -107,7 +106,7 @@
     assertNotNull( resMap );
     assertFalse( resMap.isEmpty() );
     
-    List<Artifact> al = resMap.get( bm );
+    List<Artifact> al = resMap.get( bmd );
     
     assertNotNull( al );
     assertFalse( al.isEmpty() );
@@ -122,7 +121,9 @@
     File aPom = new File( localRepoBase, "a/a/4/a-4.pom" );
     assertTrue( aPom.exists() );
     
-System.out.println("local repo is in "+localRepoBase);
+    assertNotNull( a.getPomBlob() );
+    assertTrue( a.getPomBlob().length > 10 );
+    log.info( a+" - pom length is "+a.getPomBlob().length );
   }
   
   public void testOneArtifactWithClassifier()
@@ -153,8 +154,8 @@
     
     File aBin = new File( localRepoBase, "a/a/4/a-4-sources.jar" );
     assertTrue( aBin.exists() );
-    
-System.out.println("local repo is in "+localRepoBase);
+
+    log.info( a+" - pom length is "+a.getPomBlob().length );
   }
 
 }

Added: maven/sandbox/trunk/mercury/mercury-it/src/test/resources/repo/a/a/4/a-4-sources.jar
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/resources/repo/a/a/4/a-4-sources.jar?rev=698421&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/sandbox/trunk/mercury/mercury-it/src/test/resources/repo/a/a/4/a-4-sources.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream