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/12/18 01:19:52 UTC
svn commit: r727593 - in /maven/mercury/trunk/mercury-ant/mercury-ant-tasks:
build.xml src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
Author: ogusakov
Date: Wed Dec 17 16:19:51 2008
New Revision: 727593
URL: http://svn.apache.org/viewvc?rev=727593&view=rev
Log:
[MERCURY-61] making windows tests work ..
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml?rev=727593&r1=727592&r2=727593&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml Wed Dec 17 16:19:51 2008
@@ -29,13 +29,13 @@
<merc:config id="config-bad-auth">
<merc:repo id="localRepo" dir="${local.repo.dir}"/>
- <merc:repo id="central" url="http://localhost:50000/maven2"/>
+ <merc:repo id="central" url="http://localhost:${repo.port}/maven2"/>
</merc:config>
<merc:config id="config-auth">
<merc:auth id="test-auth" name="foo" pass="bar"/>
<merc:repo id="localRepo" dir="${local.repo.dir}"/>
- <merc:repo id="central" url="http://localhost:50000/maven2" authid="test-auth">
+ <merc:repo id="central" url="http://localhost:${repo.port}/maven2" authid="test-auth">
</merc:repo>
</merc:config>
@@ -127,7 +127,7 @@
<merc:config id="pgp-conf">
<merc:repo id="localPgpRepo" dir="${local.verify.dir}"/>
- <merc:repo id="remotePgpRepo" url="http://localhost:50000/maven2">
+ <merc:repo id="remotePgpRepo" url="http://localhost:${repo.port}/maven2">
<merc:verifyread type="pgp">
<property name="keyring" value="${basedir}/target/test-classes/pgp/pubring.gpg"/>
</merc:verifyread>
@@ -149,7 +149,7 @@
<merc:config id="pgp-conf">
<merc:repo id="localPgpRepo" dir="${local.verify.dir}"/>
- <merc:repo id="remotePgpRepo" url="http://localhost:50000/maven2">
+ <merc:repo id="remotePgpRepo" url="http://localhost:${repo.port}/maven2">
<merc:verifyread type="pgp">
<property name="keyring" value="${basedir}/target/test-classes/pgp/pubring.gpg"/>
</merc:verifyread>
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java?rev=727593&r1=727592&r2=727593&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java Wed Dec 17 16:19:51 2008
@@ -48,7 +48,8 @@
AuthenticatingTestServer _jetty;
- String _port;
+ int _port;
+ static final int DEFAULT_PORT = 22883;
Resolver _resolver;
@@ -118,10 +119,10 @@
localRepo.setDir( _localRepoDir );
_remoteRepoDirFile = new File( _remoteRepoDir );
- _jetty = new AuthenticatingTestServer( 50000, _remoteRepoDirFile, _remoteRepoUrlSufix, false );
+ _jetty = new AuthenticatingTestServer( 0, _remoteRepoDirFile, _remoteRepoUrlSufix, false );
_jetty.start();
- _port = "" + _jetty.getPort();
-
+ _port = _jetty.getPort();
+
Config.Repo remoteRepo = _config.createRepo();
remoteRepo.setId( "remoteRepo" );
remoteRepo.setUrl( _remoteRepoUrlPrefix + _port + _remoteRepoUrlSufix );
@@ -139,8 +140,6 @@
System.setProperty( "ant.home", ".src/test/apache-ant-1.6.5" );
- configureProject( "build.xml" );
-
_writeRepoDirFile = new File( _writeRepoDir );
FileUtil.delete( _writeRepoDirFile );
_writeRepoDirFile.mkdirs();
@@ -156,6 +155,9 @@
_jarDirFile = new File( _jarDir );
FileUtil.delete( _jarDirFile );
_jarDirFile.mkdirs();
+
+ configureProject( "build.xml" );
+ getProject().setProperty( "repo.port", ""+_port );
}
// -----------------------------------
@@ -167,7 +169,7 @@
_jetty = new AuthenticatingTestServer( port, localBase, remotePathFragment, secured );
_jetty.start();
- this._port = ""+port;
+ this._port = port;
}
// -----------------------------------
@@ -252,7 +254,7 @@
System.out.println( "========> start " + title );
System.out.flush();
- restart( 50000, _remoteRepoDirFile, "/maven2", true );
+ restart( _port, _remoteRepoDirFile, "/maven2", true );
try
{
@@ -281,7 +283,7 @@
assertFalse( jar.exists() );
- restart( 50000, _remoteRepoDirFile, "/maven2", true );
+ restart( _port, _remoteRepoDirFile, "/maven2", true );
executeTarget( "compile-auth" );
@@ -337,8 +339,6 @@
File af = new File( _verifyRepoDirFile, "t/bad/1.0/bad-1.0.jar" );
assertFalse( af.exists() );
-// restart( 50000, _remoteRepoDirFile, "/maven2", false );
-
try
{
executeTarget( "bad-pgp" );
@@ -363,8 +363,6 @@
File af = new File( _verifyRepoDirFile, "t/t/1.0/t-1.0.jar" );
assertFalse( af.exists() );
-// restart( 50000, _remoteRepoDirFile, "/maven2", false );
-
executeTarget( "good-pgp" );
assertTrue( af.exists() );