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/plugins/problem-reports | |
| 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/plugins/problem-reports')
| -rw-r--r-- | archiva-modules/plugins/problem-reports/pom.xml | 7 | ||||
| -rw-r--r-- | archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 7dec12dc4..2a7576a1b 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -54,10 +54,11 @@ <artifactId>archiva-consumer-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-testutil</artifactId> + <version>${project.version}</version> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> diff --git a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java index 75676975e..d1012afe4 100644 --- a/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java +++ b/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java @@ -36,7 +36,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Matchers; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.inject.Inject; import javax.inject.Named; @@ -44,11 +43,12 @@ import java.io.File; import java.io.FileNotFoundException; import java.util.Arrays; import java.util.Date; +import org.apache.archiva.test.ArchivaSpringJUnit4ClassRunner; import static org.mockito.Mockito.*; @SuppressWarnings( { "ThrowableInstanceNeverThrown" } ) -@RunWith( SpringJUnit4ClassRunner.class ) +@RunWith( ArchivaSpringJUnit4ClassRunner.class ) @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class DuplicateArtifactsConsumerTest extends TestCase |