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/07/05 20:14:16 UTC
svn commit: r791294 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
resources/mng-3415/pom.xml resources/mng-3415/project/
Author: bentmann
Date: Sun Jul 5 18:14:15 2009
New Revision: 791294
URL: http://svn.apache.org/viewvc?rev=791294&view=rev
Log:
o Simplified directory structure
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/pom.xml
- copied unchanged from r791292, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/pom.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/project/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java?rev=791294&r1=791293&r2=791294&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java Sun Jul 5 18:14:15 2009
@@ -94,11 +94,10 @@
String methodName = getMethodName();
File testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_BASE );
- File projectDir = new File( testDir, "project" );
Verifier verifier;
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3415" );
@@ -109,7 +108,7 @@
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.put( "@protocol@", "invalid" );
filterProps.put( "@port@", "0" );
- File settings = verifier.filterFile( "../settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
+ File settings = verifier.filterFile( "settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
@@ -169,11 +168,10 @@
String methodName = getMethodName();
File testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_BASE );
- File projectDir = new File( testDir, "project" );
Verifier verifier;
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3415" );
@@ -206,7 +204,7 @@
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.put( "@protocol@", "http" );
filterProps.put( "@port@", Integer.toString( port ) );
- File settings = verifier.filterFile( "../settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
+ File settings = verifier.filterFile( "settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );