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 20:11:09 UTC
svn commit: r711361 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-2883/ resources/mng-3482/
Author: bentmann
Date: Tue Nov 4 11:11:08 2008
New Revision: 711361
URL: http://svn.apache.org/viewvc?rev=711361&view=rev
Log:
o Simplified filtering and avoided usage of platform encoding for robustness
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/settings-template.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3482/settings-template.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java?rev=711361&r1=711360&r2=711361&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java Tue Nov 4 11:11:08 2008
@@ -21,16 +21,9 @@
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
-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;
@@ -69,7 +62,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- File settings = writeSettings( testDir );
+ File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
+ verifier.newDefaultFilterProperties() );
List cliOptions = new ArrayList();
// used to inject the remote repository
@@ -167,7 +161,8 @@
List cliOptions = new ArrayList();
- File settings = writeSettings( testDir );
+ File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
+ verifier.newDefaultFilterProperties() );
// used to inject the remote repository
cliOptions.add( "-s" );
@@ -267,7 +262,8 @@
List cliOptions = new ArrayList();
- File settings = writeSettings( testDir );
+ File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
+ verifier.newDefaultFilterProperties() );
// used to inject the remote repository
cliOptions.add( "-s" );
@@ -342,48 +338,4 @@
}
}
- private File writeSettings( File testDir )
- throws IOException
- {
- File settingsIn = new File( testDir.getParentFile(), "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,
- "@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;
- }
-
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java?rev=711361&r1=711360&r2=711361&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java Tue Nov 4 11:11:08 2008
@@ -20,16 +20,9 @@
*/
import org.apache.maven.it.Verifier;
-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.List;
@@ -52,8 +45,6 @@
// file.
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3482" );
- File settings = writeSettings( testDir );
-
Verifier verifier;
/*
@@ -65,6 +56,9 @@
*/
verifier = new Verifier( testDir.getAbsolutePath() );
+ File settings = verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
+ verifier.newDefaultFilterProperties() );
+
verifier.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "jar" );
verifier.deleteArtifact( "test", "dep", "1", "pom" );
@@ -106,46 +100,4 @@
verifier.resetStreams();
}
- private File writeSettings( 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,
- "@TESTDIR@",
- testDir.getAbsolutePath() );
-
- File settingsOut = File.createTempFile( "settings.", ".xml" );
- settingsOut.deleteOnExit();
-
- if ( settingsOut.exists() )
- {
- settingsOut.delete();
- }
-
- Writer writer = null;
- try
- {
- writer = new FileWriter( settingsOut );
- IOUtil.copy( settingsContent, writer );
- }
- finally
- {
- IOUtil.close( writer );
- }
-
- return settingsOut;
- }
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/settings-template.xml?rev=711361&r1=711360&r2=711361&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/settings-template.xml Tue Nov 4 11:11:08 2008
@@ -26,7 +26,7 @@
<repositories>
<repository>
<id>testing-repo</id>
- <url>file://@TESTDIR@/remote-repository</url>
+ <url>@baseurl@/remote-repository</url>
<layout>legacy</layout>
<snapshots>
<checksumPolicy>ignore</checksumPolicy>
@@ -38,7 +38,7 @@
<pluginRepositories>
<pluginRepository>
<id>testing-repo</id>
- <url>file://@TESTDIR@/remote-repository</url>
+ <url>@baseurl@/remote-repository</url>
<layout>legacy</layout>
<snapshots>
<checksumPolicy>ignore</checksumPolicy>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3482/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3482/settings-template.xml?rev=711361&r1=711360&r2=711361&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3482/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3482/settings-template.xml Tue Nov 4 11:11:08 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,13 +26,13 @@
<repositories>
<repository>
<id>testing-repo</id>
- <url>file://@TESTDIR@/repo</url>
+ <url>@baseurl@/repo</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>testing-repo</id>
- <url>file://@TESTDIR@/repo</url>
+ <url>@baseurl@/repo</url>
</pluginRepository>
</pluginRepositories>
</profile>
@@ -19,4 +40,4 @@
<activeProfiles>
<activeProfile>remote-repository</activeProfile>
</activeProfiles>
-</settings>
\ No newline at end of file
+</settings>