Author: niclas
Date: Wed Sep 15 12:49:19 2004
New Revision: 46129
Modified:
avalon/trunk/planet/facilities/db/hsql/src/test/org/apache/avalon/db/hsql/test/HsqlServerTest.java
avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
JUnitTestTask now establishes the user.dir to point inside the target/test working
directory.
Modified:
avalon/trunk/planet/facilities/db/hsql/src/test/org/apache/avalon/db/hsql/test/HsqlServerTest.java
==============================================================================
---
avalon/trunk/planet/facilities/db/hsql/src/test/org/apache/avalon/db/hsql/test/HsqlServerTest.java
(original)
+++
avalon/trunk/planet/facilities/db/hsql/src/test/org/apache/avalon/db/hsql/test/HsqlServerTest.java
Wed Sep 15 12:49:19 2004
@@ -16,7 +16,10 @@
*/
package org.apache.avalon.db.hsql.test;
+import java.io.File;
+
import java.net.InetAddress;
+
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
Modified:
avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
==============================================================================
---
avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
(original)
+++
avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
Wed Sep 15 12:49:19 2004
@@ -58,7 +58,6 @@
protected void setUp() throws Exception
{
- System.out.println( System.getProperty( "user.dir" ) );
m_manager =
LoggingManagerHelper.setUpLoggingManager(
"avalon-logging-log4j", "log4j/log4j.properties" );
Modified:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Wed Sep 15 12:49:19 2004
@@ -103,7 +103,8 @@
final File working = getContext().getTestDirectory();
copyUnitTestResource( working );
-
+ final String origUserDir = System.getProperty( "user.dir" );
+ System.setProperty( "user.dir", working.getAbsolutePath() );
if( src.exists() )
{
final File classes = getContext().getTestClassesDirectory();
@@ -151,6 +152,7 @@
fail( message );
}
}
+ System.setProperty( "user.dir", origUserDir );
}
private void copyUnitTestResource( final File dest )
@@ -297,24 +299,24 @@
private void createIncludes(FileSet set, String pattern)
{
- StringTokenizer tokenizer = new StringTokenizer(pattern, ", ", false);
- while( tokenizer.hasMoreTokens())
- {
- String item = tokenizer.nextToken();
- set.createInclude().setName( item );
+ StringTokenizer tokenizer = new StringTokenizer(pattern, ", ", false);
+ while( tokenizer.hasMoreTokens())
+ {
+ String item = tokenizer.nextToken();
+ set.createInclude().setName( item );
}
-
+
}
private void createExcludes(FileSet set, String pattern)
{
- StringTokenizer tokenizer = new StringTokenizer(pattern, ", ", false);
- while( tokenizer.hasMoreTokens())
- {
+ StringTokenizer tokenizer = new StringTokenizer(pattern, ", ", false);
+ while( tokenizer.hasMoreTokens())
+ {
String item = tokenizer.nextToken();
- set.createExclude().setName( item );
+ set.createExclude().setName( item );
}
-
+
}
private String getCachePath()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
