DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2007-03-29 21:02:48 +0200 (Thu, 29 Mar 2007)
New Revision: 1937

Modified:
   trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java
Log:
update the junit task to include ${project.test.dir}/test.properties

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java 
2007-03-28 17:16:40 UTC (rev 1936)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/JUnitTestTask.java 
2007-03-29 19:02:48 UTC (rev 1937)
@@ -426,9 +426,16 @@
     
     private void setupTestProperties( JUnitTask junit, Project project, File 
working )
     {
+        File base = project.getBaseDir();
+        setupTestProperties( junit, project, working, new File( base, 
"test.properties" ) );
+        setupTestProperties( junit, project, working, new File( working, 
"test.properties" ) );
+    }
+    
+    private void setupTestProperties( JUnitTask junit, Project project, File 
working, File properties )
+    {
         Resource resource = getResource();
         File base = project.getBaseDir();
-        final File properties = new File( base, "test.properties" );
+        //final File properties = new File( base, "test.properties" );
         if( properties.exists() )
         {
             Properties props = new Properties();