You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/09 22:05:25 UTC
svn commit: r783120 -
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
Author: bentmann
Date: Tue Jun 9 20:05:25 2009
New Revision: 783120
URL: http://svn.apache.org/viewvc?rev=783120&view=rev
Log:
o Used declarative skip directive
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java?rev=783120&r1=783119&r2=783120&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java Tue Jun 9 20:05:25 2009
@@ -184,50 +184,45 @@
throws Exception
{
// TODO: implement equivalent test for 3.0 once supported
- if ( matchesVersionRange( "[2.1.0-M1,3.0-alpha-1)" ) ) //2.1.0-M1+
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
-
- /*
- * NOTE: Make sure the WebDAV extension required by the test project has been pulled down into the local
- * repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage
- * for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
- */
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- String settings = FileUtils.fileRead( new File( testDir, "settings.xml.template" ) );
- settings = StringUtils.replace( settings, "@port@", Integer.toString( port ) );
- String newSettings = StringUtils.replace( settings, "@protocol@", "dav" );
-
- FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
-
- verifier = new Verifier( testDir.getAbsolutePath() );
-
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings" );
- cliOptions.add( "settings.xml" );
- cliOptions.add( "-X" );
-
- verifier.setCliOptions( cliOptions );
-
- verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "pom" );
-
- verifier.setLogFileName( "logDAV.txt" );
- verifier.executeGoal( "compile" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
- verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
- content + LS );
- }
- else
- {
- System.out.print( " [skipping DAV test for Maven versions < 2.1.0-M1] " );
- }
+ requiresMavenVersion( "[2.1.0-M1,3.0-alpha-1)" );
+
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
+
+ /*
+ * NOTE: Make sure the WebDAV extension required by the test project has been pulled down into the local
+ * repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage
+ * for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
+ */
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ String settings = FileUtils.fileRead( new File( testDir, "settings.xml.template" ) );
+ settings = StringUtils.replace( settings, "@port@", Integer.toString( port ) );
+ String newSettings = StringUtils.replace( settings, "@protocol@", "dav" );
+
+ FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
+
+ verifier = new Verifier( testDir.getAbsolutePath() );
+
+ List cliOptions = new ArrayList();
+ cliOptions.add( "--settings" );
+ cliOptions.add( "settings.xml" );
+ cliOptions.add( "-X" );
+
+ verifier.setCliOptions( cliOptions );
+
+ verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "pom" );
+
+ verifier.setLogFileName( "logDAV.txt" );
+ verifier.executeGoal( "compile" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
+ verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
+ content + LS );
}
}