svn commit: r219867 - /maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java

[br...@apache.org]

Author: brett
Date: Wed Jul 20 02:30:19 2005
New Revision: 219867

URL: http://svn.apache.org/viewcvs?rev=219867&view=rev
Log:
utilise more sensible surefire directory battery

Modified:
    maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java

Modified: maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=219867&r1=219866&r2=219867&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Wed Jul 20 02:30:19 2005
@@ -54,7 +54,7 @@
     /**
      * @parameter expression="${maven.test.failure.ignore}"
      */
-    private boolean testFailureIgnore = false;
+    private boolean testFailureIgnore;
 
     /**
      * @parameter expression="${basedir}"
@@ -66,13 +66,13 @@
      * @parameter expression="${project.build.outputDirectory}"
      * @required
      */
-    private String classesDirectory;
+    private File classesDirectory;
 
     /**
      * @parameter expression="${project.build.testOutputDirectory}"
      * @required
      */
-    private String testClassesDirectory;
+    private File testClassesDirectory;
 
     /**
      * @parameter expression="${project.testClasspathElements}"
@@ -190,7 +190,7 @@
             }
 
             surefireBooter.addBattery( "org.codehaus.surefire.battery.DirectoryBattery",
-                                       new Object[]{basedir, includes, excludes} );
+                                       new Object[]{testClassesDirectory, includes, excludes} );
         }
 
         // ----------------------------------------------------------------------
@@ -212,9 +212,9 @@
         }
 
 
-        surefireBooter.addClassPathUrl( new File( classesDirectory ).getPath() );
+        surefireBooter.addClassPathUrl( classesDirectory.getPath() );
 
-        surefireBooter.addClassPathUrl( new File( testClassesDirectory ).getPath() );
+        surefireBooter.addClassPathUrl( testClassesDirectory.getPath() );
 
         for ( Iterator i = pluginArtifacts.iterator(); i.hasNext(); )
         {
@@ -231,7 +231,7 @@
 
         surefireBooter.addReport( "org.codehaus.surefire.report.FileReporter" );
 
-        boolean success = false;
+        boolean success;
         try
         {
             success = surefireBooter.run();
@@ -259,7 +259,7 @@
 
     protected String[] split( String str, String separator, int max )
     {
-        StringTokenizer tok = null;
+        StringTokenizer tok;
         if ( separator == null )
         {
             // Null separator means we're using StringTokenizer's default
@@ -279,7 +279,7 @@
 
         String[] list = new String[listSize];
         int i = 0;
-        int lastTokenBegin = 0;
+        int lastTokenBegin;
         int lastTokenEnd = 0;
         while ( tok.hasMoreTokens() )
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org