diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-07-02 07:36:23 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-07-02 07:36:23 +0000 |
| commit | 1484a3316addf47d88f4f05191ae4e570871eda7 (patch) | |
| tree | 596b70b3f0975c00274bc3d2b2580092cc1390f5 /archiva-modules/archiva-base/archiva-repository-scanner/src | |
| parent | e3885c59da2e4748e2ba494f3901902be0470067 (diff) | |
| download | archiva-1484a3316addf47d88f4f05191ae4e570871eda7.tar.gz archiva-1484a3316addf47d88f4f05191ae4e570871eda7.zip | |
[MRM-1638] Improve unit test for archiva build
Based on patch provided by Eric Barboni.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356091 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-repository-scanner/src')
2 files changed, 4 insertions, 4 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java index e36b9fe45..a5d84621e 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java @@ -40,7 +40,6 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.core.env.Environment; import org.springframework.core.io.Resource; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.inject.Inject; import java.io.File; @@ -53,13 +52,14 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner; /** * RepositoryContentConsumersTest * * @version $Id$ */ -@RunWith( SpringJUnit4ClassRunner.class ) +@RunWith( ArchivaSpringJUnit4ClassRunner.class ) @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class RepositoryContentConsumersTest extends TestCase diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java index 89896838b..8b24abadd 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java @@ -29,7 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.inject.Inject; import java.io.File; @@ -41,13 +40,14 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.TimeZone; +import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner; /** * RepositoryScannerTest * * @version $Id$ */ -@RunWith( SpringJUnit4ClassRunner.class ) +@RunWith( ArchivaSpringJUnit4ClassRunner.class ) @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } ) public class RepositoryScannerTest extends TestCase |