You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/09/18 03:24:11 UTC
svn commit: r696529 - in /maven/sandbox/trunk/mercury: mercury-it/
mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/
mercury-repo/mercury-repo-local-m2/src/test/resources/
Author: ogusakov
Date: Wed Sep 17 18:24:11 2008
New Revision: 696529
URL: http://svn.apache.org/viewvc?rev=696529&view=rev
Log:
finally tests back to normal
Removed:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/maven-core-2.0.9.jar
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/maven-core-2.0.9.jar.sha1
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/maven-core-2.0.9.pom
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/maven-core-2.0.9.pom.sha1
Modified:
maven/sandbox/trunk/mercury/mercury-it/pom.xml
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
Modified: maven/sandbox/trunk/mercury/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/pom.xml?rev=696529&r1=696528&r2=696529&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-it/pom.xml Wed Sep 17 18:24:11 2008
@@ -13,7 +13,7 @@
<properties>
<plexus.appbooter.version>1.4</plexus.appbooter.version>
<plexus.container.version>1.0-alpha-47</plexus.container.version>
- <nexus.version>1.0.0</nexus.version>
+ <nexus.version>1.0.1</nexus.version>
<nexus.client.version>1.1.0-SNAPSHOT</nexus.client.version>
<jetty.version>7.0-SNAPSHOT</jetty.version>
@@ -179,15 +179,6 @@
<version>1.8</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-webapp</artifactId>
- <version>${nexus.version}</version>
- <classifier>bundle</classifier>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.sonatype.appbooter</groupId>
@@ -196,9 +187,24 @@
</dependency>
<dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-rest-client-java</artifactId>
- <version>${nexus.client.version}</version>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-rest-api</artifactId>
+ <version>${nexus.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-rest-client-java</artifactId>
+ <version>${nexus.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-webapp</artifactId>
+ <version>${nexus.version}</version>
+ <classifier>bundle</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=696529&r1=696528&r2=696529&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java (original)
+++ maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java Wed Sep 17 18:24:11 2008
@@ -66,6 +66,11 @@
File f;
File artifactBinary;
+ long binarySize = -1L;
+
+ File artifactPom;
+ long pomSize = -1L;
+ byte [] pomBytes;
static PlexusContainer plexus;
@@ -99,6 +104,12 @@
artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ binarySize = artifactBinary.length();
+
+ artifactPom = File.createTempFile( "test-repo-writer", "pom" );
+ FileUtil.writeRawData( artifactPom, getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) );
+ pomSize = artifactPom.length();
+ pomBytes = FileUtil.readRawData( artifactPom );
}
@@ -136,7 +147,7 @@
Set<Artifact> artifacts = new HashSet<Artifact>(3);
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9") );
- da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
+ da.setPomBlob( pomBytes );
da.setFile( artifactBinary );
artifacts.add( da );
@@ -157,14 +168,14 @@
FileUtil.verify( f, vFacSha1, false, true );
assertTrue( af.exists() );
- assertEquals( 159630, af.length() );
+ assertEquals( binarySize, af.length() );
assertTrue( new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.asc").exists() );
FileUtil.verify( af, vFacPgp, false, true );
assertTrue( new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.sha1").exists() );
FileUtil.verify( af, vFacSha1, false, true );
assertTrue( ap.exists() );
- assertEquals( 7785, ap.length() );
+ assertEquals( pomSize, ap.length() );
assertTrue( new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.asc").exists() );
FileUtil.verify( ap, vFacPgp, false, true );
assertTrue( new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1").exists() );
@@ -178,7 +189,7 @@
Set<Artifact> artifacts = new HashSet<Artifact>(3);
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-8") );
- da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
+ da.setPomBlob( pomBytes );
da.setFile( artifactBinary );
artifacts.add( da );
@@ -186,11 +197,11 @@
File af = new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080805.215925-8.jar");
assertTrue( af.exists() );
- assertEquals( 159630, af.length() );
+ assertEquals( binarySize, af.length() );
File ap = new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080805.215925-8.pom");
assertTrue( ap.exists() );
- assertEquals( 7785, ap.length() );
+ assertEquals( pomSize, ap.length() );
}
public void testWriteSnapshot()
@@ -200,7 +211,7 @@
Set<Artifact> set = new HashSet<Artifact>(3);
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-SNAPSHOT") );
- da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
+ da.setPomBlob( pomBytes );
da.setFile( artifactBinary );
set.add( da );
@@ -208,11 +219,11 @@
File af = new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar");
assertTrue( af.exists() );
- assertEquals( 159630, af.length() );
+ assertEquals( binarySize, af.length() );
File ap = new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.pom");
assertTrue( ap.exists() );
- assertEquals( 7785, ap.length() );
+ assertEquals( pomSize, ap.length() );
}
public void testWriteContentionSingleArtifact()
@@ -228,7 +239,7 @@
String si = ""+i;
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-"+si) );
- da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
+ da.setPomBlob( pomBytes );
File ab = File.createTempFile( "test-core-", "-bin" );
FileUtil.writeRawData( ab, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
da.setFile( ab );
@@ -252,13 +263,13 @@
String fn = targetDirectory.getAbsolutePath()+"/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080805.215925-"+si+".jar";
File af = new File( fn );
assertTrue( fn+" does not exist", af.exists() );
- assertEquals( 159630, af.length() );
+ assertEquals( binarySize, af.length() );
// is pom there also?
fn = targetDirectory.getAbsolutePath()+"/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080805.215925-"+si+".pom";
File ap = new File( fn );
assertTrue( fn+" does not exist", ap.exists() );
- assertEquals( 7785, ap.length() );
+ assertEquals( pomSize, ap.length() );
}
// check GAV metadata has all versions
@@ -297,14 +308,14 @@
String si = ""+i;
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0."+si+"-SNAPSHOT") );
- da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
+ da.setPomBlob( pomBytes );
File ab = File.createTempFile( "test-core-", "-bin" );
FileUtil.writeRawData( ab, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
da.setFile( ab );
set.add( da );
da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-mercury:2.0."+si+"-SNAPSHOT") );
- da.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
+ da.setPomBlob( pomBytes );
ab = File.createTempFile( "test-mercury-", "-bin" );
FileUtil.writeRawData( ab, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
da.setFile( ab );
@@ -328,22 +339,22 @@
String fn = targetDirectory.getAbsolutePath()+"/org/apache/maven/maven-core/2.0."+si+"-SNAPSHOT/maven-core-2.0."+si+"-SNAPSHOT.jar";
File af = new File( targetDirectory, "/org/apache/maven/maven-core/2.0."+si+"-SNAPSHOT/maven-core-2.0."+si+"-SNAPSHOT.jar" );
assertTrue( fn+" does not exist", af.exists() );
- assertEquals( 159630, af.length() );
+ assertEquals( binarySize, af.length() );
fn = targetDirectory.getAbsolutePath()+"/org/apache/maven/maven-core/2.0."+si+"-SNAPSHOT/maven-core-2.0."+si+"-SNAPSHOT.pom";
File ap = new File( targetDirectory, "/org/apache/maven/maven-core/2.0."+si+"-SNAPSHOT/maven-core-2.0."+si+"-SNAPSHOT.pom");
assertTrue( fn+" does not exist", ap.exists() );
- assertEquals( 7785, ap.length() );
+ assertEquals( pomSize, ap.length() );
fn = targetDirectory.getAbsolutePath()+"/org/apache/maven/maven-mercury/2.0."+si+"-SNAPSHOT/maven-mercury-2.0."+i+"-SNAPSHOT.jar";
af = new File( targetDirectory, "/org/apache/maven/maven-mercury/2.0."+si+"-SNAPSHOT/maven-mercury-2.0."+i+"-SNAPSHOT.jar");
assertTrue( fn+" does not xist", af.exists() );
- assertEquals( 159630, af.length() );
+ assertEquals( binarySize, af.length() );
fn = targetDirectory.getAbsolutePath()+"/org/apache/maven/maven-mercury/2.0."+si+"-SNAPSHOT/maven-mercury-2.0."+i+"-SNAPSHOT.pom";
ap = new File( targetDirectory, "/org/apache/maven/maven-mercury/2.0."+si+"-SNAPSHOT/maven-mercury-2.0."+i+"-SNAPSHOT.pom");
assertTrue( ap.exists() );
- assertEquals( 7785, ap.length() );
+ assertEquals( pomSize, ap.length() );
}
// check GA metadata has all versions
Modified: maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java?rev=696529&r1=696528&r2=696529&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java Wed Sep 17 18:24:11 2008
@@ -28,10 +28,10 @@
{
protected boolean needNexus = false;
- String nexusReleasesTestDir = "./target/nexus-webapp-1.0.0/runtime/work/storage/releases";
+ String nexusReleasesTestDir = "./target/nexus-webapp-1.0.1/runtime/work/storage/releases";
String nexusReleasesTestUrl = Nexus.nexusTestUrl+"/content/repositories/releases";
- String nexusSnapshotsTestDir = "./target/nexus-webapp-1.0.0/runtime/work/storage/snapshots";
+ String nexusSnapshotsTestDir = "./target/nexus-webapp-1.0.1/runtime/work/storage/snapshots";
String nexusSnapshotsTestUrl = Nexus.nexusTestUrl+"/content/repositories/snapshots";
//------------------------------------------------------------------------------