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 2008/11/04 19:53:03 UTC
svn commit: r711352 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
resources/mng-3415/settings-template.xml
Author: bentmann
Date: Tue Nov 4 10:53:02 2008
New Revision: 711352
URL: http://svn.apache.org/viewvc?rev=711352&view=rev
Log:
o Fixed platform-dependence of IT
(The construction "invalid://@basedir@" delivers "invalid://C:/path" on Windows where "C" comes out as the host name followed by a missing port...)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/settings-template.xml
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=711352&r1=711351&r2=711352&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 Tue Nov 4 10:53:02 2008
@@ -22,19 +22,14 @@
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.IOUtil;
import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.util.StringUtils;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
/**
* This is a sample integration test. The IT tests typically
@@ -95,9 +90,6 @@
File logFile = new File( projectDir, "log.txt" );
- String proto = "invalid";
-
- File settings = writeSettings( proto, testDir );
File localRepo = findLocalRepoDirectory();
setupDummyDependency( testDir, localRepo, true );
@@ -106,6 +98,10 @@
verifier = new Verifier( projectDir.getAbsolutePath() );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ filterProps.put( "@baseurl@", "invalid" + filterProps.getProperty( "@baseurl@" ).substring( "file".length() ) );
+ File settings = verifier.filterFile( "../settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
+
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
cliOptions.add( "-s" );
@@ -173,7 +169,6 @@
File logFile = new File( projectDir, "log.txt" );
- File settings = writeSettings( "file", testDir );
File localRepo = findLocalRepoDirectory();
setupDummyDependency( testDir, localRepo, true );
@@ -182,6 +177,9 @@
verifier = new Verifier( projectDir.getAbsolutePath() );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ File settings = verifier.filterFile( "../settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
+
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
cliOptions.add( "-s" );
@@ -327,52 +325,6 @@
return localRepo;
}
- private File writeSettings( String repositoryProtocol,
- File testDir )
- throws IOException
- {
- File settingsIn = new File( testDir, "settings-template.xml" );
-
- String settingsContent = null;
- Reader reader = null;
- try
- {
- reader = new FileReader( settingsIn );
- settingsContent = IOUtil.toString( reader );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- settingsContent = StringUtils.replace( settingsContent, "@PROTO@", repositoryProtocol );
- settingsContent = StringUtils.replace( settingsContent,
- "@TESTDIR@",
- testDir.getAbsolutePath() );
-
- File settingsOut = new File( testDir, "settings.xml" );
-
- System.out.println( "Writing tets settings to: " + settingsOut );
-
- if ( settingsOut.exists() )
- {
- settingsOut.delete();
- }
-
- Writer writer = null;
- try
- {
- writer = new FileWriter( settingsOut );
- IOUtil.copy( settingsContent, writer );
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- return settingsOut;
- }
-
private void assertOutputLinePresent( Verifier verifier,
File logFile,
String lineContents )
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/settings-template.xml?rev=711352&r1=711351&r2=711352&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3415/settings-template.xml Tue Nov 4 10:53:02 2008
@@ -1,3 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<settings>
<profiles>
<profile>
@@ -5,7 +26,7 @@
<repositories>
<repository>
<id>testing-repo</id>
- <url>@PROTO@://@TESTDIR@/remote-repository</url>
+ <url>@baseurl@/remote-repository</url>
</repository>
</repositories>
</profile>
@@ -13,4 +34,4 @@
<activeProfiles>
<activeProfile>remote-repository</activeProfile>
</activeProfiles>
-</settings>
\ No newline at end of file
+</settings>