Author: olamy
Date: Mon Oct 29 21:03:40 2012
New Revision: 1403514
URL: http://svn.apache.org/viewvc?rev=1403514&view=rev
Log:
more unit tests fixes
Added:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
(contents, props changed)
- copied, changed from r1403513,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/MockConfiguration.java
Removed:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/MockConfiguration.java
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java?rev=1403514&r1=1403513&r2=1403514&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
Mon Oct 29 21:03:40 2012
@@ -33,8 +33,6 @@ import static org.junit.Assert.*;
/**
* AbstractDefaultRepositoryContentTestCase
*/
-@RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = {
"classpath*:/META-INF/spring-context.xml",
"classpath:/spring-context-no-mock-conf.xml" } )
public abstract class AbstractDefaultRepositoryContentTestCase
extends AbstractRepositoryLayerTestCase
{
Copied:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
(from r1403513,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/MockConfiguration.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java?p2=archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java&p1=archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/MockConfiguration.java&r1=1403513&r2=1403514&rev=1403514&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/MockConfiguration.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
Mon Oct 29 21:03:40 2012
@@ -1,4 +1,4 @@
-package org.apache.archiva.repository;
+package org.apache.archiva.metadata.repository.storage.maven2.conf;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -40,6 +40,7 @@ import java.util.Set;
public class MockConfiguration
implements ArchivaConfiguration
{
+
private Configuration configuration = new Configuration();
private Set<RegistryListener> registryListeners = new
HashSet<RegistryListener>();
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java?rev=1403514&r1=1403513&r2=1403514&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
Mon Oct 29 21:03:40 2012
@@ -37,7 +37,7 @@ import org.apache.archiva.test.utils.Arc
*
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml",
"classpath:/spring-context-no-mock-conf.xml" } )
public abstract class AbstractRepositoryLayerTestCase
{
@Rule
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java?rev=1403514&r1=1403513&r2=1403514&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
Mon Oct 29 21:03:40 2012
@@ -30,7 +30,7 @@ import org.apache.archiva.policies.Relea
import org.apache.archiva.policies.SnapshotsPolicy;
import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.MockConfiguration;
+import
org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration;
import org.apache.archiva.repository.RemoteRepositoryContent;
import org.apache.archiva.repository.layout.LayoutException;
import org.apache.commons.io.FileUtils;
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml?rev=1403514&r1=1403513&r2=1403514&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-metadata-tools-test.xml
Mon Oct 29 21:03:40 2012
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
default-lazy-init="true">
- <bean name="archivaConfiguration#mock"
class="org.apache.archiva.repository.MockConfiguration"/>
+ <bean name="archivaConfiguration#mock"
class="org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration"/>
<alias name="archivaConfiguration#mock"
alias="archivaConfiguration#default"/>
<bean name="metadataTools#test"
class="org.apache.archiva.repository.metadata.MetadataTools">
<property name="configuration" ref="archivaConfiguration#mock"/>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml?rev=1403514&r1=1403513&r2=1403514&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/spring-context-no-mock-conf.xml
Mon Oct 29 21:03:40 2012
@@ -25,6 +25,8 @@
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
- <alias name="archivaConfiguration#mock"
alias="archivaConfiguration#default"/>
- <alias name="archivaConfiguration#mock" alias="archivaConfiguration#test"/>
+
+ <context:annotation-config/>
+ <context:component-scan
base-package="org.apache.archiva.metadata.repository.storage.maven2.conf"/>
+
</beans>
\ No newline at end of file
