maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r381878 [2/2] - in /maven/surefire/branches/surefire-testng: surefire-booter/ surefire-booter/src/main/java/org/apache/maven/surefire/ surefire/ surefire/src/main/java/org/apache/maven/surefire/ surefire/src/main/java/org/apache/maven/suref...
Date Wed, 01 Mar 2006 02:42:25 GMT
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 /**
  * Brief format file reporter.
+ *
  * @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
  * @version $Id$
  */
@@ -30,23 +31,23 @@
     extends AbstractReporter
 {
     private PrintWriter writer;
-    
+
     private StringBuffer reportContent;
-    
+
     private long batteryStartTime;
 
     public void runStarting( int testCount )
     {
-        
+
     }
 
     public void batteryStarting( ReportEntry report )
         throws Exception
     {
         batteryStartTime = System.currentTimeMillis();
-        
+
         reportContent = new StringBuffer();
-        
+
         File reportFile = new File( getReportsDirectory(), report.getName() + ".txt" );
 
         File reportDir = reportFile.getParentFile();
@@ -65,41 +66,41 @@
     public void batteryCompleted( ReportEntry report )
     {
         long runTime = System.currentTimeMillis() - this.batteryStartTime;
-        
+
         StringBuffer batterySummary = new StringBuffer();
 
         batterySummary.append( "Tests run: " + String.valueOf( this.getNbTests() ) )
-                      .append( ", Failures: " + String.valueOf( this.getNbFailures() ) )
-                      .append( ", Errors: " + String.valueOf( this.getNbErrors() ))
-                      .append( ", Time elapsed: " + elapsedTimeAsString( runTime ))
-                      .append(" sec \n\n");
-                      
-        reportContent = batterySummary.append(reportContent);
-        
+            .append( ", Failures: " + String.valueOf( this.getNbFailures() ) )
+            .append( ", Errors: " + String.valueOf( this.getNbErrors() ) )
+            .append( ", Time elapsed: " + elapsedTimeAsString( runTime ) )
+            .append( " sec \n\n" );
+
+        reportContent = batterySummary.append( reportContent );
+
         writer.println( reportContent.toString() );
-        
+
         writer.flush();
 
         writer.close();
     }
 
     public void testStarting( ReportEntry report )
-    { 
-        super.testStarting(report);
+    {
+        super.testStarting( report );
     }
 
     public void testError( ReportEntry report, String stdOut, String stdErr )
     {
-        super.testError(report, stdOut, stdErr);
+        super.testError( report, stdOut, stdErr );
+
+        reportContent.append( report.getName() );
 
-        reportContent.append(report.getName() );
-        
         long runTime = this.endTime - this.startTime;
-        
-        writeTimeElapsed(runTime);
-        
-        reportContent.append("  <<< ERROR!\n");
-        
+
+        writeTimeElapsed( runTime );
+
+        reportContent.append( "  <<< ERROR!\n" );
+
         writeStdLogs( stdOut, stdErr );
 
         reportContent.append( getStackTrace( report ) + "\n" );
@@ -107,16 +108,16 @@
 
     public void testFailed( ReportEntry report, String stdOut, String stdErr )
     {
-        super.testFailed(report, stdOut, stdErr);
-        
-        reportContent.append(report.getName() );
-        
+        super.testFailed( report, stdOut, stdErr );
+
+        reportContent.append( report.getName() );
+
         long runTime = this.endTime - this.startTime;
-        
-        writeTimeElapsed(runTime);
-        
-        reportContent.append("  <<< FAILURE!\n");
-        
+
+        writeTimeElapsed( runTime );
+
+        reportContent.append( "  <<< FAILURE!\n" );
+
         writeStdLogs( stdOut, stdErr );
 
         reportContent.append( getStackTrace( report ) + "\n" );
@@ -125,55 +126,56 @@
     public void dispose()
     {
         errors = 0;
-        
+
         failures = 0;
-        
-        completedCount = 0;       
+
+        completedCount = 0;
     }
 
-    private void writeTimeElapsed(long sec)
+    private void writeTimeElapsed( long sec )
     {
         reportContent.append( "  Time elapsed: " + elapsedTimeAsString( sec ) + " sec" );
     }
-    
+
     private void writeStdLogs( String stdOut, String stdErr )
     {
-        reportContent.append("\n");
+        reportContent.append( "\n" );
 
         reportContent.append( "[ stdout ] ---------------------------------------------------------------\n" );
 
-        reportContent.append("\n");
+        reportContent.append( "\n" );
 
-        reportContent.append( stdOut + "\n");
+        reportContent.append( stdOut + "\n" );
 
-        reportContent.append("\n");
+        reportContent.append( "\n" );
 
         reportContent.append( "[ stderr ] ---------------------------------------------------------------\n" );
 
-        reportContent.append("\n");
+        reportContent.append( "\n" );
 
-        reportContent.append( stdErr + "\n");
+        reportContent.append( stdErr + "\n" );
 
-        reportContent.append("\n");
+        reportContent.append( "\n" );
 
         reportContent.append( "[ stacktrace ] -----------------------------------------------------------\n" );
 
-        reportContent.append("\n");
+        reportContent.append( "\n" );
     }
-    
+
     /**
      * Returns stacktrace as String.
-     * @param report ReportEntry object. 
-     * @return stacktrace as string. 
+     *
+     * @param report ReportEntry object.
+     * @return stacktrace as string.
      */
-    private String getStackTrace(ReportEntry report)
-    {   
+    private String getStackTrace( ReportEntry report )
+    {
         StringWriter writer = new StringWriter();
-        
-        report.getThrowable().printStackTrace(new PrintWriter(writer));
-      
+
+        report.getThrowable().printStackTrace( new PrintWriter( writer ) );
+
         writer.flush();
-        
+
         return writer.toString();
     }
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
     protected static final int BUFFER_SIZE = 4096;
 
     protected PrintWriter writer;
-    
+
     protected long batteryStartTime;
 
     public ConsoleReporter()
@@ -72,6 +72,7 @@
         println( report.getMessage() );
         println( report.getThrowable().getMessage() );
     }
+
     public void batteryAborted( ReportEntry report )
     {
         println( "BATTERY ABORTED" );
@@ -89,7 +90,7 @@
         throws Exception
     {
         batteryStartTime = System.currentTimeMillis();
-        
+
         println( "[surefire] Running " + report.getName() );
     }
 
@@ -97,16 +98,14 @@
     {
         long runTime = System.currentTimeMillis() - batteryStartTime;
 
-        print( "[surefire] Tests run: " + completedCount +
-                             ", Failures: " + failures +
-                             ", Errors: " + errors +
-                             ", Time elapsed: " + elapsedTimeAsString( runTime ) + " sec" );
+        print( "[surefire] Tests run: " + completedCount + ", Failures: " + failures + ", Errors: " + errors +
+            ", Time elapsed: " + elapsedTimeAsString( runTime ) + " sec" );
 
         if ( failures > 0 || errors > 0 )
         {
             writer.print( " <<<<<<<< FAILURE !! " );
         }
-        
+
         writer.println( "" );
 
         writer.flush();

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 /**
  * Detailed console reporter.
+ *
  * @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
  * @version $Id$
  */
@@ -30,26 +31,26 @@
     extends AbstractReporter
 {
     private static final int BUFFER_SIZE = 4096;
-    
+
     private PrintWriter writer;
-    
+
     private StringBuffer reportContent;
-    
+
     private long batteryStartTime;
-    
-    String newLine = System.getProperty("line.separator");
-    
+
+    String newLine = System.getProperty( "line.separator" );
+
     public DetailedConsoleReporter()
     {
         writer = new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
     }
-    
+
     public void writeMessage( String message )
     {
         writer.println( message );
         writer.flush();
     }
-    
+
     public void runStarting( int testCount )
     {
         writer.println();
@@ -57,80 +58,80 @@
         writer.println( " T E S T S" );
         writer.println( "-------------------------------------------------------" );
         writer.flush();
-        
+
     }
 
     public void batteryStarting( ReportEntry report )
         throws Exception
     {
         batteryStartTime = System.currentTimeMillis();
-        
+
         reportContent = new StringBuffer();
-        
+
         writer.println( "[surefire] Running " + report.getName() );
     }
 
     public void batteryCompleted( ReportEntry report )
     {
         long runTime = System.currentTimeMillis() - this.batteryStartTime;
-        
+
         StringBuffer batterySummary = new StringBuffer();
 
         batterySummary.append( "[surefire] Tests run: " + String.valueOf( this.getNbTests() ) )
-                      .append( ", Failures: " + String.valueOf( this.getNbFailures() ) )
-                      .append( ", Errors: " + String.valueOf( this.getNbErrors() ))
-                      .append( ", Time elapsed: " + elapsedTimeAsString( runTime ))
-                      .append(" sec")
-                      .append(newLine)
-                      .append("[surefire] " +  newLine);
-                      
-        reportContent = batterySummary.append(reportContent);
-        
+            .append( ", Failures: " + String.valueOf( this.getNbFailures() ) )
+            .append( ", Errors: " + String.valueOf( this.getNbErrors() ) )
+            .append( ", Time elapsed: " + elapsedTimeAsString( runTime ) )
+            .append( " sec" )
+            .append( newLine )
+            .append( "[surefire] " + newLine );
+
+        reportContent = batterySummary.append( reportContent );
+
         writer.println( reportContent.toString() );
-        
+
         writer.flush();
     }
 
     public void testStarting( ReportEntry report )
-    { 
-        super.testStarting(report);
-        
-        reportContent.append("[surefire] " + report.getName() );
+    {
+        super.testStarting( report );
+
+        reportContent.append( "[surefire] " + report.getName() );
     }
 
     public void testSucceeded( ReportEntry report )
     {
-        super.testSucceeded(report);
+        super.testSucceeded( report );
 
         long runTime = this.endTime - this.startTime;
-        
-        writeTimeElapsed(runTime);
-        
-        reportContent.append(newLine);
+
+        writeTimeElapsed( runTime );
+
+        reportContent.append( newLine );
     }
 
     public void testError( ReportEntry report, String stdOut, String stdErr )
     {
-        super.testError(report, stdOut, stdErr);
+        super.testError( report, stdOut, stdErr );
 
         long runTime = this.endTime - this.startTime;
-        
-        writeTimeElapsed(runTime);
-        
-        reportContent.append("  <<< ERROR!" + newLine);
- 
+
+        writeTimeElapsed( runTime );
+
+        reportContent.append( "  <<< ERROR!" + newLine );
+
         reportContent.append( getStackTrace( report ) + newLine );
     }
 
     public void testFailed( ReportEntry report, String stdOut, String stdErr )
     {
-        super.testFailed(report, stdOut, stdErr);
-        
+        super.testFailed( report, stdOut, stdErr );
+
         long runTime = this.endTime - this.startTime;
-        
-        writeTimeElapsed(runTime);
-        
-        reportContent.append("  <<< FAILURE!" + newLine);
+
+        writeTimeElapsed( runTime );
+
+        reportContent.append( "  <<< FAILURE!" + newLine );
 
         reportContent.append( getStackTrace( report ) + newLine );
     }
@@ -138,30 +139,31 @@
     public void dispose()
     {
         errors = 0;
-        
+
         failures = 0;
-        
-        completedCount = 0;       
+
+        completedCount = 0;
     }
 
-    private void writeTimeElapsed(long sec)
+    private void writeTimeElapsed( long sec )
     {
         reportContent.append( "  Time elapsed: " + elapsedTimeAsString( sec ) + " sec" );
     }
-    
-   /**
-    * Returns stacktrace as string.
-    * @param report ReportEntry object.
-    * @return stacktrace as string. 
-    */
-    private String getStackTrace(ReportEntry report)
-    {   
+
+    /**
+     * Returns stacktrace as string.
+     *
+     * @param report ReportEntry object.
+     * @return stacktrace as string.
+     */
+    private String getStackTrace( ReportEntry report )
+    {
         StringWriter writer = new StringWriter();
-        
-        report.getThrowable().printStackTrace(new PrintWriter(writer));
-      
+
+        report.getThrowable().printStackTrace( new PrintWriter( writer ) );
+
         writer.flush();
-        
+
         return writer.toString();
     }
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/FileReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/FileReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/FileReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/FileReporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingConsoleReporter.java Tue Feb 28 18:42:20 2006
@@ -1,5 +1,21 @@
 package org.apache.maven.surefire.report;
 
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 public class ForkingConsoleReporter
     extends ConsoleReporter
 {

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingReport.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingReport.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingReport.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingReport.java Tue Feb 28 18:42:20 2006
@@ -1,12 +1,28 @@
 package org.apache.maven.surefire.report;
 
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /**
  * @author Jason van Zyl
- * @version $Revision:$
+ * @version $Revision$
  */
 public interface ForkingReport
 {
     static final String FORKING_PREFIX_STANDARD = "@SL";
 
-    static final String FORKING_PREFIX_HEADING = "@HL";    
+    static final String FORKING_PREFIX_HEADING = "@HL";
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java Tue Feb 28 18:42:20 2006
@@ -1,5 +1,21 @@
 package org.apache.maven.surefire.report;
 
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /**
  * Summary format console reporter.
  *

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,14 @@
     private String name;
 
     private String group;
-    
+
     private String message;
 
     private Throwable throwable;
 
     public ReportEntry( Object source, String name, String message )
     {
-       this(source, name, null, message);
+        this( source, name, null, message );
     }
 
     public ReportEntry( Object source, String name, String group, String message )
@@ -47,19 +47,19 @@
         {
             throw new NullPointerException( "message is null" );
         }
-        
+
         this.source = source;
-        
+
         this.name = name;
-        
+
         this.group = group;
-        
+
         this.message = message;
     }
-    
+
     public ReportEntry( Object source, String name, String message, Throwable throwable )
     {
-        this(source, name, null, message, throwable);
+        this( source, name, null, message, throwable );
     }
 
     public ReportEntry( Object source, String name, String group, String message, Throwable throwable )
@@ -86,12 +86,12 @@
         this.name = name;
 
         this.group = group;
-        
+
         this.message = message;
 
         this.throwable = throwable;
     }
-    
+
     public Object getSource()
     {
         return source;
@@ -106,7 +106,7 @@
     {
         return group;
     }
-    
+
     public String getMessage()
     {
         return message;

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/Reporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/Reporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/Reporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/Reporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReporterManager.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReporterManager.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReporterManager.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReporterManager.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,9 +103,7 @@
     {
         writeMessage( "" );
         writeMessage( "Results :" );
-        writeMessage( "[surefire] Tests run: " + completedCount +
-                      ", Failures: " + failures +
-                      ", Errors: " + errors );
+        writeMessage( "[surefire] Tests run: " + completedCount + ", Failures: " + failures + ", Errors: " + errors );
         writeMessage( "" );
     }
 

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 /**
  * Summary format console reporter.
+ *
  * @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
  * @version $Id$
  */

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java Tue Feb 28 18:42:20 2006
@@ -3,6 +3,22 @@
  */
 package org.apache.maven.surefire.report;
 
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.maven.surefire.Surefire;
 import org.testng.ISuite;
 import org.testng.ISuiteListener;
@@ -15,183 +31,203 @@
  * Listens for and provides and adaptor layer so that
  * TestNG tests can report their status to the current
  * {@link ReporterManager}.
- * 
+ *
  * @author jkuhnert
  */
-public class TestNGReporter implements ITestListener, ISuiteListener {
-    
-    /** core Surefire reporting */
+public class TestNGReporter
+    implements ITestListener, ISuiteListener
+{
+
+    /**
+     * core Surefire reporting
+     */
     protected ReporterManager reportManager;
-    /** core Surefire instance */
+
+    /**
+     * core Surefire instance
+     */
     protected Surefire surefire;
-    
+
     /**
      * Constructs a new instance that will listen to
-     * test updates from a {@link TestNG} class instance. 
-     * 
-     * <p/>It is assumed that the requisite {@link TestNG#addListener(ITestListener)} 
-     * method call has already associated with this instance <i>before</i> the test 
+     * test updates from a {@link TestNG} class instance.
+     * <p/>
+     * <p/>It is assumed that the requisite {@link TestNG#addListener(ITestListener)}
+     * method call has already associated with this instance <i>before</i> the test
      * suite is run.
-     * 
+     *
      * @param reportManager Instance to report suite status to
-     * @param surefire Main instance that provides resources messages,etc.
+     * @param surefire      Main instance that provides resources messages,etc.
      */
-    public TestNGReporter(ReporterManager reportManager, Surefire surefire)
+    public TestNGReporter( ReporterManager reportManager, Surefire surefire )
     {
         this.reportManager = reportManager;
         this.surefire = surefire;
-        
-        if (reportManager == null)
-            throw new IllegalArgumentException("ReportManager passed in was null.");
-        if (surefire == null)
-            throw new IllegalArgumentException("Surefire passed in was null.");
-    }
-    
-    /* (non-Javadoc)
-     * @see org.testng.ITestListener#onTestStart(org.testng.ITestResult)
-     */
-    public void onTestStart(ITestResult result)
-    {
-        String rawString = Surefire.getResources().getString("testStarting");
-        ReportEntry report = new ReportEntry(surefire,
-                result.getTestClass().getName() + "#" + result.getMethod().getMethodName(),
-                resultGroup(result),
-                rawString);
-        
-        reportManager.testStarting(report);
-        
-        
+
+        if ( reportManager == null )
+        {
+            throw new IllegalArgumentException( "ReportManager passed in was null." );
+        }
+        if ( surefire == null )
+        {
+            throw new IllegalArgumentException( "Surefire passed in was null." );
+        }
+    }
+
+    /* (non-Javadoc)
+    * @see org.testng.ITestListener#onTestStart(org.testng.ITestResult)
+    */
+    public void onTestStart( ITestResult result )
+    {
+        String rawString = Surefire.getResources().getString( "testStarting" );
+        ReportEntry report = new ReportEntry( surefire, result.getTestClass().getName() + "#" +
+            result.getMethod().getMethodName(), resultGroup( result ), rawString );
+
+        reportManager.testStarting( report );
+
+
     }
 
     /* (non-Javadoc)
      * @see org.testng.ITestListener#onTestSuccess(org.testng.ITestResult)
      */
-    public void onTestSuccess(ITestResult result)
+    public void onTestSuccess( ITestResult result )
     {
-        String rawString = Surefire.getResources().getString("testSuccessful");
-        
-        ReportEntry report = new ReportEntry(surefire, result.getName(),
-                rawString);
-        
-        reportManager.testSucceeded(report);
+        String rawString = Surefire.getResources().getString( "testSuccessful" );
+
+        ReportEntry report = new ReportEntry( surefire, result.getName(), rawString );
+
+        reportManager.testSucceeded( report );
     }
 
     /* (non-Javadoc)
      * @see org.testng.ITestListener#onTestFailure(org.testng.ITestResult)
      */
-    public void onTestFailure(ITestResult result)
+    public void onTestFailure( ITestResult result )
     {
-        String rawString = Surefire.getResources().getString("executeException");
+        String rawString = Surefire.getResources().getString( "executeException" );
 
         // TODO: almost certainly not correct: result.getMethod().getExtraOutput().getParameterOutput()
-        ReportEntry report = new ReportEntry(surefire, result.getName(),
-                rawString + result.getMethod().getExtraOutput().getParameterOutput(), result.getThrowable());
-        
-        reportManager.testFailed(report);
-    }
-    
-    /* (non-Javadoc)
-     * @see org.testng.ITestListener#onTestSkipped(org.testng.ITestResult)
-     */
-    public void onTestSkipped(ITestResult result)
-    {
-        String rawString = Surefire.getResources().getString("testSkipped");
-        
-        ReportEntry report = new ReportEntry(surefire, result.getName(),
-                rawString);
-        
-        reportManager.testSucceeded(report);
+        ReportEntry report = new ReportEntry( surefire, result.getName(),
+                                              rawString + result.getMethod().getExtraOutput().getParameterOutput(),
+                                              result.getThrowable() );
+
+        reportManager.testFailed( report );
+    }
+
+    /* (non-Javadoc)
+    * @see org.testng.ITestListener#onTestSkipped(org.testng.ITestResult)
+    */
+    public void onTestSkipped( ITestResult result )
+    {
+        String rawString = Surefire.getResources().getString( "testSkipped" );
+
+        ReportEntry report = new ReportEntry( surefire, result.getName(), rawString );
+
+        reportManager.testSucceeded( report );
     }
 
     /* (non-Javadoc)
      * @see org.testng.ITestListener#onTestFailedButWithinSuccessPercentage(org.testng.ITestResult)
      */
-    public void onTestFailedButWithinSuccessPercentage(ITestResult result)
+    public void onTestFailedButWithinSuccessPercentage( ITestResult result )
     {
-        String rawString = Surefire.getResources().getString("executeException");
-        
+        String rawString = Surefire.getResources().getString( "executeException" );
+
         // TODO: almost certainly not correct: result.getMethod().getExtraOutput().getParameterOutput()
-        ReportEntry report = new ReportEntry(surefire, result.getName(),
-                rawString + result.getMethod().getExtraOutput(), result.getThrowable());
-        
-        reportManager.testError(report);
+        ReportEntry report = new ReportEntry( surefire, result.getName(),
+                                              rawString + result.getMethod().getExtraOutput(), result.getThrowable() );
+
+        reportManager.testError( report );
     }
 
     /* (non-Javadoc)
      * @see org.testng.ITestListener#onStart(org.testng.ITestContext)
      */
-    public void onStart(ITestContext context)
+    public void onStart( ITestContext context )
     {
-        String rawString = Surefire.getResources().getString(
-        "suiteExecutionStarting");
-        
-        String group = groupString(context.getIncludedGroups());
-        if (group == null) group = context.getName();
-        
-        ReportEntry report = new ReportEntry(surefire,
-                context.getName(), group, rawString);
-        
-        reportManager.batteryStarting(report);
-    }
-    
-    /* (non-Javadoc)
-     * @see org.testng.ITestListener#onFinish(org.testng.ITestContext)
-     */
-    public void onFinish(ITestContext context)
-    {
-       String rawString = Surefire.getResources().getString("suiteCompletedNormally");
-        
-        ReportEntry report = new ReportEntry(surefire, 
-                context.getName(),
-                groupString(context.getIncludedGroups()),
-                rawString);
-        
-        reportManager.batteryCompleted(report);
-        
+        String rawString = Surefire.getResources().getString( "suiteExecutionStarting" );
+
+        String group = groupString( context.getIncludedGroups() );
+        if ( group == null )
+        {
+            group = context.getName();
+        }
+
+        ReportEntry report = new ReportEntry( surefire, context.getName(), group, rawString );
+
+        reportManager.batteryStarting( report );
+    }
+
+    /* (non-Javadoc)
+    * @see org.testng.ITestListener#onFinish(org.testng.ITestContext)
+    */
+    public void onFinish( ITestContext context )
+    {
+        String rawString = Surefire.getResources().getString( "suiteCompletedNormally" );
+
+        ReportEntry report =
+            new ReportEntry( surefire, context.getName(), groupString( context.getIncludedGroups() ), rawString );
+
+        reportManager.batteryCompleted( report );
+
         reportManager.runCompleted();
-        
+
         reportManager.dispose();
     }
-    
-    public void onFinish(ISuite suite)
+
+    public void onFinish( ISuite suite )
     {
     }
-    
-    public void onStart(ISuite suite)
+
+    public void onStart( ISuite suite )
     {
     }
-    
+
     /**
-     * Creates a string out of the list of testng groups in the 
-     * form of <pre>"group1,group2,group3"</pre>. 
+     * Creates a string out of the list of testng groups in the
+     * form of <pre>"group1,group2,group3"</pre>.
+     *
      * @param groups
      */
-    public static String groupString(String[] groups)
+    public static String groupString( String[] groups )
     {
-        if (groups != null && groups.length > 0) {
+        if ( groups != null && groups.length > 0 )
+        {
             StringBuffer str = new StringBuffer();
-            for (int i = 0; i < groups.length; i++) {
-                str.append(groups[i]);
-                if ((i + 1) < groups.length)
-                    str.append(",");
+            for ( int i = 0; i < groups.length; i++ )
+            {
+                str.append( groups[i] );
+                if ( ( i + 1 ) < groups.length )
+                {
+                    str.append( "," );
+                }
             }
             return str.toString();
-        } else
+        }
+        else
+        {
             return null;
+        }
     }
-    
+
     /**
      * Utility to report back with either the test class name
      * run, or the group(s) method belongs to.
-     * @param result 
+     *
+     * @param result
      * @return Valid string
      */
-    public static String resultGroup(ITestResult result)
+    public static String resultGroup( ITestResult result )
     {
-        String groupStr = groupString(result.getMethod().getGroups());
-        if (groupStr != null)
+        String groupStr = groupString( result.getMethod().getGroups() );
+        if ( groupStr != null )
+        {
             return groupStr;
+        }
         else
+        {
             return result.getTestClass().getName();
+        }
     }
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,20 +33,21 @@
 
 /**
  * XML format reporter.
+ *
  * @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
  * @version $Id$
  */
-public class XMLReporter 
+public class XMLReporter
     extends AbstractReporter
 {
     private PrintWriter writer;
-    
+
     private Xpp3Dom testSuite;
-    
+
     private Xpp3Dom testCase;
-    
+
     private long batteryStartTime;
-    
+
     public void setTestCase( Xpp3Dom testCase )
     {
         this.testCase = testCase;
@@ -64,41 +65,44 @@
 
     public void batteryStarting( ReportEntry report )
         throws Exception
-    {   
+    {
         batteryStartTime = System.currentTimeMillis();
-        
-        File reportFile = new File( getReportsDirectory(),  "TEST-" + report.getName() +  ".xml" );
+
+        File reportFile = new File( getReportsDirectory(), "TEST-" + report.getName() + ".xml" );
 
         File reportDir = reportFile.getParentFile();
 
         reportDir.mkdirs();
-        
-        writer = new PrintWriter( new BufferedWriter( new OutputStreamWriter( new FileOutputStream( reportFile ), "UTF-8" ) ) );
-        
-        writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-        
-        testSuite = new Xpp3Dom("testsuite");
-         
-        testSuite.setAttribute("name",  report.getName());
-        if (report.getGroup() != null)
-            testSuite.setAttribute("group", report.getGroup());
+
+        writer = new PrintWriter(
+            new BufferedWriter( new OutputStreamWriter( new FileOutputStream( reportFile ), "UTF-8" ) ) );
+
+        writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" );
+
+        testSuite = new Xpp3Dom( "testsuite" );
+
+        testSuite.setAttribute( "name", report.getName() );
+        if ( report.getGroup() != null )
+        {
+            testSuite.setAttribute( "group", report.getGroup() );
+        }
         showProperties();
     }
 
     public void batteryCompleted( ReportEntry report )
-    {   
-        testSuite.setAttribute("tests", String.valueOf(this.getNbTests()) );
-        
-        testSuite.setAttribute("errors", String.valueOf(this.getNbErrors()) );
-        
-        testSuite.setAttribute("failures", String.valueOf(this.getNbFailures()) );
-        
+    {
+        testSuite.setAttribute( "tests", String.valueOf( this.getNbTests() ) );
+
+        testSuite.setAttribute( "errors", String.valueOf( this.getNbErrors() ) );
+
+        testSuite.setAttribute( "failures", String.valueOf( this.getNbFailures() ) );
+
         long runTime = System.currentTimeMillis() - this.batteryStartTime;
-        
-        testSuite.setAttribute("time", elapsedTimeAsString( runTime ));
-        
+
+        testSuite.setAttribute( "time", elapsedTimeAsString( runTime ) );
+
         try
-        {   
+        {
             Xpp3DomWriter.write( writer, testSuite );
         }
         finally
@@ -109,10 +113,10 @@
 
     public void testStarting( ReportEntry report )
     {
-        super.testStarting(report);
-        
+        super.testStarting( report );
+
         String reportName;
-        
+
         if ( report.getName().indexOf( "(" ) > 0 )
         {
             reportName = report.getName().substring( 0, report.getName().indexOf( "(" ) );
@@ -121,21 +125,23 @@
         {
             reportName = report.getName();
         }
-        
-        testCase = createElement(testSuite, "testcase");
-        
-        testCase.setAttribute("name", reportName);
-        if (report.getGroup() != null)
-            testCase.setAttribute("group", report.getGroup());
+
+        testCase = createElement( testSuite, "testcase" );
+
+        testCase.setAttribute( "name", reportName );
+        if ( report.getGroup() != null )
+        {
+            testCase.setAttribute( "group", report.getGroup() );
+        }
     }
 
     public void testSucceeded( ReportEntry report )
     {
-        super.testSucceeded(report);
-        
+        super.testSucceeded( report );
+
         long runTime = this.endTime - this.startTime;
-        
-        testCase.setAttribute("time", elapsedTimeAsString( runTime ));
+
+        testCase.setAttribute( "time", elapsedTimeAsString( runTime ) );
     }
 
     public void testError( ReportEntry report, String stdOut, String stdErr )
@@ -143,7 +149,7 @@
         super.testError( report, stdOut, stdErr );
 
         Xpp3Dom element = createElement( testCase, "error" );
-        
+
         writeTestProblems( report, stdOut, stdErr, element );
     }
 
@@ -193,78 +199,79 @@
         }
 
         long runTime = endTime - startTime;
-        
-        testCase.setAttribute("time", elapsedTimeAsString( runTime ));
+
+        testCase.setAttribute( "time", elapsedTimeAsString( runTime ) );
     }
 
     public void dispose()
     {
         errors = 0;
-        
+
         failures = 0;
-        
-        completedCount = 0;       
+
+        completedCount = 0;
     }
-    
+
     private Xpp3Dom createElement( Xpp3Dom element, String name )
     {
         Xpp3Dom component = new Xpp3Dom( name );
-        
+
         element.addChild( component );
-        
+
         return component;
     }
+
     /**
      * Returns stacktrace as String.
-     * @param report ReportEntry object. 
-     * @return stacktrace as string. 
+     *
+     * @param report ReportEntry object.
+     * @return stacktrace as string.
      */
-    private String getStackTrace(ReportEntry report)
-    {   
+    private String getStackTrace( ReportEntry report )
+    {
         StringWriter writer = new StringWriter();
-        
-        report.getThrowable().printStackTrace(new PrintWriter(writer));
-      
+
+        report.getThrowable().printStackTrace( new PrintWriter( writer ) );
+
         writer.flush();
-        
+
         return writer.toString();
     }
-    
+
     /**
      * Adds system properties to the XML report.
-     *
      */
     private void showProperties()
     {
-        Xpp3Dom properties = createElement(testSuite,"properties");
-        
-        Xpp3Dom property; 
-        
+        Xpp3Dom properties = createElement( testSuite, "properties" );
+
+        Xpp3Dom property;
+
         Properties systemProperties = System.getProperties();
-                
+
         if ( systemProperties != null )
         {
             Enumeration propertyKeys = systemProperties.propertyNames();
-            
+
             while ( propertyKeys.hasMoreElements() )
             {
                 String key = (String) propertyKeys.nextElement();
 
                 String value = systemProperties.getProperty( key );
-                
+
                 if ( value == null )
                 {
                     value = "null";
                 }
 
-                property = createElement(properties,"property");
+                property = createElement( properties, "property" );
 
-                property.setAttribute("name", key);
+                property.setAttribute( "name", key );
 
-                property.setAttribute("value", value);
+                property.setAttribute( "value", value );
 
             }
         }
     }
-    
+
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/util/TeeStream.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/util/TeeStream.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/util/TeeStream.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/util/TeeStream.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.util;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: maven/surefire/branches/surefire-testng/surefire/src/main/resources/org/apache/maven/surefire/surefire.properties
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/resources/org/apache/maven/surefire/surefire.properties?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/resources/org/apache/maven/surefire/surefire.properties (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/resources/org/apache/maven/surefire/surefire.properties Tue Feb 28 18:42:20 2006
@@ -1,3 +1,19 @@
+#
+# Copyright 2001-2006 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 conditionFalse=A boolean condition should have been true.
 reporterThrew=Reporter method {0} completed abruptly with an exception.
 setupFixtureFailed=Method setupFixture threw an exception prior to calling {0}.

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/DummySuite.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/DummySuite.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/DummySuite.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/DummySuite.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,12 @@
  * limitations under the License.
  */
 
+import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import junit.framework.Test;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class DummySuite

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/JUnitTestSuite.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/JUnitTestSuite.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/JUnitTestSuite.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/JUnitTestSuite.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,12 @@
  * limitations under the License.
  */
 
-import junit.framework.TestSuite;
-import junit.framework.TestCase;
 import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class JUnitTestSuite

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/POJOTest.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/POJOTest.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/POJOTest.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/POJOTest.java Tue Feb 28 18:42:20 2006
@@ -1,5 +1,5 @@
 package org.apache.maven.surefire;/*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 {
     public void testFoo()
     {
-        System.out.println("Foo");
+        System.out.println( "Foo" );
     }
 
     public void testBar()
     {
-        System.out.println("Bar");
+        System.out.println( "Bar" );
     }
 
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/ReportEntryTest.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/ReportEntryTest.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/ReportEntryTest.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/ReportEntryTest.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 import org.apache.maven.surefire.report.ReportEntry;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class ReportEntryTest

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleBatteryTest.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleBatteryTest.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleBatteryTest.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleBatteryTest.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,7 @@
 import org.apache.maven.surefire.battery.AbstractBattery;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class SimpleBatteryTest

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleJUnitTest.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleJUnitTest.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleJUnitTest.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SimpleJUnitTest.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SysUnitTest.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SysUnitTest.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SysUnitTest.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/SysUnitTest.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,6 @@
 
     public void testFoo()
     {
-        System.out.println("No assert available");
+        System.out.println( "No assert available" );
     }
 }

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/TestReport.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/TestReport.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/TestReport.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/TestReport.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 import org.apache.maven.surefire.report.ReportEntry;
 
 /**
- *
- *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class TestReport

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/User.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/User.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/User.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/User.java Tue Feb 28 18:42:20 2006
@@ -1,5 +1,5 @@
 package org.apache.maven.surefire;/*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@
  */
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class User
 {
     private String firstName;
+
     private String lastName;
 
     public String getFirstName()

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.report;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 public class XMLReporterTest

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/DirectoryJUnitTestSuite.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/DirectoryJUnitTestSuite.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/DirectoryJUnitTestSuite.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/DirectoryJUnitTestSuite.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.suite.directory.a;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 import org.apache.maven.surefire.User;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class DirectoryJUnitTestSuite

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/JUnitTestSuite.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/JUnitTestSuite.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/JUnitTestSuite.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/a/JUnitTestSuite.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.suite.directory.a;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 import org.apache.maven.surefire.User;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class JUnitTestSuite

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/DirectoryJUnitTestSuite.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/DirectoryJUnitTestSuite.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/DirectoryJUnitTestSuite.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/DirectoryJUnitTestSuite.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.suite.directory.b;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 import org.apache.maven.surefire.User;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class DirectoryJUnitTestSuite

Modified: maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/JUnitTestSuite.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/JUnitTestSuite.java?rev=381878&r1=381877&r2=381878&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/JUnitTestSuite.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/test/java/org/apache/maven/surefire/suite/directory/b/JUnitTestSuite.java Tue Feb 28 18:42:20 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.surefire.suite.directory.b;
 
 /*
- * Copyright 2001-2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 import org.apache.maven.surefire.User;
 
 /**
- *
- * 
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
  * @version $Id$
  */
 public class JUnitTestSuite



Mime
View raw message