Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix again windauze issue 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1214954 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-12-15 20:47:37 +00:00
parent 2739ced315
commit f5183ff08b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
View File

@ -20,12 +20,12 @@ package org.apache.archiva.stagerepository.merge;
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.RepositoryScanningConfiguration; import org.apache.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -86,7 +86,7 @@ public class Maven2RepositoryMergerTest
Configuration c = new Configuration(); Configuration c = new Configuration();
ManagedRepositoryConfiguration testRepo = new ManagedRepositoryConfiguration(); ManagedRepositoryConfiguration testRepo = new ManagedRepositoryConfiguration();
testRepo.setId( TEST_REPO_ID ); testRepo.setId( TEST_REPO_ID );
testRepo.setLocation( "target/test-repository" ); testRepo.setLocation( "target" + File.separatorChar + "test-repository" );
RepositoryScanningConfiguration repoScanConfig = new RepositoryScanningConfiguration(); RepositoryScanningConfiguration repoScanConfig = new RepositoryScanningConfiguration();
List<String> knownContentConsumers = new ArrayList<String>(); List<String> knownContentConsumers = new ArrayList<String>();
@ -126,9 +126,10 @@ public class Maven2RepositoryMergerTest
Configuration c = new Configuration(); Configuration c = new Configuration();
ManagedRepositoryConfiguration testRepo = new ManagedRepositoryConfiguration(); ManagedRepositoryConfiguration testRepo = new ManagedRepositoryConfiguration();
testRepo.setId( TEST_REPO_ID ); testRepo.setId( TEST_REPO_ID );
testRepo.setLocation( "target/test-repository" ); testRepo.setLocation( "target" + File.separatorChar + "test-repository" );
String sourceRepo = "src/test/resources/test-repository-with-conflict-artifacts"; String sourceRepo = "src" + File.separatorChar + "test" + File.separatorChar + "resources" + File.separatorChar
+ "test-repository-with-conflict-artifacts";
ManagedRepositoryConfiguration testRepoWithConflicts = new ManagedRepositoryConfiguration(); ManagedRepositoryConfiguration testRepoWithConflicts = new ManagedRepositoryConfiguration();
testRepoWithConflicts.setId( sourceRepoId ); testRepoWithConflicts.setId( sourceRepoId );
testRepoWithConflicts.setLocation( sourceRepo ); testRepoWithConflicts.setLocation( sourceRepo );