PR: MRM-13

moved the expected files from target-repository to expected-files

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@379728 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java b/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
index 55032e5196b9f4d75a205fc55a1570f65f6bd09a..b2a0512aca3026dca827cdd2254dc0db491bf618 100644 (file)
--- a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
+++ b/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
@@ -206,14 +206,14 @@ public class RepositoryConverterTest
         assertTrue( "Check if relocated artifact matches",
                     FileUtils.contentEquals( artifactFile, artifact.getFile() ) );
         Artifact pomArtifact = createArtifact( "relocated-test", "relocated-v3artifact", "1.0.0", "1.0.0", "pom" );
-        File pomFile = getTestFile( "src/test/target-repository/" + targetRepository.pathOf( pomArtifact ) );
+        File pomFile = getTestFile( "src/test/expected-files/" + targetRepository.pathOf( pomArtifact ) );
         File testFile = getTestFile( "target/test-target-repository/" + targetRepository.pathOf( pomArtifact ) );
         assertTrue( "Check if expected relocated pom matches", FileUtils.contentEquals( pomFile, testFile ) );
 
         Artifact orig = createArtifact( "test", "relocated-v3artifact", "1.0.0", "1.0.0", "pom" );
         artifactFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( orig ) );
         assertTrue( "Check if relocation artifact pom is created", artifactFile.exists() );
-        testFile = getTestFile( "src/test/target-repository/" + targetRepository.pathOf( orig ) );
+        testFile = getTestFile( "src/test/expected-files/" + targetRepository.pathOf( orig ) );
         assertTrue( "Check if expected artifact matches", FileUtils.contentEquals( artifactFile, testFile ) );
     }
 

diff --git a/maven-repository-converter/src/test/target-repository/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/maven-repository-converter/src/test/target-repository/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
deleted file mode 100644 (file)
index 29ef827..0000000
--- a/maven-repository-converter/src/test/target-repository/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
+++ /dev/null
@@ -1 +0,0 @@
-v3

diff --git a/maven-repository-converter/src/test/target-repository/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/maven-repository-converter/src/test/target-repository/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
deleted file mode 100644 (file)
index 253ef34..0000000
--- a/maven-repository-converter/src/test/target-repository/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
+++ /dev/null
@@ -1,22 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>relocated-test</groupId>
-  <artifactId>relocated-v3artifact</artifactId>
-  <version>1.0.0</version>
-  <scm>
-    <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>groupId</groupId>
-      <artifactId>artifactId</artifactId>
-      <version>version</version>
-    </dependency>
-    <dependency>
-      <groupId>groupId</groupId>
-      <artifactId>test-artifactId</artifactId>
-      <version>version</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

diff --git a/maven-repository-converter/src/test/target-repository/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/maven-repository-converter/src/test/target-repository/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
deleted file mode 100644 (file)
index b20f62f..0000000
--- a/maven-repository-converter/src/test/target-repository/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
+++ /dev/null
@@ -1,12 +0,0 @@
-<project>
-  <groupId>test</groupId>
-  <artifactId>relocated-v3artifact</artifactId>
-  <version>1.0.0</version>
-  <distributionManagement>
-    <relocation>
-      <groupId>relocated-test</groupId>
-      <artifactId>relocated-v3artifact</artifactId>
-      <version>1.0.0</version>
-    </relocation>
-  </distributionManagement>
-</project>
\ No newline at end of file