You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/06/29 13:56:56 UTC
svn commit: r1355332 -
/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
Author: olamy
Date: Fri Jun 29 11:56:55 2012
New Revision: 1355332
URL: http://svn.apache.org/viewvc?rev=1355332&view=rev
Log:
get configuration directly from spring to see if that fix 1.7 issues
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java?rev=1355332&r1=1355331&r2=1355332&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java Fri Jun 29 11:56:55 2012
@@ -22,7 +22,6 @@ package org.apache.archiva.configuration
import junit.framework.TestCase;
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.redback.components.registry.RegistryException;
-import org.apache.archiva.redback.components.springutils.ComponentContainer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.custommonkey.xmlunit.XMLAssert;
@@ -31,6 +30,7 @@ import org.junit.Test;
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;
@@ -51,7 +51,10 @@ public class ArchivaConfigurationTest
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- private ComponentContainer componentContainer;
+ protected ApplicationContext applicationContext;
+
+ @Inject
+ FileTypes filetypes;
public static File getTestFile( String path )
{
@@ -60,13 +63,9 @@ public class ArchivaConfigurationTest
protected <T> T lookup( Class<T> clazz, String hint )
{
- return componentContainer.getComponent( clazz, hint );
+ return (T) applicationContext.getBean( "archivaConfiguration#" + hint, ArchivaConfiguration.class );
}
- protected <T> T lookup( Class<T> clazz )
- {
- return componentContainer.getComponent( clazz );
- }
@Test
public void testGetConfigurationFromRegistryWithASingleNamedConfigurationResource()
@@ -151,7 +150,6 @@ public class ArchivaConfigurationTest
int proxyConnectorExpected )
throws Exception
{
- FileTypes filetypes = lookup( FileTypes.class );
assertEquals( "check managed repositories: " + configuration.getManagedRepositories(), managedExpected,
configuration.getManagedRepositories().size() );