From 79a7f98efa3d51c3cbcb2d061462ad79e638c103 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 9 Apr 2007 21:33:54 +0000 Subject: [PATCH] Correcting tests due to constructor change in ArchivaArtifact. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@526928 13f79535-47bb-0310-9956-ffa450edef68 --- ...AbstractBidirectionalRepositoryLayoutTestCase.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java index 54c27e900..da6184bbb 100644 --- a/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java +++ b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java @@ -32,11 +32,13 @@ import java.io.File; * @author Joakim Erdfelt * @version $Id$ */ -public class AbstractBidirectionalRepositoryLayoutTestCase extends PlexusTestCase +public class AbstractBidirectionalRepositoryLayoutTestCase + extends PlexusTestCase { protected ArchivaRepository repository; - protected void setUp() throws Exception + protected void setUp() + throws Exception { super.setUp(); @@ -63,8 +65,9 @@ public class AbstractBidirectionalRepositoryLayoutTestCase extends PlexusTestCas protected ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String classifier, String type ) { - ArchivaArtifact artifact = new ArchivaArtifact( repository, groupId, artifactId, version, classifier, type ); + ArchivaArtifact artifact = new ArchivaArtifact( groupId, artifactId, version, classifier, type ); assertNotNull( artifact ); + artifact.getModel().setRepositoryId( repository.getId() ); return artifact; } @@ -86,7 +89,7 @@ public class AbstractBidirectionalRepositoryLayoutTestCase extends PlexusTestCas String version, String classifier, String type ) { String expectedId = groupId + ":" + artifactId + ":" + version + ":" + classifier + ":" + type; - + assertNotNull( expectedId + " - Should not be null.", actualArtifact ); assertEquals( expectedId + " - Group ID", actualArtifact.getGroupId(), groupId );