You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/29 17:43:10 UTC
svn commit: r729937 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
resources/mng-1021/pom.xml
Author: bentmann
Date: Mon Dec 29 08:43:10 2008
New Revision: 729937
URL: http://svn.apache.org/viewvc?rev=729937&view=rev
Log:
o Strengthened IT to check timestamp and build number of all deployed files
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1021/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java?rev=729937&r1=729936&r2=729937&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java Mon Dec 29 08:43:10 2008
@@ -35,7 +35,7 @@
{
/**
- * Test that source attachments have the same build number as the main
+ * Test that source attachments have the same build number and timestamp as the main
* artifact when deployed.
*/
public void testitMNG1021()
@@ -43,13 +43,48 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1021" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.deleteDirectory( "repo" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
verifier.executeGoal( "initialize" );
- verifier.assertFilePresent(
- "target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1.jar" );
- verifier.assertFilePresent(
- "target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1-it.jar" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "SNAPSHOT", "pom" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "SNAPSHOT", "jar" );
+
+ String dir = "repo/org/apache/maven/its/mng1021/test/";
+ String snapshot = getSnapshotVersion( new File( testDir, dir + "SNAPSHOT" ) );
+ assertTrue( snapshot, snapshot.endsWith( "-1" ) );
+
+ verifier.assertFilePresent( dir + "maven-metadata.xml" );
+ verifier.assertFilePresent( dir + "maven-metadata.xml.md5" );
+ verifier.assertFilePresent( dir + "maven-metadata.xml.sha1" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/maven-metadata.xml" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/maven-metadata.xml.md5" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/maven-metadata.xml.sha1" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".pom" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".pom.md5" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".pom.sha1" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".jar" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".jar.md5" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + ".jar.sha1" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + "-it.jar" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + "-it.jar.md5" );
+ verifier.assertFilePresent( dir + "SNAPSHOT/test-" + snapshot + "-it.jar.sha1" );
+ }
+
+ private String getSnapshotVersion( File artifactDir )
+ {
+ File[] files = artifactDir.listFiles();
+ for ( int i = 0; i < files.length; i++ )
+ {
+ String name = files[i].getName();
+ if ( name.endsWith( ".pom" ) )
+ {
+ return name.substring( "test-".length(), name.length() - ".pom".length() );
+ }
+ }
+ throw new IllegalStateException( "POM not found in " + artifactDir );
}
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1021/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1021/pom.xml?rev=729937&r1=729936&r2=729937&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1021/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1021/pom.xml Mon Dec 29 08:43:10 2008
@@ -22,11 +22,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0079</groupId>
- <artifactId>maven-it-it0079</artifactId>
+ <groupId>org.apache.maven.its.mng1021</groupId>
+ <artifactId>test</artifactId>
<version>SNAPSHOT</version>
- <name>Maven Integration Test :: it0079</name>
+ <name>Maven Integration Test :: MNG-1021</name>
<description>
Test that attached artifacts have the same build number as the main
artifact when deployed.
@@ -36,7 +36,7 @@
<snapshotRepository>
<id>test</id>
<name>Test Repo</name>
- <url>file:target/test-repo</url>
+ <url>file:repo</url>
</snapshotRepository>
</distributionManagement>