svn commit: r1128784 - in /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy: AbstractProxyTestCase.java MetadataTransferTest.java

[ol...@apache.org]

Author: olamy
Date: Sat May 28 22:15:13 2011
New Revision: 1128784

URL: http://svn.apache.org/viewvc?rev=1128784&view=rev
Log:
fix MetadataTransferTest units

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java?rev=1128784&r1=1128783&r2=1128784&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java Sat May 28 22:15:13 2011
@@ -40,6 +40,8 @@ import org.easymock.ArgumentsMatcher;
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -120,6 +122,8 @@ public abstract class AbstractProxyTestC
 
     protected MockConfiguration config;
 
+    protected Logger log = LoggerFactory.getLogger( getClass() );
+
     WagonDelegate delegate;
 
     @Inject
@@ -187,7 +191,7 @@ public abstract class AbstractProxyTestC
 
         delegate.setDelegate( wagonMock );
 
-        System.out.println( "\n.\\ " + getName() + "() \\._________________________________________\n" );
+        log.info( "\n.\\ " + getName() + "() \\._________________________________________\n" );
     }
 
     @Override

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java?rev=1128784&r1=1128783&r2=1128784&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java Sat May 28 22:15:13 2011
@@ -41,6 +41,7 @@ import org.custommonkey.xmlunit.Diff;
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -95,14 +96,15 @@ public class MetadataTransferTest
     extends AbstractProxyTestCase
 {
 
+    @Inject
     private MetadataTools metadataTools;
 
     @Before
     public void init()
         throws Exception
     {
-        super.setUp();
-        metadataTools = applicationContext.getBean( MetadataTools.class );
+        //super.setUp();
+        //metadataTools = applicationContext.getBean( MetadataTools.class );
     }
 
     @Test
@@ -187,6 +189,8 @@ public class MetadataTransferTest
         String requestedResource = "org/apache/maven/test/get-default-metadata-nonexistant/maven-metadata.xml";
         setupTestableManagedRepository( requestedResource );
 
+        config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
+
         assertResourceNotFound( requestedResource );
 
         // No proxy setup, nothing fetched, failure expected.