DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Tue Mar  8 10:43:29 2005
New Revision: 1975

Modified:
   
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
Log:
housekeeping

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
==============================================================================
--- 
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java  
      (original)
+++ 
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java  
      Tue Mar  8 10:43:29 2005
@@ -126,15 +126,6 @@
         final File working = getContext().getTestDirectory();
         copyUnitTestResource( working );
 
-        //
-        // disable the following as it creates an inconsistency between
-        // forked and non-forked tests (JUnit forked tests continue to
-        // run under ${basedir} irrespective of arguments to setDir()).
-        //
-        //
-        //final String origUserDir = System.getProperty( "user.dir" );
-        // System.setProperty( "user.dir", working.getAbsolutePath() );
-
         if( src.exists() )
         {
             final File classes = getContext().getTestClassesDirectory();
@@ -142,6 +133,7 @@
 
             final Definition definition = getDefinition();
             final Path classpath = definition.getPath( project, Policy.TEST 
);
+            System.out.println( "CLASSPATH: " + classpath );
 
             //
             // add the project jar to the classpath for the compilation
@@ -359,6 +351,11 @@
         basedir.setValue( project.getBaseDir().toString() );
         junit.addConfiguredSysproperty( basedir );
 
+        final Environment.Variable basedir2 = new Environment.Variable();
+        basedir2.setKey( "project.basedir" );
+        basedir2.setValue( project.getBaseDir().toString() );
+        junit.addConfiguredSysproperty( basedir2 );
+
         final Environment.Variable cache = new Environment.Variable();
         cache.setKey( CACHE_PATH_KEY );
         cache.setValue( getCachePath() );