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 2009/04/28 01:12:32 UTC
svn commit: r769199 [18/19] - in /maven/mercury/trunk:
mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/
mercury-core/src/main/java/org/apache/maven/mercury/artifact/...
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java Mon Apr 27 23:12:25 2009
@@ -15,7 +15,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-*/
+ */
package org.apache.maven.mercury.repository.tests;
@@ -31,8 +31,8 @@
import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.artifact.QualityRange;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
-import org.apache.maven.mercury.repository.api.MetadataResults;
import org.apache.maven.mercury.repository.api.ArtifactResults;
+import org.apache.maven.mercury.repository.api.MetadataResults;
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
@@ -43,111 +43,122 @@
import org.codehaus.plexus.PlexusTestCase;
/**
- * This set of UTs covers a comprehensive use case,
- * involving majority of Mercury repository functionality
- *
+ * This set of UTs covers a comprehensive use case, involving majority of Mercury repository functionality
+ *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class ComprehensiveRepositoryTest
-extends PlexusTestCase
+ extends PlexusTestCase
{
WebDavServer _server1;
- File _base1;
+
+ File _base1;
+
static final String _context1 = "/webdav1";
+
int _port1;
+
RemoteRepositoryM2 _rr1;
-
+
WebDavServer _server2;
- File _base2;
+
+ File _base2;
+
static final String _context2 = "/webdav2";
+
int _port2;
+
RemoteRepositoryM2 _rr2;
-
+
File _lbase1;
+
static final String _local1 = "./target/webdav1local";
+
LocalRepositoryM2 _lr1;
-
+
File _lbase2;
+
static final String _local2 = "./target/webdav2local";
+
LocalRepositoryM2 _lr2;
-
+
static final String _resourceBase = "./target/test-classes";
-
+
List<Repository> _rrs;
+
List<Repository> _lrs;
+
List<Repository> _repos;
-
+
private static final boolean isWindows = File.pathSeparatorChar == ';';
-
-
+
@Override
protected void setUp()
throws Exception
{
super.setUp();
-
+
String prefix = "-t-";
String suffix = "-t";
File temp = File.createTempFile( prefix, suffix );
temp.delete();
-
+
DependencyProcessor dp = new MavenDependencyProcessor();
- Credentials user = new Credentials("foo","bar");
-
+ Credentials user = new Credentials( "foo", "bar" );
+
_base1 = new File( "./target/webdav1" + temp.getName() );
-// FileUtil.delete( _base1 );
+ // FileUtil.delete( _base1 );
assertFalse( _base1.exists() );
_base1.mkdirs();
_base1.deleteOnExit();
_server1 = new WebDavServer( 0, _base1, _context1, getContainer(), 9, null, _base1.getCanonicalPath() );
_server1.start();
_port1 = _server1.getPort();
-
- Server server = new Server("rr1", new URL("http://localhost:"+_port1+_context1), false, false, user );
+
+ Server server = new Server( "rr1", new URL( "http://localhost:" + _port1 + _context1 ), false, false, user );
_rr1 = new RemoteRepositoryM2( server, dp );
-
+
temp = File.createTempFile( prefix, suffix );
temp.delete();
_base2 = new File( "./target/webdav2" + temp.getName() );
-// FileUtil.delete( _base2 );
+ // FileUtil.delete( _base2 );
assertFalse( _base2.exists() );
_base2.mkdirs();
_base2.deleteOnExit();
_server2 = new WebDavServer( 0, _base2, _context2, getContainer(), 9, null, _base2.getCanonicalPath() );
_server2.start();
_port2 = _server2.getPort();
-
- server = new Server("rr2", new URL("http://localhost:"+_port2+_context2), false, false, user );
+
+ server = new Server( "rr2", new URL( "http://localhost:" + _port2 + _context2 ), false, false, user );
_rr2 = new RemoteRepositoryM2( server, dp );
-
- _rrs = new ArrayList<Repository>(2);
+
+ _rrs = new ArrayList<Repository>( 2 );
_rrs.add( _rr1 );
_rrs.add( _rr2 );
-
+
temp = File.createTempFile( prefix, suffix );
temp.delete();
_lbase1 = new File( _local1 + temp.getName() );
-// FileUtil.delete( _lbase1 );
+ // FileUtil.delete( _lbase1 );
assertFalse( _lbase1.exists() );
- _lbase1.mkdirs() ;
+ _lbase1.mkdirs();
_lbase1.deleteOnExit();
_lr1 = new LocalRepositoryM2( "lr1", _lbase1, dp );
-
+
temp = File.createTempFile( prefix, suffix );
temp.delete();
_lbase2 = new File( _local2 + temp.getName() );
-// FileUtil.delete( _lbase2 );
+ // FileUtil.delete( _lbase2 );
assertFalse( _lbase2.exists() );
_lbase2.mkdirs();
_lbase2.deleteOnExit();
_lr2 = new LocalRepositoryM2( "lr2", _lbase2, dp );
-
- _lrs = new ArrayList<Repository>(2);
+
+ _lrs = new ArrayList<Repository>( 2 );
_lrs.add( _lr1 );
_lrs.add( _lr2 );
-
+
_repos = new ArrayList<Repository>();
_repos.addAll( _rrs );
_repos.addAll( _lrs );
@@ -158,725 +169,754 @@
throws Exception
{
super.tearDown();
-
- if( _server1 != null )
+
+ if ( _server1 != null )
try
{
_server1.stop();
_server1.destroy();
}
- catch( Exception e ) {}
- finally { _server1 = null; }
-
- if( _server2 != null )
+ catch ( Exception e )
+ {
+ }
+ finally
+ {
+ _server1 = null;
+ }
+
+ if ( _server2 != null )
try
{
_server2.stop();
_server2.destroy();
}
- catch( Exception e ) {}
- finally { _server2 = null; }
-
- File target = new File( "target" );
- File [] files = target.listFiles(
- new FilenameFilter()
- {
-
- public boolean accept( File dir, String name )
- {
- if( name.startsWith( "webdav" ))
- return true;
- return false;
- }
-
- }
- );
-
- for( File f : files )
- {
- FileUtil.delete( f );
- System.out.println("dropping "+f.getAbsolutePath() );
- }
+ catch ( Exception e )
+ {
+ }
+ finally
+ {
+ _server2 = null;
+ }
+
+ File target = new File( "target" );
+ File[] files = target.listFiles( new FilenameFilter()
+ {
+
+ public boolean accept( File dir, String name )
+ {
+ if ( name.startsWith( "webdav" ) )
+ return true;
+ return false;
+ }
+
+ } );
+
+ for ( File f : files )
+ {
+ FileUtil.delete( f );
+ System.out.println( "dropping " + f.getAbsolutePath() );
+ }
}
-
+
public void writeArtifact( String name, File af, File ap, Repository repo, File expectedFile )
- throws Exception
+ throws Exception
{
- DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata(name) );
-
+ DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata( name ) );
+
da.setPomBlob( FileUtil.readRawData( ap ) );
da.setFile( af );
List<Artifact> al = new ArrayList<Artifact>();
al.add( da );
-
+
repo.getWriter().writeArtifacts( al );
-
+
int count = 10;
-
- if( expectedFile != null )
+
+ if ( expectedFile != null )
{
- while( ! expectedFile.exists() && count > 0 )
+ while ( !expectedFile.exists() && count > 0 )
{
-// if( isWindows )
- Thread.sleep( 1000L );
- count--;
+ // if( isWindows )
+ Thread.sleep( 1000L );
+ count--;
}
}
Thread.sleep( 2000L ); // [MERCURY-112] ?
}
-
- public List<Artifact> readArtifact( String name , List<Repository> repos )
- throws Exception
+
+ public List<Artifact> readArtifact( String name, List<Repository> repos )
+ throws Exception
{
- ArtifactMetadata bmd = new ArtifactMetadata(name);
-
+ ArtifactMetadata bmd = new ArtifactMetadata( name );
+
List<ArtifactMetadata> al = new ArrayList<ArtifactMetadata>();
al.add( bmd );
-
- if( isWindows )
+
+ if ( isWindows )
Thread.sleep( 2000L ); // [MERCURY-112] ?
-
+
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
-
- ArtifactResults res = vr.readArtifacts( al );
-
+
+ ArtifactResults res = vr.readArtifacts( al );
+
assertNotNull( res );
-
- if( res.hasExceptions() )
+
+ if ( res.hasExceptions() )
System.out.println( res.getExceptions() );
-
- assertTrue( res.hasResults(bmd) );
-
+
+ assertTrue( res.hasResults( bmd ) );
+
return res.getResults( bmd );
}
-
- public List<ArtifactMetadata> readVersions( String name , List<Repository> repos )
- throws Exception
+
+ public List<ArtifactMetadata> readVersions( String name, List<Repository> repos )
+ throws Exception
{
- ArtifactMetadata bmd = new ArtifactMetadata(name);
-
+ ArtifactMetadata bmd = new ArtifactMetadata( name );
+
List<ArtifactMetadata> al = new ArrayList<ArtifactMetadata>();
al.add( bmd );
-
+
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
-
- MetadataResults res = vr.readVersions( al );
-
+
+ MetadataResults res = vr.readVersions( al );
+
assertNotNull( res );
-
- if( res.hasExceptions() )
+
+ if ( res.hasExceptions() )
System.out.println( res.getExceptions() );
-
- assertTrue( res.hasResults(bmd) );
-
+
+ assertTrue( res.hasResults( bmd ) );
+
return res.getResult( bmd );
}
-
+
public void testWriteReadArtifact()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar");
- File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar");
-
+
+ File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" );
+ File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
+
writeArtifact( name, af, ap, _rr2, aJar2 );
-
+
assertFalse( aJar1.exists() );
assertTrue( aJar2.exists() );
-
+
List<Artifact> al = readArtifact( name, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
File localRepo1Jar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" );
File localRepo2Jar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" );
-
+
assertFalse( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
-
+
al = readArtifact( name, _repos );
-
+
assertTrue( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
}
-
+
public void testWriteReadArtifactPom()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9::pom";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.pom" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom");
- File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom");
-
+
+ File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom" );
+ File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
+
writeArtifact( name, af, ap, _rr2, aJar2 );
assertFalse( aJar1.exists() );
assertTrue( aJar2.exists() );
-
+
List<Artifact> al = readArtifact( name, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
File localRepo1Jar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom" );
File localRepo2Jar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom" );
-
+
assertFalse( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
-
+
al = readArtifact( name, _repos );
-
+
assertTrue( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
}
-
+
public void testWriteReadTimeStamp()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
- File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
-
+
+ File aJar1 =
+ new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+ File aJar2 =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
+
writeArtifact( name, af, ap, _rr2, aJar2 );
-
+
assertFalse( aJar1.exists() );
assertTrue( aJar2.exists() );
-
+
List<Artifact> al = readArtifact( name, _rrs );
-
- System.out.println(al);
-
- File localRepo1Jar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
- File localRepo2Jar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
-
+
+ System.out.println( al );
+
+ File localRepo1Jar =
+ new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+ File localRepo2Jar =
+ new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+
assertFalse( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
-
+
al = readArtifact( name, _repos );
-
+
assertTrue( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
}
-
+
public void testWriteReadLocalTimeStamp()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
-// ArtifactBasicMetadata bmd = new ArtifactBasicMetadata( name );
-
+ // ArtifactBasicMetadata bmd = new ArtifactBasicMetadata( name );
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
- File aJar2 = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
-
+
+ File aJar1 =
+ new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+ File aJar2 =
+ new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
+
writeArtifact( name, af, ap, _lr2, aJar2 );
-
+
assertFalse( aJar1.exists() );
assertTrue( aJar2.exists() );
-
+
List<Artifact> al = readArtifact( name, _repos );
-
- System.out.println(al);
-
- File localRepo1Jar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
- File localRepo2Jar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
-
+
+ System.out.println( al );
+
+ File localRepo1Jar =
+ new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+ File localRepo2Jar =
+ new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+
assertTrue( localRepo1Jar.exists() );
assertTrue( localRepo2Jar.exists() );
}
-
+
public void testWriteReadSnapshot()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar");
- File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar");
-
+
+ File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
+ File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
+
writeArtifact( name, af, ap, _rr2, aJar2 );
-
+
assertFalse( aJar1.exists() );
assertTrue( aJar2.exists() );
-
+
List<Artifact> al = readArtifact( name, _rrs );
-
- System.out.println(al);
-
- File localRepo1Jar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
- File localRepo2Jar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
-
+
+ System.out.println( al );
+
+ File localRepo1Jar =
+ new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
+ File localRepo2Jar =
+ new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
+
assertFalse( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
-
+
al = readArtifact( name, _repos );
-
+
assertTrue( localRepo1Jar.exists() );
assertFalse( localRepo2Jar.exists() );
}
-
+
public void testWriteReadSnapshotLocal()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar");
- File aJar2 = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar");
-
+
+ File aJar1 = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
+ File aJar2 = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-SNAPSHOT.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
+
writeArtifact( name, af, ap, _lr2, aJar2 );
-
+
assertFalse( aJar1.exists() );
assertTrue( aJar2.exists() );
-
+
List<Artifact> al = readArtifact( name, _lrs );
assertTrue( aJar1.exists() );
assertTrue( aJar2.exists() );
}
-
+
public void testWriteTimestampReadSnapshotSingleRepo()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameSN = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
-
+
+ File aJar =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
+
writeArtifact( nameTS1, af, ap, _rr2, aJar );
-
- aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+
+ aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _rr2, aJar );
-
+
List<Artifact> al = readArtifact( nameSN, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.9-20090204.232324-24", aSN.getVersion() );
}
-
+
public void testWriteTimestampReadSnapshotSingleRepoSN()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameSN = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _rr2, aJar );
writeArtifact( nameTS2, af, ap, _rr2, null );
writeArtifact( nameSN, af, ap, _rr2, null );
-
+
List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
-
- System.out.println(vl);
-
+
+ System.out.println( vl );
+
assertNotNull( vl );
-
+
assertEquals( 1, vl.size() );
-
+
List<Artifact> al = readArtifact( nameSN, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.9-SNAPSHOT", aSN.getVersion() );
}
-
+
public void testWriteTimestampReadSnapshot2Repos()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameSN = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _rr2, aJar );
- aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+ aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _rr1, aJar );
-
+
List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
-
- System.out.println(vl);
-
+
+ System.out.println( vl );
+
assertNotNull( vl );
-
+
assertEquals( 1, vl.size() );
-
+
List<Artifact> al = readArtifact( nameSN, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.9-20090204.232324-24", aSN.getVersion() );
}
-
+
//
public void testWriteTimestampReadSnapshot2ReposReversed()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameSN = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _rr1, aJar );
- aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+ aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _rr2, aJar );
-
+
List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
-
- System.out.println(vl);
-
+
+ System.out.println( vl );
+
assertNotNull( vl );
-
+
assertEquals( 1, vl.size() );
-
+
List<Artifact> al = readArtifact( nameSN, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.9-20090204.232324-24", aSN.getVersion() );
}
-
+
public void testSufficientRepository()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameSN = "org.apache.maven:maven-core:2.0.9-SNAPSHOT";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _rr1, aJar );
-
+
// make this repo sufficient
_rr1.setSufficient( true );
- aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+ aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _rr2, aJar );
-
+
List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
-
- System.out.println(vl);
-
+
+ System.out.println( vl );
+
assertNotNull( vl );
-
+
assertEquals( 1, vl.size() );
-
+
List<Artifact> al = readArtifact( nameSN, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
- // the first one should be selected because
+
+ // the first one should be selected because
// it resides in the "sufficient" repository
assertEquals( "2.0.9-20090204.232323-23", aSN.getVersion() );
}
-
+
public void testLatest()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameRL = "org.apache.maven:maven-core:2.0.8";
String nameLT = "org.apache.maven:maven-core:LATEST";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _rr2, aJar );
-
- aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+
+ aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _rr1, aJar );
-
- aJar = new File( _base2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar");
- writeArtifact( nameRL, af, ap, _rr2, aJar );
-
+
+ aJar = new File( _base2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar" );
+ writeArtifact( nameRL, af, ap, _rr2, aJar );
+
List<Artifact> al = readArtifact( nameLT, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.9-20090204.232324-24", aSN.getVersion() );
}
-
+
public void testLatestLocal()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameRL = "org.apache.maven:maven-core:2.0.8";
String nameLT = "org.apache.maven:maven-core:LATEST";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _lr2, aJar );
-
- aJar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+
+ aJar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _lr1, aJar );
-
- aJar = new File( _lbase2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar");
+
+ aJar = new File( _lbase2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar" );
writeArtifact( nameRL, af, ap, _lr2, aJar );
-
+
List<Artifact> al = readArtifact( nameLT, _lrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.9-20090204.232324-24", aSN.getVersion() );
}
-
+
public void testRelease()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameRL = "org.apache.maven:maven-core:2.0.8";
String name = "org.apache.maven:maven-core:RELEASE";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _rr2, aJar );
-
- aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+
+ aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _rr1, aJar );
-
- aJar = new File( _base2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar");
+
+ aJar = new File( _base2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar" );
writeArtifact( nameRL, af, ap, _rr2, aJar );
-
+
List<Artifact> al = readArtifact( name, _rrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.8", aSN.getVersion() );
}
-
+
public void testReleaseLocal()
- throws Exception
+ throws Exception
{
String nameTS1 = "org.apache.maven:maven-core:2.0.9-20090204.232323-23";
String nameTS2 = "org.apache.maven:maven-core:2.0.9-20090204.232324-24";
String nameRL = "org.apache.maven:maven-core:2.0.8";
String name = "org.apache.maven:maven-core:RELEASE";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar = new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar");
+
+ File aJar =
+ new File( _lbase2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232323-23.jar" );
writeArtifact( nameTS1, af, ap, _lr2, aJar );
-
- aJar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
+
+ aJar = new File( _lbase1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
writeArtifact( nameTS2, af, ap, _lr1, aJar );
-
- aJar = new File( _lbase2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar");
+
+ aJar = new File( _lbase2, "org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.jar" );
writeArtifact( nameRL, af, ap, _lr2, aJar );
List<Artifact> al = readArtifact( name, _lrs );
-
- System.out.println(al);
-
+
+ System.out.println( al );
+
assertNotNull( al );
-
+
assertEquals( 1, al.size() );
-
+
Artifact aSN = al.get( 0 );
-
+
assertNotNull( aSN.getFile() );
-
+
assertTrue( aSN.getFile().exists() );
-
+
assertEquals( "2.0.8", aSN.getVersion() );
}
-
+
public void testReadReleasePolicy()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar");
- File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
-
+
+ File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" );
+ File aJar2 =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
- writeArtifact( "org.apache.maven:maven-core:2.0.9", af, ap, _rr1, aJar1 );
+
+ writeArtifact( "org.apache.maven:maven-core:2.0.9", af, ap, _rr1, aJar1 );
writeArtifact( "org.apache.maven:maven-core:2.0.9-20090204.232324-24", af, ap, _rr2, aJar2 );
-
+
_rr1.setRepositoryQualityRange( QualityRange.RELEASES_ONLY );
_rr2.setRepositoryQualityRange( QualityRange.SNAPSHOTS_ONLY );
-
+
List<ArtifactMetadata> al = readVersions( name, _rrs );
-
+
assertNotNull( al );
assertEquals( 1, al.size() );
assertEquals( "2.0.9", al.get( 0 ).getVersion() );
}
-
+
public void testReadReleasePolicySwapped()
- throws Exception
+ throws Exception
{
String name = "org.apache.maven:maven-core:2.0.9";
-
+
File af = new File( _resourceBase, "maven-core-2.0.9.jar" );
File ap = new File( _resourceBase, "maven-core-2.0.9.pom" );
-
- File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar");
- File aJar2 = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
-
+
+ File aJar1 = new File( _base1, "org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" );
+ File aJar2 =
+ new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar" );
+
assertFalse( aJar1.exists() );
assertFalse( aJar2.exists() );
-
- writeArtifact( "org.apache.maven:maven-core:2.0.9", af, ap, _rr1, aJar1 );
+
+ writeArtifact( "org.apache.maven:maven-core:2.0.9", af, ap, _rr1, aJar1 );
writeArtifact( "org.apache.maven:maven-core:2.0.9-20090204.232324-24", af, ap, _rr2, aJar2 );
-
+
_rr2.setRepositoryQualityRange( QualityRange.RELEASES_ONLY );
_rr1.setRepositoryQualityRange( QualityRange.SNAPSHOTS_ONLY );
-
- ArtifactMetadata bmd = new ArtifactMetadata(name);
-
+
+ ArtifactMetadata bmd = new ArtifactMetadata( name );
+
List<ArtifactMetadata> al = new ArrayList<ArtifactMetadata>();
al.add( bmd );
-
+
VirtualRepositoryReader vr = new VirtualRepositoryReader( _rrs );
-
- MetadataResults res = vr.readVersions( al );
-
- assertTrue( res == null || !res.hasResults() );
+
+ MetadataResults res = vr.readVersions( al );
+
+ assertTrue( res == null || !res.hasResults() );
}
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java Mon Apr 27 23:12:25 2009
@@ -15,7 +15,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-*/
+ */
package org.apache.maven.mercury.repository.tests;
@@ -38,122 +38,125 @@
import org.codehaus.plexus.PlexusTestCase;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class DavServerTest
-extends PlexusTestCase
+ extends PlexusTestCase
{
static final String _user = "foo";
-
+
static final String _pass = "bar";
-
+
// repo1
WebDavServer _dav;
-
+
File _base;
-
+
RemoteRepositoryM2 _davRepo;
-
+
// repo2
WebDavServer _dav2;
-
+
File _base2;
-
+
RemoteRepositoryM2 _davRepo2;
static final String _davContext = "/webdav";
-
+
static final String _davContext2 = "/webdav2test";
-
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
protected void setUp()
- throws Exception
+ throws Exception
{
super.setUp();
-
+
setUp1();
-
+
setUp2();
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
protected void setUp1()
- throws Exception
+ throws Exception
{
_base = new File( "./target", _davContext );
-
+
FileUtil.delete( _base );
-
+
_base.mkdirs();
-
+
_dav = new WebDavServer( 0, _base, _davContext, getContainer(), 9, "mercury-test", null );
-
+
_dav.start();
-
- Credentials user = new Credentials(_user,_pass);
-
- Server server = new Server("dav", new URL("http://localhost:"+_dav.getPort()+_davContext), false, false, user );
-
- System.out.println("URL: "+server.getURL() );
-
+
+ Credentials user = new Credentials( _user, _pass );
+
+ Server server =
+ new Server( "dav", new URL( "http://localhost:" + _dav.getPort() + _davContext ), false, false, user );
+
+ System.out.println( "URL: " + server.getURL() );
+
_davRepo = new RemoteRepositoryM2( server, new MavenDependencyProcessor() );
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
protected void setUp2()
- throws Exception
+ throws Exception
{
_base2 = new File( "./target", _davContext2 );
-
+
FileUtil.delete( _base2 );
-
+
_base2.mkdirs();
-
+
_dav2 = new WebDavServer( 0, _base2, _davContext2, getContainer(), 9, null, _base2.getAbsolutePath() );
-
+
_dav2.start();
-
- Credentials user = new Credentials(_user,_pass);
-
- Server server = new Server("dav2", new URL("http://localhost:"+_dav2.getPort()+_davContext2), false, false, user );
-
- System.out.println("URL: "+server.getURL() );
-
+
+ Credentials user = new Credentials( _user, _pass );
+
+ Server server =
+ new Server( "dav2", new URL( "http://localhost:" + _dav2.getPort() + _davContext2 ), false, false, user );
+
+ System.out.println( "URL: " + server.getURL() );
+
_davRepo2 = new RemoteRepositoryM2( server, new MavenDependencyProcessor() );
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
protected void tearDown()
- throws Exception
+ throws Exception
{
super.tearDown();
-
- if( _dav != null )
+
+ if ( _dav != null )
{
_dav.stop();
_dav.destroy();
_dav = null;
- }
-
- if( _dav2 != null )
+ }
+
+ if ( _dav2 != null )
{
_dav2.stop();
_dav2.destroy();
_dav2 = null;
- }
+ }
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
public void testDavWrite()
- throws Exception
+ throws Exception
{
- File jar = new File("./target/test.jar");
+ File jar = new File( "./target/test.jar" );
FileUtil.writeRawData( jar, "test-jar" );
- File pom = new File("./target/test.pom");
+ File pom = new File( "./target/test.pom" );
FileUtil.writeRawData( pom, "test-pom" );
- DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("a:test:1.0") );
+ DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata( "a:test:1.0" ) );
da.setFile( jar );
da.setPomBlob( FileUtil.readRawData( pom ) );
@@ -167,37 +170,38 @@
File davJar = new File( _base, "a/test/1.0/test-1.0.jar" );
assertTrue( davJar.exists() );
-
+
assertEquals( jar.length(), davJar.length() );
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
public void testDavRead()
- throws Exception
+ throws Exception
{
testDavWrite();
-
- ArtifactMetadata bmd = new ArtifactMetadata("a:test:1.0");
-
+
+ ArtifactMetadata bmd = new ArtifactMetadata( "a:test:1.0" );
+
List<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>( 1 );
query.add( bmd );
-
+
RepositoryReader rr = _davRepo.getReader();
-
+
ArtifactResults res = rr.readArtifacts( query );
-
+
assertNotNull( res );
-
+
assertFalse( res.hasExceptions() );
-
+
assertTrue( res.hasResults() );
-
+
List<Artifact> al = res.getResults( bmd );
-
+
assertNotNull( al );
-
+
assertFalse( al.isEmpty() );
-
+
Artifact a = al.get( 0 );
assertNotNull( a );
@@ -208,17 +212,18 @@
assertEquals( "test-pom".length(), a.getFile().length() );
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
public void testDavWrite2()
- throws Exception
+ throws Exception
{
- File jar = new File("./target/test.jar");
+ File jar = new File( "./target/test.jar" );
FileUtil.writeRawData( jar, "test-jar" );
- File pom = new File("./target/test.pom");
+ File pom = new File( "./target/test.pom" );
FileUtil.writeRawData( pom, "test-pom" );
- DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("a:test:1.0") );
+ DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata( "a:test:1.0" ) );
da.setFile( jar );
da.setPomBlob( FileUtil.readRawData( pom ) );
@@ -232,37 +237,38 @@
File davJar = new File( _base2, "a/test/1.0/test-1.0.jar" );
assertTrue( davJar.exists() );
-
+
assertEquals( jar.length(), davJar.length() );
}
- //---------------------------------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------------------------------
public void testDavRead2()
- throws Exception
+ throws Exception
{
testDavWrite2();
-
- ArtifactMetadata bmd = new ArtifactMetadata("a:test:1.0");
-
+
+ ArtifactMetadata bmd = new ArtifactMetadata( "a:test:1.0" );
+
List<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>( 1 );
query.add( bmd );
-
+
RepositoryReader rr = _davRepo2.getReader();
-
+
ArtifactResults res = rr.readArtifacts( query );
-
+
assertNotNull( res );
-
+
assertFalse( res.hasExceptions() );
-
+
assertTrue( res.hasResults() );
-
+
List<Artifact> al = res.getResults( bmd );
-
+
assertNotNull( al );
-
+
assertFalse( al.isEmpty() );
-
+
Artifact a = al.get( 0 );
assertNotNull( a );
@@ -273,5 +279,5 @@
assertEquals( "test-pom".length(), a.getFile().length() );
}
- //---------------------------------------------------------------------------------------------
+ // ---------------------------------------------------------------------------------------------
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java Mon Apr 27 23:12:25 2009
@@ -28,31 +28,28 @@
import org.apache.maven.mercury.transport.api.Server;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class LocalRepositoryReaderM2Test
-extends AbstractRepositoryReaderM2Test
+ extends AbstractRepositoryReaderM2Test
{
- @Override
- protected void setUp()
- throws Exception
- {
- mdProcessor = new MetadataProcessorMock();
-
- query = new ArrayList<ArtifactMetadata>();
-
- server = new Server( "test", new File("./target/test-classes/repo").toURL() );
-
- repo = new LocalRepositoryM2( server, new MavenDependencyProcessor() );
- repo.setDependencyProcessor( mdProcessor );
- reader = repo.getReader();
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ mdProcessor = new MetadataProcessorMock();
+
+ query = new ArrayList<ArtifactMetadata>();
+
+ server = new Server( "test", new File( "./target/test-classes/repo" ).toURL() );
+
+ repo = new LocalRepositoryM2( server, new MavenDependencyProcessor() );
+ repo.setDependencyProcessor( mdProcessor );
+ reader = repo.getReader();
- super.setUp();
- }
+ super.setUp();
+ }
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java Mon Apr 27 23:12:25 2009
@@ -35,83 +35,80 @@
import org.apache.maven.mercury.util.FileUtil;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class LocalRepositoryWriterM2Test
-extends AbstractRepositoryWriterM2Test
+ extends AbstractRepositoryWriterM2Test
{
- public static final String SYSTEM_PARAMETER_SKIP_LOCK_TESTS = "maven.mercury.tests.skip.lock";
- boolean skipLockTests = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_SKIP_LOCK_TESTS, "true" ) );
-
- //------------------------------------------------------------------------------
- @Override
- protected void setUp()
- throws Exception
- {
- super.setUp();
-
- targetDirectory = new File("./target/test-classes/tempRepo");
- FileUtil.copy( new File("./target/test-classes/repo"), targetDirectory, true );
- FileUtil.delete( new File(targetDirectory, "org") );
-
- query = new ArrayList<ArtifactMetadata>();
-
- server = new Server( "test", targetDirectory.toURL() );
- // verifiers
- factories = new HashSet<StreamVerifierFactory>();
- factories.add(
- new PgpStreamVerifierFactory(
- new StreamVerifierAttributes( PgpStreamVerifierFactory.DEFAULT_EXTENSION, false, true )
- , getClass().getResourceAsStream( secretKeyFile )
- , keyId
- , secretKeyPass
- )
- );
- factories.add( new SHA1VerifierFactory(false,false) );
- server.setWriterStreamVerifierFactories(factories);
-
- repo = new LocalRepositoryM2( server, new MavenDependencyProcessor() );
- mdProcessor = new MetadataProcessorMock();
- repo.setDependencyProcessor( mdProcessor );
-
- reader = repo.getReader();
- writer = repo.getWriter();
- }
-
- @Override
- void setReleases()
- throws MalformedURLException
- {
- }
-
- @Override
- void setSnapshots()
- throws MalformedURLException
- {
- }
- //-------------------------------------------------------------------------
- @Override
- public void testWriteContentionMultipleArtifacts()
- throws Exception
- {
- if( skipLockTests )
- System.out.println("skipping");
- else
- super.testWriteContentionMultipleArtifacts();
- }
-
- @Override
- public void testWriteContentionSingleArtifact()
- throws Exception
- {
- if( skipLockTests )
- System.out.println("skipping");
- else
- super.testWriteContentionSingleArtifact();
- }
-
+ public static final String SYSTEM_PARAMETER_SKIP_LOCK_TESTS = "maven.mercury.tests.skip.lock";
+
+ boolean skipLockTests = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_SKIP_LOCK_TESTS, "true" ) );
+
+ // ------------------------------------------------------------------------------
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ targetDirectory = new File( "./target/test-classes/tempRepo" );
+ FileUtil.copy( new File( "./target/test-classes/repo" ), targetDirectory, true );
+ FileUtil.delete( new File( targetDirectory, "org" ) );
+
+ query = new ArrayList<ArtifactMetadata>();
+
+ server = new Server( "test", targetDirectory.toURL() );
+ // verifiers
+ factories = new HashSet<StreamVerifierFactory>();
+ factories.add( new PgpStreamVerifierFactory(
+ new StreamVerifierAttributes(
+ PgpStreamVerifierFactory.DEFAULT_EXTENSION,
+ false, true ),
+ getClass().getResourceAsStream( secretKeyFile ), keyId,
+ secretKeyPass ) );
+ factories.add( new SHA1VerifierFactory( false, false ) );
+ server.setWriterStreamVerifierFactories( factories );
+
+ repo = new LocalRepositoryM2( server, new MavenDependencyProcessor() );
+ mdProcessor = new MetadataProcessorMock();
+ repo.setDependencyProcessor( mdProcessor );
+
+ reader = repo.getReader();
+ writer = repo.getWriter();
+ }
+
+ @Override
+ void setReleases()
+ throws MalformedURLException
+ {
+ }
+
+ @Override
+ void setSnapshots()
+ throws MalformedURLException
+ {
+ }
+
+ // -------------------------------------------------------------------------
+ @Override
+ public void testWriteContentionMultipleArtifacts()
+ throws Exception
+ {
+ if ( skipLockTests )
+ System.out.println( "skipping" );
+ else
+ super.testWriteContentionMultipleArtifacts();
+ }
+
+ @Override
+ public void testWriteContentionSingleArtifact()
+ throws Exception
+ {
+ if ( skipLockTests )
+ System.out.println( "skipping" );
+ else
+ super.testWriteContentionSingleArtifact();
+ }
+
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java Mon Apr 27 23:12:25 2009
@@ -46,138 +46,141 @@
import org.apache.maven.mercury.util.FileUtil;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class ReadWriteTest
-extends TestCase
+ extends TestCase
{
- private static final IMercuryLogger log = MercuryLoggerManager.getLogger( ReadWriteTest.class );
+ private static final IMercuryLogger log = MercuryLoggerManager.getLogger( ReadWriteTest.class );
- File remoteRepoBase = new File("./target/test-classes/repo");
- public String port;
- HttpTestServer httpServer;
-
- RemoteRepository rr;
- LocalRepository lr;
-
- DependencyProcessor mdProcessor;
- RepositoryReader reader;
-
- File localRepoBase;
- RepositoryWriter writer;
-
- List<ArtifactMetadata> query;
-
- ArtifactMetadata bmd;
-
- Server server;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- throws Exception
- {
- httpServer = new HttpTestServer( remoteRepoBase, "/repo" );
- httpServer.start();
- port = String.valueOf( httpServer.getPort() );
-
- server = new Server( "test", new URL("http://localhost:"+port+"/repo") );
- rr = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
-
- mdProcessor = new MetadataProcessorMock();
- rr.setDependencyProcessor( mdProcessor );
- reader = rr.getReader();
-
- localRepoBase = File.createTempFile( "local", "repo" );
- localRepoBase.delete();
- localRepoBase.mkdir();
- log.info("local repo is in "+localRepoBase);
-
- lr = new LocalRepositoryM2( "lr", localRepoBase, new MavenDependencyProcessor() );
- writer = lr.getWriter();
-
- query = new ArrayList<ArtifactMetadata>();
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- httpServer.stop();
- httpServer.destroy();
- FileUtil.delete( localRepoBase );
- }
-
- public void testOneArtifact()
- throws IllegalArgumentException, RepositoryException
- {
- bmd = new ArtifactMetadata("a:a:4");
- query.add( bmd );
-
- ArtifactResults res = reader.readArtifacts( query );
-
- assertTrue( res != null );
- assertFalse( res.hasExceptions() );
- assertTrue( res.hasResults() );
-
- Map< ArtifactMetadata, List<Artifact>> resMap = res.getResults();
-
- assertNotNull( resMap );
- assertFalse( resMap.isEmpty() );
-
- List<Artifact> al = resMap.get( bmd );
-
- assertNotNull( al );
- assertFalse( al.isEmpty() );
-
- Artifact a = al.get( 0 );
-
- writer.writeArtifacts( al );
-
- File aBin = new File( localRepoBase, "a/a/4/a-4.jar" );
- assertTrue( aBin.exists() );
-
- File aPom = new File( localRepoBase, "a/a/4/a-4.pom" );
- assertTrue( aPom.exists() );
-
- assertNotNull( a.getPomBlob() );
- assertTrue( a.getPomBlob().length > 10 );
- log.info( a+" - pom length is "+a.getPomBlob().length );
- }
-
- public void testOneArtifactWithClassifier()
- throws IllegalArgumentException, RepositoryException
- {
- ArtifactMetadata bm = new ArtifactMetadata("a:a:4:sources");
- query.add( bm );
-
- ArtifactResults res = reader.readArtifacts( query );
-
- assertTrue( res != null );
- assertFalse( res.hasExceptions() );
- assertTrue( res.hasResults() );
-
- Map< ArtifactMetadata, List<Artifact>> resMap = res.getResults();
-
- assertNotNull( resMap );
- assertFalse( resMap.isEmpty() );
-
- List<Artifact> al = resMap.get( bm );
-
- assertNotNull( al );
- assertFalse( al.isEmpty() );
-
- Artifact a = al.get( 0 );
-
- writer.writeArtifacts( al );
-
- File aBin = new File( localRepoBase, "a/a/4/a-4-sources.jar" );
- assertTrue( aBin.exists() );
- }
+ File remoteRepoBase = new File( "./target/test-classes/repo" );
+
+ public String port;
+
+ HttpTestServer httpServer;
+
+ RemoteRepository rr;
+
+ LocalRepository lr;
+
+ DependencyProcessor mdProcessor;
+
+ RepositoryReader reader;
+
+ File localRepoBase;
+
+ RepositoryWriter writer;
+
+ List<ArtifactMetadata> query;
+
+ ArtifactMetadata bmd;
+
+ Server server;
+
+ /*
+ * (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp()
+ throws Exception
+ {
+ httpServer = new HttpTestServer( remoteRepoBase, "/repo" );
+ httpServer.start();
+ port = String.valueOf( httpServer.getPort() );
+
+ server = new Server( "test", new URL( "http://localhost:" + port + "/repo" ) );
+ rr = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
+
+ mdProcessor = new MetadataProcessorMock();
+ rr.setDependencyProcessor( mdProcessor );
+ reader = rr.getReader();
+
+ localRepoBase = File.createTempFile( "local", "repo" );
+ localRepoBase.delete();
+ localRepoBase.mkdir();
+ log.info( "local repo is in " + localRepoBase );
+
+ lr = new LocalRepositoryM2( "lr", localRepoBase, new MavenDependencyProcessor() );
+ writer = lr.getWriter();
+
+ query = new ArrayList<ArtifactMetadata>();
+ }
+
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+ httpServer.stop();
+ httpServer.destroy();
+ FileUtil.delete( localRepoBase );
+ }
+
+ public void testOneArtifact()
+ throws IllegalArgumentException, RepositoryException
+ {
+ bmd = new ArtifactMetadata( "a:a:4" );
+ query.add( bmd );
+
+ ArtifactResults res = reader.readArtifacts( query );
+
+ assertTrue( res != null );
+ assertFalse( res.hasExceptions() );
+ assertTrue( res.hasResults() );
+
+ Map<ArtifactMetadata, List<Artifact>> resMap = res.getResults();
+
+ assertNotNull( resMap );
+ assertFalse( resMap.isEmpty() );
+
+ List<Artifact> al = resMap.get( bmd );
+
+ assertNotNull( al );
+ assertFalse( al.isEmpty() );
+
+ Artifact a = al.get( 0 );
+
+ writer.writeArtifacts( al );
+
+ File aBin = new File( localRepoBase, "a/a/4/a-4.jar" );
+ assertTrue( aBin.exists() );
+
+ File aPom = new File( localRepoBase, "a/a/4/a-4.pom" );
+ assertTrue( aPom.exists() );
+
+ assertNotNull( a.getPomBlob() );
+ assertTrue( a.getPomBlob().length > 10 );
+ log.info( a + " - pom length is " + a.getPomBlob().length );
+ }
+
+ public void testOneArtifactWithClassifier()
+ throws IllegalArgumentException, RepositoryException
+ {
+ ArtifactMetadata bm = new ArtifactMetadata( "a:a:4:sources" );
+ query.add( bm );
+
+ ArtifactResults res = reader.readArtifacts( query );
+
+ assertTrue( res != null );
+ assertFalse( res.hasExceptions() );
+ assertTrue( res.hasResults() );
+
+ Map<ArtifactMetadata, List<Artifact>> resMap = res.getResults();
+
+ assertNotNull( resMap );
+ assertFalse( resMap.isEmpty() );
+
+ List<Artifact> al = resMap.get( bm );
+
+ assertNotNull( al );
+ assertFalse( al.isEmpty() );
+
+ Artifact a = al.get( 0 );
+
+ writer.writeArtifacts( al );
+
+ File aBin = new File( localRepoBase, "a/a/4/a-4-sources.jar" );
+ assertTrue( aBin.exists() );
+ }
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java Mon Apr 27 23:12:25 2009
@@ -47,162 +47,175 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class RemoteRepositoryCachingReaderM2Test
-extends AbstractRepositoryReaderM2Test
+ extends AbstractRepositoryReaderM2Test
{
- MetadataXpp3Reader _xpp3Reader;
- File _testBase;
- DefaultRetriever _retriever;
- public String _port;
- HttpTestServer _server;
- DefaultRetrievalRequest _request;
-
- RepositoryMetadataCache _mdCache;
- File _cacheBase;
-
- //-------------------------------------------------------------------------
- @Override
- protected void setUp()
- throws Exception
- {
- _retriever = new DefaultRetriever();
-
- _testBase = new File("./target/test-classes/repo");
- _testBase.mkdirs();
-
- _server = new HttpTestServer( _testBase, "/repo" );
- _server.start();
- _port = String.valueOf( _server.getPort() );
-
- _xpp3Reader = new MetadataXpp3Reader();
- _request = new DefaultRetrievalRequest();
-
- mdProcessor = new MetadataProcessorMock();
-
- query = new ArrayList<ArtifactMetadata>();
-
- server = new Server( "test", new URL("http://localhost:"+_port+"/repo") );
-
- RepositoryUpdatePolicy up = new RepositoryUpdateIntervalPolicy( RepositoryUpdateIntervalPolicy.UPDATE_POLICY_NAME_DAILY );
-
- repo = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
- ((RemoteRepository)repo).setUpdatePolicy( up );
- ((RemoteRepositoryM2)repo).setWorkAroundBadMetadata( false );
-
- repo.setDependencyProcessor( new MetadataProcessorMock() );
- reader = repo.getReader();
-
- _cacheBase = new File( _testBase, VirtualRepositoryReader.METADATA_CACHE_DIR );
- _cacheBase.delete();
- _cacheBase.mkdirs();
-
- _mdCache = VirtualRepositoryReader.getCache( _testBase );
-
- reader.setMetadataCache( _mdCache );
-
- super.setUp();
-
- }
- //-------------------------------------------------------------------------
- @Override
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- _server.stop();
- _server.destroy();
- }
- //-------------------------------------------------------------------------
- private void validateMmd( Metadata mmd )
- {
- assertNotNull( mmd );
- assertEquals("a", mmd.getGroupId() );
- assertEquals("a", mmd.getArtifactId() );
-
- assertNotNull( mmd.getVersioning() );
-
- List<String> versions = mmd.getVersioning().getVersions();
-
- assertNotNull( versions );
- assertTrue( versions.size() > 3 );
- }
- //-------------------------------------------------------------------------
- public void testReadMd()
- throws FileNotFoundException, IOException, XmlPullParserException
- {
- FileInputStream fis = new FileInputStream( new File( _testBase, "a/a/maven-metadata.xml") );
- Metadata mmd = _xpp3Reader.read( fis );
- fis.close();
- validateMmd( mmd );
- }
- //-------------------------------------------------------------------------
- public void testReadRemoteMdViaRepositoryReader()
- throws FileNotFoundException, IOException, XmlPullParserException, RepositoryException, MetadataReaderException
- {
-
- byte [] mmBuf = reader.readRawData( "a/a/maven-metadata.xml", false );
-
- assertNotNull( mmBuf );
- assertTrue( mmBuf.length > 1 );
-
- ByteArrayInputStream bais = new ByteArrayInputStream( mmBuf );
- Metadata mmd = _xpp3Reader.read( bais );
- bais.close();
-
- validateMmd( mmd );
-
- String mdFileName = "a/a/"+"meta-ga-"+repo.getId()+".xml";
- File cachedMd = new File( _cacheBase, mdFileName );
-
- try
- {
- File dir = new File( _cacheBase, "a/a" );
- File [] files = dir.listFiles();
- System.out.println("=====> Files in "+dir.getCanonicalPath() );
- System.out.flush();
- if( files != null && files.length > 0)
- for( File f : files )
+ MetadataXpp3Reader _xpp3Reader;
+
+ File _testBase;
+
+ DefaultRetriever _retriever;
+
+ public String _port;
+
+ HttpTestServer _server;
+
+ DefaultRetrievalRequest _request;
+
+ RepositoryMetadataCache _mdCache;
+
+ File _cacheBase;
+
+ // -------------------------------------------------------------------------
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ _retriever = new DefaultRetriever();
+
+ _testBase = new File( "./target/test-classes/repo" );
+ _testBase.mkdirs();
+
+ _server = new HttpTestServer( _testBase, "/repo" );
+ _server.start();
+ _port = String.valueOf( _server.getPort() );
+
+ _xpp3Reader = new MetadataXpp3Reader();
+ _request = new DefaultRetrievalRequest();
+
+ mdProcessor = new MetadataProcessorMock();
+
+ query = new ArrayList<ArtifactMetadata>();
+
+ server = new Server( "test", new URL( "http://localhost:" + _port + "/repo" ) );
+
+ RepositoryUpdatePolicy up =
+ new RepositoryUpdateIntervalPolicy( RepositoryUpdateIntervalPolicy.UPDATE_POLICY_NAME_DAILY );
+
+ repo = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
+ ( (RemoteRepository) repo ).setUpdatePolicy( up );
+ ( (RemoteRepositoryM2) repo ).setWorkAroundBadMetadata( false );
+
+ repo.setDependencyProcessor( new MetadataProcessorMock() );
+ reader = repo.getReader();
+
+ _cacheBase = new File( _testBase, VirtualRepositoryReader.METADATA_CACHE_DIR );
+ _cacheBase.delete();
+ _cacheBase.mkdirs();
+
+ _mdCache = VirtualRepositoryReader.getCache( _testBase );
+
+ reader.setMetadataCache( _mdCache );
+
+ super.setUp();
+
+ }
+
+ // -------------------------------------------------------------------------
+ @Override
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+ _server.stop();
+ _server.destroy();
+ }
+
+ // -------------------------------------------------------------------------
+ private void validateMmd( Metadata mmd )
+ {
+ assertNotNull( mmd );
+ assertEquals( "a", mmd.getGroupId() );
+ assertEquals( "a", mmd.getArtifactId() );
+
+ assertNotNull( mmd.getVersioning() );
+
+ List<String> versions = mmd.getVersioning().getVersions();
+
+ assertNotNull( versions );
+ assertTrue( versions.size() > 3 );
+ }
+
+ // -------------------------------------------------------------------------
+ public void testReadMd()
+ throws FileNotFoundException, IOException, XmlPullParserException
+ {
+ FileInputStream fis = new FileInputStream( new File( _testBase, "a/a/maven-metadata.xml" ) );
+ Metadata mmd = _xpp3Reader.read( fis );
+ fis.close();
+ validateMmd( mmd );
+ }
+
+ // -------------------------------------------------------------------------
+ public void testReadRemoteMdViaRepositoryReader()
+ throws FileNotFoundException, IOException, XmlPullParserException, RepositoryException, MetadataReaderException
+ {
+
+ byte[] mmBuf = reader.readRawData( "a/a/maven-metadata.xml", false );
+
+ assertNotNull( mmBuf );
+ assertTrue( mmBuf.length > 1 );
+
+ ByteArrayInputStream bais = new ByteArrayInputStream( mmBuf );
+ Metadata mmd = _xpp3Reader.read( bais );
+ bais.close();
+
+ validateMmd( mmd );
+
+ String mdFileName = "a/a/" + "meta-ga-" + repo.getId() + ".xml";
+ File cachedMd = new File( _cacheBase, mdFileName );
+
+ try
{
- System.out.println("found file: "+f.getCanonicalPath() );
- System.out.flush();
+ File dir = new File( _cacheBase, "a/a" );
+ File[] files = dir.listFiles();
+ System.out.println( "=====> Files in " + dir.getCanonicalPath() );
+ System.out.flush();
+ if ( files != null && files.length > 0 )
+ for ( File f : files )
+ {
+ System.out.println( "found file: " + f.getCanonicalPath() );
+ System.out.flush();
+ }
+ else
+ {
+ System.out.println( "empty folder" );
+ System.out.flush();
+ }
+
+ System.out.println( "<=====" );
+ System.out.flush();
}
- else
- {
- System.out.println("empty folder" );
- System.out.flush();
- }
-
- System.out.println("<=====" );
- System.out.flush();
- }
- catch( Throwable e ) {}
-
- if( goodOs )
- assertTrue( "cached metadata "+cachedMd.getCanonicalPath()+" does not exist", cachedMd.exists() );
- }
- //-------------------------------------------------------------------------
- @Override
- public void testReadLatest()
- throws IllegalArgumentException,
- RepositoryException
- {
- super.testReadLatest();
-
- File cachedMd = new File( _cacheBase, "a/a/"+"meta-ga-"+repo.getId()+".xml" );
-
- assertTrue( cachedMd.exists() );
-
- File cachedVMd = new File( _cacheBase, "a/a/a-5-SNAPSHOT/"+"meta-gav-"+repo.getId()+".xml" );
-
- assertTrue( cachedVMd.exists() );
- }
- //-------------------------------------------------------------------------
- @Override
- public void testReadRelease()
- throws IllegalArgumentException,
- RepositoryException
- {
- super.testReadRelease();
- }
- //-------------------------------------------------------------------------
- //-------------------------------------------------------------------------
+ catch ( Throwable e )
+ {
+ }
+
+ if ( goodOs )
+ assertTrue( "cached metadata " + cachedMd.getCanonicalPath() + " does not exist", cachedMd.exists() );
+ }
+
+ // -------------------------------------------------------------------------
+ @Override
+ public void testReadLatest()
+ throws IllegalArgumentException, RepositoryException
+ {
+ super.testReadLatest();
+
+ File cachedMd = new File( _cacheBase, "a/a/" + "meta-ga-" + repo.getId() + ".xml" );
+
+ assertTrue( cachedMd.exists() );
+
+ File cachedVMd = new File( _cacheBase, "a/a/a-5-SNAPSHOT/" + "meta-gav-" + repo.getId() + ".xml" );
+
+ assertTrue( cachedVMd.exists() );
+ }
+
+ // -------------------------------------------------------------------------
+ @Override
+ public void testReadRelease()
+ throws IllegalArgumentException, RepositoryException
+ {
+ super.testReadRelease();
+ }
+ // -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java Mon Apr 27 23:12:25 2009
@@ -46,117 +46,129 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class RemoteRepositoryReaderM2Test
-extends AbstractRepositoryReaderM2Test
+ extends AbstractRepositoryReaderM2Test
{
- MetadataXpp3Reader _reader;
- File _testBase;
- DefaultRetriever _retriever;
- String _port;
- HttpTestServer _server;
- DefaultRetrievalRequest _request;
-
- //-------------------------------------------------------------------------
- @Override
- protected void setUp()
- throws Exception
- {
- _testBase = new File("./target/test-classes/repo");
- FileUtil.copy( new File("src/test/resources/repo"), _testBase, false );
-
- _retriever = new DefaultRetriever();
- _server = new HttpTestServer( _testBase, "/repo" );
- _server.start();
- _port = String.valueOf( _server.getPort() );
-
- _reader = new MetadataXpp3Reader();
- _request = new DefaultRetrievalRequest();
-
- mdProcessor = new MetadataProcessorMock();
-
- query = new ArrayList<ArtifactMetadata>();
-
- server = new Server( "test", new URL("http://localhost:"+_port+"/repo") );
- repo = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
- repo.setDependencyProcessor( mdProcessor );
- reader = repo.getReader();
-
- super.setUp();
- }
- //-------------------------------------------------------------------------
- @Override
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- if( _server != null )
- {
- _server.stop();
- _server.destroy();
- }
- _server = null;
- }
- //-------------------------------------------------------------------------
- private void validateMmd( Metadata mmd )
- {
- assertNotNull( mmd );
- assertEquals("a", mmd.getGroupId() );
- assertEquals("a", mmd.getArtifactId() );
-
- assertNotNull( mmd.getVersioning() );
-
- List<String> versions = mmd.getVersioning().getVersions();
-
- assertNotNull( versions );
- assertTrue( versions.size() > 3 );
- }
- //-------------------------------------------------------------------------
- public void testReadMd()
- throws FileNotFoundException, IOException, XmlPullParserException
- {
- FileInputStream fis = new FileInputStream( new File( _testBase, "a/a/maven-metadata.xml") );
- Metadata mmd = _reader.read( fis );
- fis.close();
- validateMmd( mmd );
- }
- //-------------------------------------------------------------------------
- public void testReadRemoteMdViaHttpClient()
- throws FileNotFoundException, IOException, XmlPullParserException
- {
- File temp = new File("./target/maven-metadata.temp" );
- HashSet<Binding> bindings = new HashSet<Binding>();
-
- Binding aaMdBinding = new Binding( new URL("http://localhost:"+_port+"/repo/a/a/maven-metadata.xml"), temp);
- bindings.add( aaMdBinding );
-
- _request.setBindings(bindings);
-
- RetrievalResponse response = _retriever.retrieve(_request);
-
- if( response.hasExceptions() )
- fail("retrieval exceptions: "+response.getExceptions()+"\nReading from "+aaMdBinding.getRemoteResource() );
-
- Metadata mmd = _reader.read( new FileInputStream( temp ) );
- temp.delete();
-
- validateMmd( mmd );
-
- }
- //-------------------------------------------------------------------------
- public void testReadRemoteMdViaRepositoryReader()
- throws FileNotFoundException, IOException, XmlPullParserException, RepositoryException, MetadataReaderException
- {
-
- byte [] mmBuf = reader.readRawData( "a/a/maven-metadata.xml", false );
-
- assertNotNull( mmBuf );
- assertTrue( mmBuf.length > 1 );
-
- ByteArrayInputStream bais = new ByteArrayInputStream( mmBuf );
- Metadata mmd = _reader.read( bais );
- bais.close();
-
- validateMmd( mmd );
- }
- //-------------------------------------------------------------------------
- //-------------------------------------------------------------------------
+ MetadataXpp3Reader _reader;
+
+ File _testBase;
+
+ DefaultRetriever _retriever;
+
+ String _port;
+
+ HttpTestServer _server;
+
+ DefaultRetrievalRequest _request;
+
+ // -------------------------------------------------------------------------
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ _testBase = new File( "./target/test-classes/repo" );
+ FileUtil.copy( new File( "src/test/resources/repo" ), _testBase, false );
+
+ _retriever = new DefaultRetriever();
+ _server = new HttpTestServer( _testBase, "/repo" );
+ _server.start();
+ _port = String.valueOf( _server.getPort() );
+
+ _reader = new MetadataXpp3Reader();
+ _request = new DefaultRetrievalRequest();
+
+ mdProcessor = new MetadataProcessorMock();
+
+ query = new ArrayList<ArtifactMetadata>();
+
+ server = new Server( "test", new URL( "http://localhost:" + _port + "/repo" ) );
+ repo = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
+ repo.setDependencyProcessor( mdProcessor );
+ reader = repo.getReader();
+
+ super.setUp();
+ }
+
+ // -------------------------------------------------------------------------
+ @Override
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+ if ( _server != null )
+ {
+ _server.stop();
+ _server.destroy();
+ }
+ _server = null;
+ }
+
+ // -------------------------------------------------------------------------
+ private void validateMmd( Metadata mmd )
+ {
+ assertNotNull( mmd );
+ assertEquals( "a", mmd.getGroupId() );
+ assertEquals( "a", mmd.getArtifactId() );
+
+ assertNotNull( mmd.getVersioning() );
+
+ List<String> versions = mmd.getVersioning().getVersions();
+
+ assertNotNull( versions );
+ assertTrue( versions.size() > 3 );
+ }
+
+ // -------------------------------------------------------------------------
+ public void testReadMd()
+ throws FileNotFoundException, IOException, XmlPullParserException
+ {
+ FileInputStream fis = new FileInputStream( new File( _testBase, "a/a/maven-metadata.xml" ) );
+ Metadata mmd = _reader.read( fis );
+ fis.close();
+ validateMmd( mmd );
+ }
+
+ // -------------------------------------------------------------------------
+ public void testReadRemoteMdViaHttpClient()
+ throws FileNotFoundException, IOException, XmlPullParserException
+ {
+ File temp = new File( "./target/maven-metadata.temp" );
+ HashSet<Binding> bindings = new HashSet<Binding>();
+
+ Binding aaMdBinding =
+ new Binding( new URL( "http://localhost:" + _port + "/repo/a/a/maven-metadata.xml" ), temp );
+ bindings.add( aaMdBinding );
+
+ _request.setBindings( bindings );
+
+ RetrievalResponse response = _retriever.retrieve( _request );
+
+ if ( response.hasExceptions() )
+ fail( "retrieval exceptions: " + response.getExceptions() + "\nReading from "
+ + aaMdBinding.getRemoteResource() );
+
+ Metadata mmd = _reader.read( new FileInputStream( temp ) );
+ temp.delete();
+
+ validateMmd( mmd );
+
+ }
+
+ // -------------------------------------------------------------------------
+ public void testReadRemoteMdViaRepositoryReader()
+ throws FileNotFoundException, IOException, XmlPullParserException, RepositoryException, MetadataReaderException
+ {
+
+ byte[] mmBuf = reader.readRawData( "a/a/maven-metadata.xml", false );
+
+ assertNotNull( mmBuf );
+ assertTrue( mmBuf.length > 1 );
+
+ ByteArrayInputStream bais = new ByteArrayInputStream( mmBuf );
+ Metadata mmd = _reader.read( bais );
+ bais.close();
+
+ validateMmd( mmd );
+ }
+ // -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
}