Author: brett
Date: Sun Jan 15 19:51:51 2006
New Revision: 369333
URL: http://svn.apache.org/viewcvs?rev=369333&view=rev
Log:
[MRM-9] test metadata conversion
Added:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
(contents, props changed)
- copied, changed from r369330,
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
(with props)
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
(contents, props changed)
- copied, changed from r369330,
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
(with props)
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
Added:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml?rev=369333&view=auto
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
(added)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
Sun Jan 15 19:51:51 2006
@@ -0,0 +1,9 @@
+<metadata>
+ <groupId>test</groupId>
+ <artifactId>v3artifact</artifactId>
+ <versioning>
+ <versions>
+ <version>1.0.0</version>
+ </versions>
+ </versioning>
+</metadata>
\ No newline at end of file
Copied:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
(from r369330,
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml)
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml?p2=maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml&p1=maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml&r1=369330&r2=369333&rev=369333&view=diff
==============================================================================
(empty)
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml?rev=369333&r1=369332&r2=369333&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
Sun Jan 15 19:51:51 2006
@@ -2,5 +2,5 @@
<groupId>test</groupId>
<artifactId>v3artifact</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <versioning/>
+ <versioning />
</metadata>
Added:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml?rev=369333&view=auto
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
(added)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
Sun Jan 15 19:51:51 2006
@@ -0,0 +1,6 @@
+<metadata>
+ <groupId>test</groupId>
+ <artifactId>v3artifact</artifactId>
+ <version>1.0.0</version>
+ <versioning />
+</metadata>
\ No newline at end of file
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml?rev=369333&view=auto
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
(added)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
Sun Jan 15 19:51:51 2006
@@ -0,0 +1,9 @@
+<metadata>
+ <groupId>test</groupId>
+ <artifactId>v4artifact</artifactId>
+ <versioning>
+ <versions>
+ <version>1.0.0</version>
+ </versions>
+ </versioning>
+</metadata>
\ No newline at end of file
Copied:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
(from r369330,
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml)
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml?p2=maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml&p1=maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml&r1=369330&r2=369333&rev=369333&view=diff
==============================================================================
(empty)
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml?rev=369333&r1=369332&r2=369333&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
Sun Jan 15 19:51:51 2006
@@ -2,5 +2,5 @@
<groupId>test</groupId>
<artifactId>v4artifact</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <versioning/>
+ <versioning />
</metadata>
Added:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml?rev=369333&view=auto
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
(added)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
Sun Jan 15 19:51:51 2006
@@ -0,0 +1,6 @@
+<metadata>
+ <groupId>test</groupId>
+ <artifactId>v4artifact</artifactId>
+ <version>1.0.0</version>
+ <versioning />
+</metadata>
\ No newline at end of file
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java?rev=369333&r1=369332&r2=369333&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
Sun Jan 15 19:51:51 2006
@@ -89,6 +89,16 @@
// test that it is copied as is
Artifact artifact = createArtifact( "test", "v4artifact", "1.0.0" );
+ ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata(
artifact );
+ File artifactMetadataFile = new File( targetRepository.getBasedir(),
+
targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
+ artifactMetadataFile.delete();
+
+ ArtifactMetadata versionMetadata = new
SnapshotArtifactRepositoryMetadata( artifact );
+ File versionMetadataFile = new File( targetRepository.getBasedir(),
+
targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
+ versionMetadataFile.delete();
+
repositoryConverter.convert( artifact, targetRepository );
File artifactFile = new File( targetRepository.getBasedir(),
targetRepository.pathOf( artifact ) );
@@ -102,7 +112,17 @@
compareFiles( sourcePomFile, pomFile );
- // TODO: metadata
+ assertTrue( "Check artifact metadata created",
artifactMetadataFile.exists() );
+
+ File expectedMetadataFile = getTestFile(
"src/test/expected-files/v4-artifact-metadata.xml" );
+
+ compareFiles( expectedMetadataFile, artifactMetadataFile );
+
+ assertTrue( "Check snapshot metadata created",
versionMetadataFile.exists() );
+
+ expectedMetadataFile = getTestFile(
"src/test/expected-files/v4-version-metadata.xml" );
+
+ compareFiles( expectedMetadataFile, versionMetadataFile );
}
public void testV3PomConvert()
@@ -111,6 +131,16 @@
// test that the pom is coverted
Artifact artifact = createArtifact( "test", "v3artifact", "1.0.0" );
+ ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata(
artifact );
+ File artifactMetadataFile = new File( targetRepository.getBasedir(),
+
targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
+ artifactMetadataFile.delete();
+
+ ArtifactMetadata versionMetadata = new
SnapshotArtifactRepositoryMetadata( artifact );
+ File versionMetadataFile = new File( targetRepository.getBasedir(),
+
targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
+ versionMetadataFile.delete();
+
repositoryConverter.convert( artifact, targetRepository );
File artifactFile = new File( targetRepository.getBasedir(),
targetRepository.pathOf( artifact ) );
@@ -124,7 +154,17 @@
compareFiles( expectedPomFile, pomFile );
- // TODO: metadata
+ assertTrue( "Check artifact metadata created",
artifactMetadataFile.exists() );
+
+ File expectedMetadataFile = getTestFile(
"src/test/expected-files/v3-artifact-metadata.xml" );
+
+ compareFiles( expectedMetadataFile, artifactMetadataFile );
+
+ assertTrue( "Check snapshot metadata created",
versionMetadataFile.exists() );
+
+ expectedMetadataFile = getTestFile(
"src/test/expected-files/v3-version-metadata.xml" );
+
+ compareFiles( expectedMetadataFile, versionMetadataFile );
}
public void testV3PomWarningsOnConvert()
@@ -165,7 +205,7 @@
assertTrue( "Check artifact metadata created",
artifactMetadataFile.exists() );
- File expectedMetadataFile = getTestFile(
"src/test/expected-files/v4-artifact-metadata.xml" );
+ File expectedMetadataFile = getTestFile(
"src/test/expected-files/v4-snapshot-artifact-metadata.xml" );
compareFiles( expectedMetadataFile, artifactMetadataFile );
@@ -207,7 +247,7 @@
assertTrue( "Check artifact metadata created",
artifactMetadataFile.exists() );
- File expectedMetadataFile = getTestFile(
"src/test/expected-files/v3-artifact-metadata.xml" );
+ File expectedMetadataFile = getTestFile(
"src/test/expected-files/v3-snapshot-artifact-metadata.xml" );
compareFiles( expectedMetadataFile, artifactMetadataFile );
@@ -249,7 +289,7 @@
assertTrue( "Check artifact metadata created",
artifactMetadataFile.exists() );
- File expectedMetadataFile = getTestFile(
"src/test/expected-files/v4-artifact-metadata.xml" );
+ File expectedMetadataFile = getTestFile(
"src/test/expected-files/v4-snapshot-artifact-metadata.xml" );
compareFiles( expectedMetadataFile, artifactMetadataFile );
@@ -291,7 +331,7 @@
assertTrue( "Check artifact snapshotMetadata created",
artifactMetadataFile.exists() );
- File expectedMetadataFile = getTestFile(
"src/test/expected-files/v3-artifact-metadata.xml" );
+ File expectedMetadataFile = getTestFile(
"src/test/expected-files/v3-snapshot-artifact-metadata.xml" );
compareFiles( expectedMetadataFile, artifactMetadataFile );
