Author: jvanzyl
Date: Thu May 31 21:56:53 2007
New Revision: 543390
URL: http://svn.apache.org/viewvc?view=rev&rev=543390
Log:
MNG-2987 fixing some ITs
Submitted by: Mark Hobson
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java?view=diff&rev=543390&r1=543389&r2=543390
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
Thu May 31 21:56:53 2007
@@ -37,7 +37,7 @@
//use my custom settings upon invocation.
ArrayList cli = new ArrayList();
- cli.add("-s "+testDir.getAbsolutePath()+"/settings.xml");
+ cli.add("-s '" +testDir.getAbsolutePath()+"/settings.xml'");
verifier.setCliOptions( cli );
verifier.executeGoal( "it0119:custom" );
verifier.verifyErrorFreeLog();
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java?view=diff&rev=543390&r1=543389&r2=543390
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java
Thu May 31 21:56:53 2007
@@ -2,6 +2,7 @@
import junit.framework.TestCase;
import java.net.URL;
+import java.net.URISyntaxException;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -9,7 +10,7 @@
public class PersonTest
extends TestCase
{
- public void testPerson() throws IOException
+ public void testPerson() throws IOException, URISyntaxException
{
ClassLoader cloader = getClass().getClassLoader();
@@ -17,7 +18,7 @@
URL resource = cloader.getResource( path );
- File resourceFile = new File( resource.getPath() );
+ File resourceFile = new File( resource.toURI() );
String dirPath = resourceFile.getAbsolutePath();