You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by jv...@apache.org on 2005/12/03 23:49:54 UTC

svn commit: r352041 - in /maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire: ./ battery/ battery/assertion/ report/

Author: jvanzyl
Date: Sat Dec  3 14:49:49 2005
New Revision: 352041

URL: http://svn.apache.org/viewcvs?rev=352041&view=rev
Log:
o adding support for forking

Added:
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java   (with props)
Modified:
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/Surefire.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/AbstractBattery.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/Battery.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/JUnitBattery.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryAssertionFailedError.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryTestFailedException.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/FileReporter.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ReportEntry.java
    maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/Reporter.java

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/Surefire.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/Surefire.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/Surefire.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/Surefire.java Sat Dec  3 14:49:49 2005
@@ -24,7 +24,6 @@
 import org.codehaus.surefire.report.ReporterManager;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -46,6 +45,7 @@
 
     public Surefire()
     {
+        super();
     }
 
     public static ResourceBundle getResources()
@@ -53,6 +53,14 @@
         return resources;
     }
 
+    public boolean run( List reports, List batteryHolders, String reportsDirectory ) 
+        throws Exception
+    {
+        ClassLoader classLoader = this.getClass().getClassLoader();
+
+        return run( reports, batteryHolders, classLoader, reportsDirectory );
+    }
+
     public boolean run( List reports, List batteryHolders, ClassLoader classLoader, String reportsDirectory )
         throws Exception
     {
@@ -97,6 +105,7 @@
                     Battery battery = (Battery) i.next();
 
                     int testCount = 0;
+
                     try
                     {
                         testCount = battery.getTestCount();
@@ -104,9 +113,8 @@
                     catch ( BatteryTestFailedException e )
                     {
                         e.printStackTrace();
-                        ReportEntry report = new ReportEntry( e,
-                                                              "org.codehaus.surefire.Runner",
-                                                              Surefire.getResources().getString( "bigProblems" ), e );
+
+                        ReportEntry report = new ReportEntry( e, "org.codehaus.surefire.Runner", getResources().getString( "bigProblems" ), e );
 
                         reporterManager.batteryAborted( report );
                     }
@@ -134,6 +142,7 @@
                         Battery b = (Battery) j.next();
 
                         testCount = 0;
+
                         try
                         {
                             testCount = b.getTestCount();
@@ -141,9 +150,8 @@
                         catch ( BatteryTestFailedException e )
                         {
                             e.printStackTrace();
-                            ReportEntry report = new ReportEntry( e,
-                                                                  "org.codehaus.surefire.Runner",
-                                                                  Surefire.getResources().getString( "bigProblems" ), e );
+
+                            ReportEntry report = new ReportEntry( e, "org.codehaus.surefire.Runner", getResources().getString( "bigProblems" ), e );
 
                             reporterManager.batteryAborted( report );
                         }
@@ -159,12 +167,12 @@
 
                 if ( nbTests == 0 )
                 {
-                    reporterManager.writeMessage( "There are no test to run." );
+                    reporterManager.writeMessage( "There are no tests to run." );
                 }
             }
             else
             {
-                reporterManager.writeMessage( "There are no battery to run." );
+                reporterManager.writeMessage( "There are no batteries to run." );
             }
 
             reporterManager.runCompleted();
@@ -172,28 +180,29 @@
         catch ( Throwable ex )
         {
             ex.printStackTrace();
-            ReportEntry report = new ReportEntry( ex,
-                                                  "org.codehaus.surefire.Runner",
-                                                  Surefire.getResources().getString( "bigProblems" ), ex );
+
+            ReportEntry report = new ReportEntry( ex, "org.codehaus.surefire.Runner", getResources().getString( "bigProblems" ), ex );
 
             reporterManager.runAborted( report );
         }
 
         reporterManager.resume();
 
-        if ( reporterManager.getNbErrors() > 0 || reporterManager.getNbFailures() > 0 )
-        {
-            return false;
-        }
-        return true;
+        return !( reporterManager.getNbErrors() > 0 || reporterManager
+            .getNbFailures() > 0 );
     }
 
+    /**
+     * @param battery
+     * @param reportManager
+     * @throws Exception
+     */
     public void executeBattery( Battery battery, ReporterManager reportManager )
         throws Exception
     {
         try
         {
-            String rawString = Surefire.getResources().getString( "suiteExecutionStarting" );
+            String rawString = getResources().getString( "suiteExecutionStarting" );
 
             ReportEntry report = new ReportEntry( this, battery.getBatteryName(), rawString );
 
@@ -203,7 +212,7 @@
             {
                 battery.execute( reportManager );
 
-                rawString = Surefire.getResources().getString( "suiteCompletedNormally" );
+                rawString = getResources().getString( "suiteCompletedNormally" );
 
                 report = new ReportEntry( this, battery.getBatteryName(), rawString );
 
@@ -213,7 +222,7 @@
             {
                 e.printStackTrace();
 
-                rawString = Surefire.getResources().getString( "executeException" );
+                rawString = getResources().getString( "executeException" );
 
                 report = new ReportEntry( this, battery.getBatteryName(), rawString, e );
 
@@ -227,14 +236,18 @@
 
         catch ( Throwable ex )
         {
-            ReportEntry report = new ReportEntry( ex,
-                                                  "org.codehaus.surefire.Runner",
-                                                  Surefire.getResources().getString( "bigProblems" ), ex );
+            ReportEntry report = new ReportEntry( ex, "org.codehaus.surefire.Runner", getResources().getString( "bigProblems" ), ex );
 
             reportManager.runAborted( report );
         }
     }
 
+    /**
+     * @param batteryHolders
+     * @param loader
+     * @return
+     * @throws Exception
+     */
     public static List instantiateBatteries( List batteryHolders, ClassLoader loader )
         throws Exception
     {
@@ -244,25 +257,24 @@
         {
             Object[] holder = (Object[]) batteryHolders.get( i );
 
-            Class testClass = null;
+            Class testClass;
+
+            Class batteryClass;
 
             try
             {
                 testClass = loader.loadClass( (String) holder[0] );
+
+                batteryClass = loader.loadClass( "org.codehaus.surefire.battery.Battery" );
             }
             catch ( Exception e )
             {
                 continue;
             }
 
-            if (Modifier.isAbstract(testClass.getModifiers()))
-            {
-                continue;
-            }
-
             Object battery = null;
 
-            if ( Battery.class.isAssignableFrom( testClass ) )
+            if ( batteryClass.isAssignableFrom( testClass ) )
             {
                 if ( holder[1] != null )
                 {
@@ -284,35 +296,6 @@
                     battery = testClass.newInstance();
                 }
             }
-
-            /*
-
-            We will assume this is a JUnit test because you can have tests in JUnit
-            that look like the following:
-
-            public class ThrowingTest
-            {
-                public static Object suite() throws Exception
-                {
-                    TestSuite suite = new TestSuite();
-                    DistributedSystemTestInfo testInfo = getTestInfo();
-                    suite.addTest( new DistributedTestCase( new ScenarioInfo( "default", testInfo ) ) );
-                    return suite;
-                }
-            }
-
-            Which is really not identifiable as a JUnit class at all ... so that's
-            why I'm making the assumption because JUnit does.
-
-            else if ( junitTestClass != null && junitTestClass.isAssignableFrom( testClass ) )
-            {
-                battery = new JUnitBattery( testClass, loader );
-            }
-            else
-            {
-                throw new Exception( "Class " + testClass + " is not an implementation of junit.framework.Test" );
-            }
-            */
             else
             {
                 battery = new JUnitBattery( testClass, loader );
@@ -329,13 +312,21 @@
     {
         List reports = new ArrayList();
 
+        boolean fail = false;
+
+        ClassLoader reporterClassLoader = Reporter.class.getClassLoader();
+
         for ( Iterator i = reportClassNames.iterator(); i.hasNext(); )
         {
-            String reportClass = (String) i.next();
+            String reportClassName = (String) i.next();
 
             try
             {
-                Reporter report = (Reporter) classLoader.loadClass( reportClass ).newInstance();
+                Class reportClass = reporterClassLoader.loadClass( reportClassName );
+
+                //assert Reporter.class.isAssignableFrom(reportClass);
+
+                Reporter report = (Reporter) reportClass.newInstance();
 
                 report.setReportsDirectory( reportsDirectory );
 
@@ -347,9 +338,13 @@
             }
         }
 
+        if ( fail )
+        {
+            throw new RuntimeException( "couldn't assign reports as expected" );
+        }
+
         return reports;
     }
-
 }
 
 

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/AbstractBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/AbstractBattery.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/AbstractBattery.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/AbstractBattery.java Sat Dec  3 14:49:49 2005
@@ -234,7 +234,6 @@
     {
     }
 
-
     protected Class getTestClass()
     {
         return getClass();
@@ -268,13 +267,8 @@
 
             boolean hasNoParams = paramTypes.length == 0;
 
-            if ( isInstanceMethod
-                 &&
-                 returnsVoid
-                 &&
-                 hasNoParams )
+            if ( isInstanceMethod && returnsVoid && hasNoParams )
             {
-
                 String simpleName = m.getName();
 
                 if ( simpleName.length() <= 4 )

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/Battery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/Battery.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/Battery.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/Battery.java Sat Dec  3 14:49:49 2005
@@ -30,7 +30,7 @@
     String getBatteryName();
 
     void discoverBatteryClassNames()
-        throws Exception;
+        throws Exception;        
 
     List getSubBatteryClassNames();
 }

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/JUnitBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/JUnitBattery.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/JUnitBattery.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/JUnitBattery.java Sat Dec  3 14:49:49 2005
@@ -97,18 +97,6 @@
         Class testInterface = loader.loadClass( TEST );
 
         // ----------------------------------------------------------------------
-        // Apparently this is not necessarily required because a suite() method
-        // may simply return an Object.
-        // ----------------------------------------------------------------------
-
-        /*
-        if ( !testInterface.isAssignableFrom( testClass ) )
-        {
-            throw new IllegalArgumentException( "testClass is not a " + TEST );
-        }
-        */
-
-        // ----------------------------------------------------------------------
         // Strategy for executing JUnit tests
         //
         // o look for the suite method and if that is present execute that method
@@ -125,11 +113,7 @@
 
             Method suiteMethod = testClass.getMethod( "suite", emptyArgs );
 
-            if ( Modifier.isPublic( suiteMethod.getModifiers() )
-                 &&
-                 Modifier.isStatic( suiteMethod.getModifiers() ) )
-                 //&&
-                 //suiteMethod.getReturnType() == testInterface )
+            if ( Modifier.isPublic( suiteMethod.getModifiers() ) && Modifier.isStatic( suiteMethod.getModifiers() ) )
             {
                 testObject = suiteMethod.invoke( null, emptyArgs );
             }

Added: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java?rev=352041&view=auto
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java (added)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java Sat Dec  3 14:49:49 2005
@@ -0,0 +1,60 @@
+package org.codehaus.surefire.battery;
+
+/*
+ * Copyright 2001-2005 The Codehaus.
+ *
+ * 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.
+ */
+
+/**
+ * A battery which contains a single test class which is used primarily for running individual tests
+ * inside a new JVM instance (fork mode).
+ *
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @version $Id:$
+ */
+public class SingleTestBattery
+    extends AbstractBattery
+{
+    private String testClassName;
+
+    private Class testClass;
+
+    private Object test;
+
+    public SingleTestBattery( String testClassName )
+        throws Exception
+    {
+        this.testClassName = testClassName;
+
+        this.testClass = getClass().getClassLoader().loadClass( testClassName );
+
+        this.test = testClass.newInstance();
+    }
+
+    protected Class getTestClass()
+    {
+        return testClass;
+    }
+
+    protected Object getTestClassInstance()
+    {
+        return test;
+    }
+
+    public String getBatteryName()
+    {
+        return testClass.getName();
+    }
+
+}

Propchange: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/SingleTestBattery.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryAssertionFailedError.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryAssertionFailedError.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryAssertionFailedError.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryAssertionFailedError.java Sat Dec  3 14:49:49 2005
@@ -12,9 +12,7 @@
  * 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 BatteryAssertionFailedError
+ */public class BatteryAssertionFailedError
     extends Error
 {
 

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryTestFailedException.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryTestFailedException.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryTestFailedException.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/battery/assertion/BatteryTestFailedException.java Sat Dec  3 14:49:49 2005
@@ -12,14 +12,12 @@
  * 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.
- */
-
-/**
+ *//**
  * Exception that indicates a test failed.
  *
  * @author Bill Venners
  */
-public class BatteryTestFailedException extends RuntimeException
+   public class BatteryTestFailedException extends RuntimeException
 {
 
     private boolean causeInitialized;

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/FileReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/FileReporter.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/FileReporter.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/FileReporter.java Sat Dec  3 14:49:49 2005
@@ -23,6 +23,7 @@
 
 /**
  * Text file reporter.
+ *
  * @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
  * @version $Id$
  */
@@ -30,25 +31,25 @@
     extends AbstractReporter
 {
     private PrintWriter writer;
-    
+
     private StringBuffer reportContent;
-    
+
     private long batteryStartTime;
-    
-    String newLine = System.getProperty("line.separator");
-    
+
+    String newLine = System.getProperty( "line.separator" );
+
     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();
@@ -56,7 +57,7 @@
         reportDir.mkdirs();
 
         writer = new PrintWriter( new FileWriter( reportFile ) );
-        
+
         writer.println( "-------------------------------------------------------------------------------" );
 
         writer.println( "Battery: " + report.getName() );
@@ -67,54 +68,54 @@
     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")
-                      .append(newLine)
-                      .append(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( newLine );
+
+        reportContent = batterySummary.append( reportContent );
+
         writer.println( reportContent.toString() );
-        
+
         writer.flush();
 
         writer.close();
     }
 
     public void testStarting( ReportEntry report )
-    { 
-        super.testStarting(report);
-        
-        reportContent.append(report.getName() );
+    {
+        super.testStarting( report );
+
+        reportContent.append( 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 );
+
         writeStdLogs( stdOut, stdErr );
 
         reportContent.append( getStackTrace( report ) + newLine );
@@ -122,14 +123,14 @@
 
     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 );
+
         writeStdLogs( stdOut, stdErr );
 
         reportContent.append( getStackTrace( report ) + newLine );
@@ -138,55 +139,54 @@
     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(newLine);
+        reportContent.append( newLine );
 
         reportContent.append( "[ stdout ] ---------------------------------------------------------------" );
 
-        reportContent.append(newLine);
+        reportContent.append( newLine );
 
-        reportContent.append( stdOut + newLine);
+        reportContent.append( stdOut + newLine );
 
-        reportContent.append(newLine);
+        reportContent.append( newLine );
 
         reportContent.append( "[ stderr ] ---------------------------------------------------------------" );
 
-        reportContent.append(newLine);
+        reportContent.append( newLine );
 
-        reportContent.append( stdErr + newLine);
+        reportContent.append( stdErr + newLine );
 
-        reportContent.append(newLine);
+        reportContent.append( newLine );
 
         reportContent.append( "[ stacktrace ] -----------------------------------------------------------" );
 
-        reportContent.append(newLine);
+        reportContent.append( newLine );
     }
-    
+
     /**
-     * 
      * @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/trunk/surefire/src/main/java/org/codehaus/surefire/report/ReportEntry.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ReportEntry.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ReportEntry.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ReportEntry.java Sat Dec  3 14:49:49 2005
@@ -12,9 +12,7 @@
  * 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 ReportEntry
+ */public class ReportEntry
 {
     private Object source;
 

Modified: maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/Reporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/Reporter.java?rev=352041&r1=352040&r2=352041&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/Reporter.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/Reporter.java Sat Dec  3 14:49:49 2005
@@ -12,9 +12,7 @@
  * 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 interface Reporter
+ */public interface Reporter
 {
     void writeMessage( String message );