You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/01/09 19:58:49 UTC

[2/3] o Removed windows linefeeds

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
index f568fa8..0e34754 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/WrappedReportEntryTest.java
@@ -1,73 +1,73 @@
-package org.apache.maven.plugin.surefire.report;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.report.ReportEntry;
-import org.apache.maven.surefire.report.SimpleReportEntry;
-
-import junit.framework.TestCase;
-
-/**
- * @author Kristian Rosenvold
- */
-public class WrappedReportEntryTest
-    extends TestCase
-{
-
-    public void testClassNameOnly()
-        throws Exception
-    {
-        String category = "surefire.testcase.JunitParamsTest";
-        WrappedReportEntry wr =
-            new WrappedReportEntry( new SimpleReportEntry( "fud", category ), null, 12, null, null );
-        final String reportName = wr.getReportName();
-        assertEquals( "surefire.testcase.JunitParamsTest", reportName );
-    }
-
-    public void testRegular()
-    {
-        ReportEntry reportEntry = new SimpleReportEntry( "fud", "testSum(surefire.testcase.NonJunitParamsTest)" );
-        WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
-        final String reportName = wr.getReportName();
-        assertEquals( "testSum", reportName );
-    }
-
-    public void testGetReportNameWithParams()
-        throws Exception
-    {
-        String category = "[0] 1\u002C 2\u002C 3 (testSum)(surefire.testcase.JunitParamsTest)";
-        ReportEntry reportEntry = new SimpleReportEntry( "fud", category );
-        WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
-        final String reportName = wr.getReportName();
-        assertEquals( "[0] 1, 2, 3 (testSum)", reportName );
-    }
-
-    public void testElapsed()
-        throws Exception
-    {
-        String category = "[0] 1\u002C 2\u002C 3 (testSum)(surefire.testcase.JunitParamsTest)";
-        ReportEntry reportEntry = new SimpleReportEntry( "fud", category );
-        WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
-        String elapsedTimeSummary = wr.getElapsedTimeSummary();
-        assertEquals( "[0] 1, 2, 3 (testSum)(surefire.testcase.JunitParamsTest)  Time elapsed: 0.012 sec",
-                      elapsedTimeSummary );
-    }
-
-
-}
+package org.apache.maven.plugin.surefire.report;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.report.ReportEntry;
+import org.apache.maven.surefire.report.SimpleReportEntry;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class WrappedReportEntryTest
+    extends TestCase
+{
+
+    public void testClassNameOnly()
+        throws Exception
+    {
+        String category = "surefire.testcase.JunitParamsTest";
+        WrappedReportEntry wr =
+            new WrappedReportEntry( new SimpleReportEntry( "fud", category ), null, 12, null, null );
+        final String reportName = wr.getReportName();
+        assertEquals( "surefire.testcase.JunitParamsTest", reportName );
+    }
+
+    public void testRegular()
+    {
+        ReportEntry reportEntry = new SimpleReportEntry( "fud", "testSum(surefire.testcase.NonJunitParamsTest)" );
+        WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
+        final String reportName = wr.getReportName();
+        assertEquals( "testSum", reportName );
+    }
+
+    public void testGetReportNameWithParams()
+        throws Exception
+    {
+        String category = "[0] 1\u002C 2\u002C 3 (testSum)(surefire.testcase.JunitParamsTest)";
+        ReportEntry reportEntry = new SimpleReportEntry( "fud", category );
+        WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
+        final String reportName = wr.getReportName();
+        assertEquals( "[0] 1, 2, 3 (testSum)", reportName );
+    }
+
+    public void testElapsed()
+        throws Exception
+    {
+        String category = "[0] 1\u002C 2\u002C 3 (testSum)(surefire.testcase.JunitParamsTest)";
+        ReportEntry reportEntry = new SimpleReportEntry( "fud", category );
+        WrappedReportEntry wr = new WrappedReportEntry( reportEntry, null, 12, null, null );
+        String elapsedTimeSummary = wr.getElapsedTimeSummary();
+        assertEquals( "[0] 1, 2, 3 (testSum)(surefire.testcase.JunitParamsTest)  Time elapsed: 0.012 sec",
+                      elapsedTimeSummary );
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
index 232f28c..bf3d383 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DirectoryScannerTest.java
@@ -1,60 +1,60 @@
-package org.apache.maven.plugin.surefire.util;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.util.ScanResult;
-
-import junit.framework.TestCase;
-
-/**
- * @author Kristian Rosenvold
- */
-public class DirectoryScannerTest
-    extends TestCase
-{
-    public void testLocateTestClasses()
-        throws IOException, TestSetFailedException
-    {
-        // use target as people can configure ide to compile in an other place than maven
-        File baseDir = new File( new File( "target/test-classes" ).getCanonicalPath() );
-        List<String> include = new ArrayList<String>();
-        include.add( "**/*ZT*A.java" );
-        List<String> exclude = new ArrayList<String>();
-
-        DirectoryScanner surefireDirectoryScanner =
-            new DirectoryScanner( baseDir, include, exclude, new ArrayList<String>() );
-
-        ScanResult classNames = surefireDirectoryScanner.scan();
-        assertNotNull( classNames );
-        System.out.println( "classNames " + Arrays.asList( classNames ) );
-        assertEquals( 3, classNames.size() );
-
-        Properties props = new Properties();
-        classNames.writeTo( props );
-        assertEquals( 3, props.size() );
-    }
-}
+package org.apache.maven.plugin.surefire.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+import org.apache.maven.surefire.util.ScanResult;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class DirectoryScannerTest
+    extends TestCase
+{
+    public void testLocateTestClasses()
+        throws IOException, TestSetFailedException
+    {
+        // use target as people can configure ide to compile in an other place than maven
+        File baseDir = new File( new File( "target/test-classes" ).getCanonicalPath() );
+        List<String> include = new ArrayList<String>();
+        include.add( "**/*ZT*A.java" );
+        List<String> exclude = new ArrayList<String>();
+
+        DirectoryScanner surefireDirectoryScanner =
+            new DirectoryScanner( baseDir, include, exclude, new ArrayList<String>() );
+
+        ScanResult classNames = surefireDirectoryScanner.scan();
+        assertNotNull( classNames );
+        System.out.println( "classNames " + Arrays.asList( classNames ) );
+        assertEquals( 3, classNames.size() );
+
+        Properties props = new Properties();
+        classNames.writeTo( props );
+        assertEquals( 3, props.size() );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
index dd7fcd3..98d1509 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
@@ -1,63 +1,63 @@
-package org.apache.maven.plugin.surefire.util;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 junit.framework.TestCase;
-
-/**
- * @author Kristian Rosenvold
- */
-public class SpecificFileFilterTest
-    extends TestCase
-{
-    public void testMatchSingleCharacterWildcard()
-    {
-        SpecificFileFilter filter = createFileFilter( "org/apache/maven/surefire/?pecificTestClassFilter.class" );
-        assertTrue( filter.accept( getFile() ) );
-    }
-
-    public void testMatchSingleSegmentWordWildcard()
-    {
-        SpecificFileFilter filter = createFileFilter( "org/apache/maven/surefire/*TestClassFilter.class" );
-        assertTrue( filter.accept( getFile() ) );
-    }
-
-    public void testMatchMultiSegmentWildcard()
-    {
-        SpecificFileFilter filter = createFileFilter( "org/**/SpecificTestClassFilter.class" );
-        assertTrue( filter.accept( getFile() ) );
-    }
-
-    public void testMatchSingleSegmentWildcard()
-    {
-        SpecificFileFilter filter = createFileFilter( "org/*/maven/surefire/SpecificTestClassFilter.class" );
-        assertTrue( filter.accept( getFile() ) );
-    }
-
-    private SpecificFileFilter createFileFilter( String s )
-    {
-        return new SpecificFileFilter( new String[]{ s } );
-    }
-
-    private String getFile()
-    {
-        return "org/apache/maven/surefire/SpecificTestClassFilter.class";
-    }
-}
+package org.apache.maven.plugin.surefire.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 junit.framework.TestCase;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SpecificFileFilterTest
+    extends TestCase
+{
+    public void testMatchSingleCharacterWildcard()
+    {
+        SpecificFileFilter filter = createFileFilter( "org/apache/maven/surefire/?pecificTestClassFilter.class" );
+        assertTrue( filter.accept( getFile() ) );
+    }
+
+    public void testMatchSingleSegmentWordWildcard()
+    {
+        SpecificFileFilter filter = createFileFilter( "org/apache/maven/surefire/*TestClassFilter.class" );
+        assertTrue( filter.accept( getFile() ) );
+    }
+
+    public void testMatchMultiSegmentWildcard()
+    {
+        SpecificFileFilter filter = createFileFilter( "org/**/SpecificTestClassFilter.class" );
+        assertTrue( filter.accept( getFile() ) );
+    }
+
+    public void testMatchSingleSegmentWildcard()
+    {
+        SpecificFileFilter filter = createFileFilter( "org/*/maven/surefire/SpecificTestClassFilter.class" );
+        assertTrue( filter.accept( getFile() ) );
+    }
+
+    private SpecificFileFilter createFileFilter( String s )
+    {
+        return new SpecificFileFilter( new String[]{ s } );
+    }
+
+    private String getFile()
+    {
+        return "org/apache/maven/surefire/SpecificTestClassFilter.class";
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java
index c0e4461..ca6c469 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java
@@ -1,108 +1,108 @@
-package org.apache.maven.surefire.report;
-
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * 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 RunStatisticsTest
-    extends TestCase
-{
-    private static final String Method = "AClass#AMethod";
-
-    private static final String DUMMY_ERROR_SOURCE = Method + " RuntimeException";
-
-    private static final String DUMMY_FAILURE_SOURCE = "dummy failure source";
-
-    private static final String DUMMY_MESSAGE = "foo";
-
-    public void testAddErrorSourceWithThrowableMessage()
-    {
-        RuntimeException throwable = new RuntimeException( DUMMY_MESSAGE );
-        RunStatistics statistics = createRunStatisticsAndAddErrorSourceWithThrowable( throwable );
-        assertRunStatisticsHasErrorSource( statistics, DUMMY_ERROR_SOURCE + " " + DUMMY_MESSAGE );
-    }
-
-    public void testAddErrorSourceWithoutThrowable()
-    {
-        RunStatistics statistics = createRunStatisticsAndAddErrorSourceWithThrowable( null );
-        assertRunStatisticsHasErrorSource( statistics, Method );
-    }
-
-    public void testAddErrorSourceWithThrowableWithoutMessage()
-    {
-        RuntimeException throwable = new RuntimeException();
-        RunStatistics statistics = createRunStatisticsAndAddErrorSourceWithThrowable( throwable );
-        assertRunStatisticsHasErrorSource( statistics, DUMMY_ERROR_SOURCE );
-    }
-
-    public void testAddFailureSourceWithThrowableMessage()
-    {
-        RuntimeException throwable = new RuntimeException( DUMMY_MESSAGE );
-        RunStatistics statistics = createRunStatisticsAndAddFailureSourceWithThrowable( throwable );
-        assertRunStatisticsHasFailureSource( statistics, DUMMY_ERROR_SOURCE + " " + DUMMY_MESSAGE );
-    }
-
-    public void testAddFailureSourceWithoutThrowable()
-    {
-        RunStatistics statistics = createRunStatisticsAndAddFailureSourceWithThrowable( null );
-        assertRunStatisticsHasFailureSource( statistics, Method );
-    }
-
-    public void testAddFailureSourceWithThrowableWithoutMessage()
-    {
-        RuntimeException throwable = new RuntimeException();
-        RunStatistics statistics = createRunStatisticsAndAddFailureSourceWithThrowable( throwable );
-        assertRunStatisticsHasFailureSource( statistics, DUMMY_ERROR_SOURCE );
-    }
-
-    private RunStatistics createRunStatisticsAndAddErrorSourceWithThrowable( Throwable throwable )
-    {
-        StackTraceWriter stackTraceWriter = new LegacyPojoStackTraceWriter( "AClass", "AMethod", throwable );
-        RunStatistics statistics = new RunStatistics();
-        statistics.addErrorSource( stackTraceWriter );
-
-        return statistics;
-    }
-
-    private RunStatistics createRunStatisticsAndAddFailureSourceWithThrowable( Throwable throwable )
-    {
-        StackTraceWriter stackTraceWriter = new LegacyPojoStackTraceWriter( "AClass", "AMethod", throwable );
-        RunStatistics statistics = new RunStatistics();
-        statistics.addFailureSource( stackTraceWriter );
-
-        return statistics;
-    }
-
-    private void assertRunStatisticsHasErrorSource( RunStatistics statistics, String expectedErrorSource )
-    {
-        Collection errorSources = statistics.getErrorSources();
-        assertNotNull( "No error sources.", errorSources );
-        assertEquals( "Wrong number of error sources.", 1, errorSources.size() );
-        assertEquals( "Wrong error sources.", expectedErrorSource, errorSources.iterator().next() );
-    }
-
-    private void assertRunStatisticsHasFailureSource( RunStatistics statistics, String expectedFailureSource )
-    {
-        Collection failureSources = statistics.getFailureSources();
-        assertNotNull( "No failure sources.", failureSources );
-        assertEquals( "Wrong number of failure sources.", 1, failureSources.size() );
-        assertEquals( "Wrong failure sources.", expectedFailureSource, failureSources.iterator().next() );
-    }
-}
+package org.apache.maven.surefire.report;
+
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * 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 RunStatisticsTest
+    extends TestCase
+{
+    private static final String Method = "AClass#AMethod";
+
+    private static final String DUMMY_ERROR_SOURCE = Method + " RuntimeException";
+
+    private static final String DUMMY_FAILURE_SOURCE = "dummy failure source";
+
+    private static final String DUMMY_MESSAGE = "foo";
+
+    public void testAddErrorSourceWithThrowableMessage()
+    {
+        RuntimeException throwable = new RuntimeException( DUMMY_MESSAGE );
+        RunStatistics statistics = createRunStatisticsAndAddErrorSourceWithThrowable( throwable );
+        assertRunStatisticsHasErrorSource( statistics, DUMMY_ERROR_SOURCE + " " + DUMMY_MESSAGE );
+    }
+
+    public void testAddErrorSourceWithoutThrowable()
+    {
+        RunStatistics statistics = createRunStatisticsAndAddErrorSourceWithThrowable( null );
+        assertRunStatisticsHasErrorSource( statistics, Method );
+    }
+
+    public void testAddErrorSourceWithThrowableWithoutMessage()
+    {
+        RuntimeException throwable = new RuntimeException();
+        RunStatistics statistics = createRunStatisticsAndAddErrorSourceWithThrowable( throwable );
+        assertRunStatisticsHasErrorSource( statistics, DUMMY_ERROR_SOURCE );
+    }
+
+    public void testAddFailureSourceWithThrowableMessage()
+    {
+        RuntimeException throwable = new RuntimeException( DUMMY_MESSAGE );
+        RunStatistics statistics = createRunStatisticsAndAddFailureSourceWithThrowable( throwable );
+        assertRunStatisticsHasFailureSource( statistics, DUMMY_ERROR_SOURCE + " " + DUMMY_MESSAGE );
+    }
+
+    public void testAddFailureSourceWithoutThrowable()
+    {
+        RunStatistics statistics = createRunStatisticsAndAddFailureSourceWithThrowable( null );
+        assertRunStatisticsHasFailureSource( statistics, Method );
+    }
+
+    public void testAddFailureSourceWithThrowableWithoutMessage()
+    {
+        RuntimeException throwable = new RuntimeException();
+        RunStatistics statistics = createRunStatisticsAndAddFailureSourceWithThrowable( throwable );
+        assertRunStatisticsHasFailureSource( statistics, DUMMY_ERROR_SOURCE );
+    }
+
+    private RunStatistics createRunStatisticsAndAddErrorSourceWithThrowable( Throwable throwable )
+    {
+        StackTraceWriter stackTraceWriter = new LegacyPojoStackTraceWriter( "AClass", "AMethod", throwable );
+        RunStatistics statistics = new RunStatistics();
+        statistics.addErrorSource( stackTraceWriter );
+
+        return statistics;
+    }
+
+    private RunStatistics createRunStatisticsAndAddFailureSourceWithThrowable( Throwable throwable )
+    {
+        StackTraceWriter stackTraceWriter = new LegacyPojoStackTraceWriter( "AClass", "AMethod", throwable );
+        RunStatistics statistics = new RunStatistics();
+        statistics.addFailureSource( stackTraceWriter );
+
+        return statistics;
+    }
+
+    private void assertRunStatisticsHasErrorSource( RunStatistics statistics, String expectedErrorSource )
+    {
+        Collection errorSources = statistics.getErrorSources();
+        assertNotNull( "No error sources.", errorSources );
+        assertEquals( "Wrong number of error sources.", 1, errorSources.size() );
+        assertEquals( "Wrong error sources.", expectedErrorSource, errorSources.iterator().next() );
+    }
+
+    private void assertRunStatisticsHasFailureSource( RunStatistics statistics, String expectedFailureSource )
+    {
+        Collection failureSources = statistics.getFailureSources();
+        assertNotNull( "No failure sources.", failureSources );
+        assertEquals( "Wrong number of failure sources.", 1, failureSources.size() );
+        assertEquals( "Wrong failure sources.", expectedFailureSource, failureSources.iterator().next() );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultConsoleReporter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultConsoleReporter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultConsoleReporter.java
index edb733f..6c5c850 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultConsoleReporter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultConsoleReporter.java
@@ -1,41 +1,41 @@
-package org.apache.maven.surefire.report;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 java.io.PrintStream;
-
-/**
- * @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
- */
-public class DefaultConsoleReporter
-    implements ConsoleLogger
-{
-    private final PrintStream systemOut;
-
-    public DefaultConsoleReporter( PrintStream systemOut )
-    {
-        this.systemOut = systemOut;
-    }
-
-    public void info( String message )
-    {
-        systemOut.println( message );
-    }
-}
+package org.apache.maven.surefire.report;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 java.io.PrintStream;
+
+/**
+ * @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
+ */
+public class DefaultConsoleReporter
+    implements ConsoleLogger
+{
+    private final PrintStream systemOut;
+
+    public DefaultConsoleReporter( PrintStream systemOut )
+    {
+        this.systemOut = systemOut;
+    }
+
+    public void info( String message )
+    {
+        systemOut.println( message );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
index 3f341c3..caee844 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
@@ -1,40 +1,40 @@
-package org.apache.maven.surefire.report;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 java.io.PrintStream;
-
-/**
- * @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
- */
-public class DefaultDirectConsoleReporter
-    implements ConsoleLogger
-{
-    private final PrintStream systemOut;
-
-    public DefaultDirectConsoleReporter( PrintStream systemOut )
-    {
-        this.systemOut = systemOut;
-    }
-
-    public void info( String message )
-    {
-        systemOut.println( message );
-    }
-}
+package org.apache.maven.surefire.report;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 java.io.PrintStream;
+
+/**
+ * @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
+ */
+public class DefaultDirectConsoleReporter
+    implements ConsoleLogger
+{
+    private final PrintStream systemOut;
+
+    public DefaultDirectConsoleReporter( PrintStream systemOut )
+    {
+        this.systemOut = systemOut;
+    }
+
+    public void info( String message )
+    {
+        systemOut.println( message );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore b/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
index 1f82a8b..2d7276b 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
@@ -1,3 +1,3 @@
-*.jar
-TEST*
-
+*.jar
+TEST*
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/build.xml b/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
index 0ef0cfe..69795d0 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
@@ -1,52 +1,52 @@
-<project name="MyProject" xmlns:ivy="antlib:org.apache.ivy.ant" default="dist" basedir=".">
-    <description>
-        simple example build file
-    </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src/test"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-
-
-    <target name="resolve" description="--> retrieve dependencies with ivy">
-        <ivy:retrieve />
-    </target>
-
-  <target name="init">
-    <!-- Create the time stamp -->
-    <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${build}"/>
-  </target>
-
-  <target name="compile" depends="init, resolve"
-        description="compile the source " >
-    <javac srcdir="${src}" destdir="${build}" includeantruntime="true" classpath="lib/junit-4.8.1.jar" />
-  </target>
-
-  <target name="dist" depends="compile"
-        description="generate the distribution" >
-    <!-- Create the distribution directory -->
-    <mkdir dir="${dist}/lib"/>
-
-    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit>
-      <classpath path="build:lib/junit-4.8.1.jar"/>
-      <formatter type="brief" usefile="true" />
-      <formatter type="xml" usefile="true" />
-      <test name="antignore.BasicTest" />
-    </junit>
-</target>
-
-  <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
-
-</project>
+<project name="MyProject" xmlns:ivy="antlib:org.apache.ivy.ant" default="dist" basedir=".">
+    <description>
+        simple example build file
+    </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src/test"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+
+
+    <target name="resolve" description="--> retrieve dependencies with ivy">
+        <ivy:retrieve />
+    </target>
+
+  <target name="init">
+    <!-- Create the time stamp -->
+    <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init, resolve"
+        description="compile the source " >
+    <javac srcdir="${src}" destdir="${build}" includeantruntime="true" classpath="lib/junit-4.8.1.jar" />
+  </target>
+
+  <target name="dist" depends="compile"
+        description="generate the distribution" >
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/lib"/>
+
+    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
+    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
+  </target>
+
+  <target name="test" depends="compile">
+    <junit>
+      <classpath path="build:lib/junit-4.8.1.jar"/>
+      <formatter type="brief" usefile="true" />
+      <formatter type="xml" usefile="true" />
+      <test name="antignore.BasicTest" />
+    </junit>
+</target>
+
+  <target name="clean"
+        description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+  </target>
+
+</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml b/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
index d350225..64df19c 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
@@ -1,6 +1,6 @@
-<ivy-module version="2.0">
-    <info organisation="org.apache" module="hello-ivy"/>
-    <dependencies>
-        <dependency org="junit" name="junit" rev="4.8.1"/>
-    </dependencies>
-</ivy-module>
+<ivy-module version="2.0">
+    <info organisation="org.apache" module="hello-ivy"/>
+    <dependencies>
+        <dependency org="junit" name="junit" rev="4.8.1"/>
+    </dependencies>
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml b/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
index d350225..64df19c 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
@@ -1,6 +1,6 @@
-<ivy-module version="2.0">
-    <info organisation="org.apache" module="hello-ivy"/>
-    <dependencies>
-        <dependency org="junit" name="junit" rev="4.8.1"/>
-    </dependencies>
-</ivy-module>
+<ivy-module version="2.0">
+    <info organisation="org.apache" module="hello-ivy"/>
+    <dependencies>
+        <dependency org="junit" name="junit" rev="4.8.1"/>
+    </dependencies>
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java b/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
index 1cfdd91..ede031b 100644
--- a/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
+++ b/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
@@ -1,19 +1,19 @@
-package failingbuilds;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-
-import junit.framework.TestCase;
-
-public class ExceptionsTest
-    extends TestCase
-{
-    public void testWithMultiLineExceptionBeingThrown()
-    {
-        throw new RuntimeException( "A very very long exception message indeed, which is to demonstrate truncation. It will be truncated somewhere\nA cat\nAnd a dog\nTried to make a\nParrot swim" );
-    }
+package failingbuilds;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+
+import junit.framework.TestCase;
+
+public class ExceptionsTest
+    extends TestCase
+{
+    public void testWithMultiLineExceptionBeingThrown()
+    {
+        throw new RuntimeException( "A very very long exception message indeed, which is to demonstrate truncation. It will be truncated somewhere\nA cat\nAnd a dog\nTried to make a\nParrot swim" );
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
index 7791734..0e80332 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
@@ -1,43 +1,43 @@
-package failureresultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeClassError
-{
-
-    @BeforeClass
-    public static void beforeClassError()
-    {
-        throw new RuntimeException( "Exception in beforeclass" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "beforeClassError run !!" );
-    }
-
+package failureresultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeClassError
+{
+
+    @BeforeClass
+    public static void beforeClassError()
+    {
+        throw new RuntimeException( "Exception in beforeclass" );
+    }
+
+    @Test
+    public void ok()
+    {
+        System.out.println( "beforeClassError run !!" );
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
index 5ef3f16..62d51ac 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
@@ -1,43 +1,43 @@
-package failureresultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 junit.framework.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeClassFailure
-{
-
-    @BeforeClass
-    public static void failInBeforeClass()
-    {
-        Assert.fail( "Failing in @BeforeClass" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "failInBeforeClass run !!");
-    }
-
+package failureresultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 junit.framework.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeClassFailure
+{
+
+    @BeforeClass
+    public static void failInBeforeClass()
+    {
+        Assert.fail( "Failing in @BeforeClass" );
+    }
+
+    @Test
+    public void ok()
+    {
+        System.out.println( "failInBeforeClass run !!");
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
index 1422580..0798c80 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
@@ -1,48 +1,48 @@
-package failureresultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeError
-{
-
-    @Before
-    public void exceptionInBefore()
-    {
-        throw new RuntimeException( "Exception in @before" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "exceptionInBefore run!!");
-    }
-
-    /*@Test
-    public void ok2()
-    {
-        System.out.println( "exceptionInBefore2 run!!");
-    } */
-
+package failureresultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeError
+{
+
+    @Before
+    public void exceptionInBefore()
+    {
+        throw new RuntimeException( "Exception in @before" );
+    }
+
+    @Test
+    public void ok()
+    {
+        System.out.println( "exceptionInBefore run!!");
+    }
+
+    /*@Test
+    public void ok2()
+    {
+        System.out.println( "exceptionInBefore2 run!!");
+    } */
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
index 379827f..174a448 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
@@ -1,43 +1,43 @@
-package failureresultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 junit.framework.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeFailure
-{
-
-    @Before
-    public void failInBEfore()
-    {
-        Assert.fail( "Failing in @before" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "failInBEfore run !!");
-    }
-
+package failureresultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 junit.framework.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeFailure
+{
+
+    @Before
+    public void failInBEfore()
+    {
+        Assert.fail( "Failing in @before" );
+    }
+
+    @Test
+    public void ok()
+    {
+        System.out.println( "failInBEfore run !!");
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
index dd6f79a..245c9a6 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
@@ -1,43 +1,43 @@
-package failureresultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class NoErrors
-{
-
-    @Test
-    @Ignore
-    public void allOk1()
-    {
-    }
-
-    @Test
-    @Ignore
-    public void allOk2()
-    {
-    }
-
+package failureresultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class NoErrors
+{
+
+    @Test
+    @Ignore
+    public void allOk1()
+    {
+    }
+
+    @Test
+    @Ignore
+    public void allOk2()
+    {
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
index d79d145..7e6387a 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
@@ -1,42 +1,42 @@
-package failureresultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class OrdinaryError
-{
-
-    @Test
-    public void ordinaryEror()
-    {
-        throw new RuntimeException( "Exception in @before" );
-    }
-
-    @Test
-    public void ordinaryFailure()
-    {
-        Assert.fail();
-    }
-
+package failureresultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class OrdinaryError
+{
+
+    @Test
+    public void ordinaryEror()
+    {
+        throw new RuntimeException( "Exception in @before" );
+    }
+
+    @Test
+    public void ordinaryFailure()
+    {
+        Assert.fail();
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
index cab285e..0e07945 100644
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
+++ b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
@@ -1,24 +1,24 @@
-package resultcounting;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest1 extends TestCase {
-
-    public static Test suite () {
-        TestSuite suite = new TestSuite();
-
-        suite.addTest (new MySuiteTest1("testMe" ));
-
-        return suite;
-    }
-
-    public MySuiteTest1( String name ) {
-        super (name);
-    }
-
-    public void testMe() {
-        assertTrue (true);
-    }
-}
+package resultcounting;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest1 extends TestCase {
+
+    public static Test suite () {
+        TestSuite suite = new TestSuite();
+
+        suite.addTest (new MySuiteTest1("testMe" ));
+
+        return suite;
+    }
+
+    public MySuiteTest1( String name ) {
+        super (name);
+    }
+
+    public void testMe() {
+        assertTrue (true);
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
index ae71b47..0c44f04 100644
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
+++ b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
@@ -1,25 +1,25 @@
-package resultcounting;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest2 extends TestCase {
-
-    public static Test suite () {
-        TestSuite suite = new TestSuite();
-
-        suite.addTest (new MySuiteTest2("testMe" ));
-        suite.addTest (new MySuiteTest2("testMe" ));
-
-        return suite;
-    }
-
-    public MySuiteTest2( String name ) {
-        super (name);
-    }
-
-    public void testMe() {
-        assertTrue (true);
-    }
-}
+package resultcounting;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest2 extends TestCase {
+
+    public static Test suite () {
+        TestSuite suite = new TestSuite();
+
+        suite.addTest (new MySuiteTest2("testMe" ));
+        suite.addTest (new MySuiteTest2("testMe" ));
+
+        return suite;
+    }
+
+    public MySuiteTest2( String name ) {
+        super (name);
+    }
+
+    public void testMe() {
+        assertTrue (true);
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
index a60993a..4c08224 100644
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
+++ b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
@@ -1,26 +1,26 @@
-package resultcounting;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest3 extends TestCase {
-
-    public static Test suite () {
-        TestSuite suite = new TestSuite();
-
-        suite.addTest (new MySuiteTest3("testMe" ));
-        suite.addTest (new MySuiteTest3("testMe" ));
-        suite.addTest (new MySuiteTest3("testMe" ));
-
-        return suite;
-    }
-
-    public MySuiteTest3( String name ) {
-        super (name);
-    }
-
-    public void testMe() {
-        assertTrue (true);
-    }
-}
+package resultcounting;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest3 extends TestCase {
+
+    public static Test suite () {
+        TestSuite suite = new TestSuite();
+
+        suite.addTest (new MySuiteTest3("testMe" ));
+        suite.addTest (new MySuiteTest3("testMe" ));
+        suite.addTest (new MySuiteTest3("testMe" ));
+
+        return suite;
+    }
+
+    public MySuiteTest3( String name ) {
+        super (name);
+    }
+
+    public void testMe() {
+        assertTrue (true);
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
index 6833e0e..c3283d2 100644
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
+++ b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
@@ -1,76 +1,76 @@
-package resultcounting;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-import junit.framework.TestCase;
-
-public class Test1 extends TestCase
-{
-    public void testWithFailingAssumption1() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption2() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption3() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption4() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption5() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption6() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption7() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption8() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption9() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption10() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption11() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption12() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption13() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption14() {
-        assumeThat( 2, is(3));
-    }
-    public void testWithFailingAssumption15() {
-        assumeThat( 2, is(3));
-    }
+package resultcounting;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+import junit.framework.TestCase;
+
+public class Test1 extends TestCase
+{
+    public void testWithFailingAssumption1() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption2() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption3() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption4() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption5() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption6() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption7() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption8() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption9() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption10() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption11() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption12() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption13() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption14() {
+        assumeThat( 2, is(3));
+    }
+    public void testWithFailingAssumption15() {
+        assumeThat( 2, is(3));
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java b/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
index 8a0fd3d..66c7337 100644
--- a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
+++ b/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
@@ -1,47 +1,47 @@
-package smallresultcounting;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assume.assumeThat;
-
-public class Test1
-{
-    @Test
-    public void testWithFailingAssumption1()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption2()
-    {
-        try
-        {
-            Thread.sleep( 150 );
-        }
-        catch ( InterruptedException ignore )
-        {
-        }
-
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption3()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption4()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption5()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
+package smallresultcounting;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
+
+public class Test1
+{
+    @Test
+    public void testWithFailingAssumption1()
+    {
+        assumeThat( 2, is( 3 ) );
+    }
+
+    @Test
+    public void testWithFailingAssumption2()
+    {
+        try
+        {
+            Thread.sleep( 150 );
+        }
+        catch ( InterruptedException ignore )
+        {
+        }
+
+        assumeThat( 2, is( 3 ) );
+    }
+
+    @Test
+    public void testWithFailingAssumption3()
+    {
+        assumeThat( 2, is( 3 ) );
+    }
+
+    @Test
+    public void testWithFailingAssumption4()
+    {
+        assumeThat( 2, is( 3 ) );
+    }
+
+    @Test
+    public void testWithFailingAssumption5()
+    {
+        assumeThat( 2, is( 3 ) );
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java b/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
index 5f7459f..dbacce7 100644
--- a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
+++ b/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
@@ -1,88 +1,88 @@
-package smallresultcounting;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static junit.framework.Assert.fail;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
-    @Test
-    public void testiWithFail1()
-    {
-        fail( "We excpect this1" );
-    }
-
-    @Test
-    public void testWithException1()
-    {
-        System.out.println( "testWithException1 to stdout" );
-        System.err.println( "testWithException1 to stderr" );
-        throw new RuntimeException( "We expect this1-1" );
-    }
-
-    @Test
-    public void testWithException2()
-    {
-        throw new RuntimeException( "We expect this1-2" );
-    }
-
-
-    @Ignore( "We do this for a reason1" )
-    @Test
-    public void testWithIgnore1()
-    {
-    }
-
-    @Ignore( "We do this for a reason2" )
-    @Test
-    public void testWithIgnore2()
-    {
-    }
-
-    @Ignore
-    @Test
-    public void testWithIgnore3()
-    {
-    }
-
-    @Test
-    public void testAllok1()
-    {
-        System.out.println( "testAllok1 to stdout" );
-        System.err.println( "testAllok1 to stderr" );
-        try
-        {
-            Thread.sleep( 100 );
-        }
-        catch ( InterruptedException ignore )
-        {
-        }
-    }
-
-    @Test
-    public void testAllok2()
-    {
-    }
-
-    @Test
-    public void testAllok3()
-    {
-        try
-        {
-            Thread.sleep( 250 );
-        }
-        catch ( InterruptedException ignore )
-        {
-        }
-    }
-
-    @Test
-    public void testAllok4()
-    {
-    }
-
+package smallresultcounting;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static junit.framework.Assert.fail;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+    @Test
+    public void testiWithFail1()
+    {
+        fail( "We excpect this1" );
+    }
+
+    @Test
+    public void testWithException1()
+    {
+        System.out.println( "testWithException1 to stdout" );
+        System.err.println( "testWithException1 to stderr" );
+        throw new RuntimeException( "We expect this1-1" );
+    }
+
+    @Test
+    public void testWithException2()
+    {
+        throw new RuntimeException( "We expect this1-2" );
+    }
+
+
+    @Ignore( "We do this for a reason1" )
+    @Test
+    public void testWithIgnore1()
+    {
+    }
+
+    @Ignore( "We do this for a reason2" )
+    @Test
+    public void testWithIgnore2()
+    {
+    }
+
+    @Ignore
+    @Test
+    public void testWithIgnore3()
+    {
+    }
+
+    @Test
+    public void testAllok1()
+    {
+        System.out.println( "testAllok1 to stdout" );
+        System.err.println( "testAllok1 to stderr" );
+        try
+        {
+            Thread.sleep( 100 );
+        }
+        catch ( InterruptedException ignore )
+        {
+        }
+    }
+
+    @Test
+    public void testAllok2()
+    {
+    }
+
+    @Test
+    public void testAllok3()
+    {
+        try
+        {
+            Thread.sleep( 250 );
+        }
+        catch ( InterruptedException ignore )
+        {
+        }
+    }
+
+    @Test
+    public void testAllok4()
+    {
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
index a87f46d..ea15f44 100644
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
+++ b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
@@ -1,33 +1,33 @@
-package surefire500;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-
-public class PassingTest {
-	
-	@Test
-	public void testOne()
-    {
-		assertTrue(true);
-	}
-	
-	@Test
-	public void testTwo()
-    {
-		assertTrue(true);
-	}
-	
-	@Test
-	public void testThree()
-    {
-		assertTrue(true);
-	}
-	
-	@Test
-	public void testFour()
-    {
-		assertTrue(true);
-	}
-
-}
+package surefire500;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class PassingTest {
+	
+	@Test
+	public void testOne()
+    {
+		assertTrue(true);
+	}
+	
+	@Test
+	public void testTwo()
+    {
+		assertTrue(true);
+	}
+	
+	@Test
+	public void testThree()
+    {
+		assertTrue(true);
+	}
+	
+	@Test
+	public void testFour()
+    {
+		assertTrue(true);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
index d039713..59e5a42 100644
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
+++ b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
@@ -1,10 +1,10 @@
-package surefire500;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(org.junit.runners.Suite.class)
-@SuiteClasses(value={ExplodingTest.class, PassingTest.class})
-public class Suite {
-
-}
+package surefire500;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(org.junit.runners.Suite.class)
+@SuiteClasses(value={ExplodingTest.class, PassingTest.class})
+public class Suite {
+
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
index a3fde44..f836baa 100644
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
+++ b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
@@ -1,29 +1,29 @@
-package mho;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class MySuiteTest1 extends TestCase {
-
-    public static Test suite () {
-        TestSuite suite = new TestSuite();
-
-        suite.addTest (new MySuiteTest1("testMe", 1));
-
-        return suite;
-    }
-
-    private final int number;
-
-    public MySuiteTest1(String name, int number) {
-        super (name);
-        this.number = number;
-    }
-
-    public void testMe() {
-        System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
-        assertTrue (true);
-    }
-}
+package mho;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+public class MySuiteTest1 extends TestCase {
+
+    public static Test suite () {
+        TestSuite suite = new TestSuite();
+
+        suite.addTest (new MySuiteTest1("testMe", 1));
+
+        return suite;
+    }
+
+    private final int number;
+
+    public MySuiteTest1(String name, int number) {
+        super (name);
+        this.number = number;
+    }
+
+    public void testMe() {
+        System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
+        assertTrue (true);
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/126f4495/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
index 7987569..09644db 100644
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
+++ b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
@@ -1,30 +1,30 @@
-package mho;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class MySuiteTest2 extends TestCase {
-
-    public static Test suite () {
-        TestSuite suite = new TestSuite();
-
-        suite.addTest (new MySuiteTest2("testMe", 1));
-        suite.addTest (new MySuiteTest2("testMe", 2));
-
-        return suite;
-    }
-
-    private final int number;
-
-    public MySuiteTest2(String name, int number) {
-        super (name);
-        this.number = number;
-    }
-
-    public void testMe() {
-        System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
-        assertTrue (true);
-    }
-}
+package mho;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+public class MySuiteTest2 extends TestCase {
+
+    public static Test suite () {
+        TestSuite suite = new TestSuite();
+
+        suite.addTest (new MySuiteTest2("testMe", 1));
+        suite.addTest (new MySuiteTest2("testMe", 2));
+
+        return suite;
+    }
+
+    private final int number;
+
+    public MySuiteTest2(String name, int number) {
+        super (name);
+        this.number = number;
+    }
+
+    public void testMe() {
+        System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
+        assertTrue (true);
+    }
+}