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 2006/02/28 02:02:26 UTC
svn commit: r381519 - in /maven/surefire/trunk:
surefire-booter/src/main/java/org/apache/maven/surefire/
surefire/src/main/java/org/apache/maven/surefire/battery/
surefire/src/main/java/org/apache/maven/surefire/battery/assertion/
surefire/src/main/jav...
Author: jvanzyl
Date: Mon Feb 27 17:02:24 2006
New Revision: 381519
URL: http://svn.apache.org/viewcvs?rev=381519&view=rev
Log:
[SUREFIRE-21] Using plexus utils and getting rid of copied classes
Removed:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/util/SelectorUtils.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/util/StringUtils.java
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/ForkingWriterStreamConsumer.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/DirectoryBattery.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryComparisonFailure.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/ForkingWriterStreamConsumer.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/ForkingWriterStreamConsumer.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/ForkingWriterStreamConsumer.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/ForkingWriterStreamConsumer.java Mon Feb 27 17:02:24 2006
@@ -1,14 +1,14 @@
package org.apache.maven.surefire;
-import org.codehaus.plexus.util.cli.StreamConsumer;
import org.apache.maven.surefire.report.ForkingReport;
+import org.codehaus.plexus.util.cli.StreamConsumer;
import java.io.PrintWriter;
import java.io.Writer;
/**
* @author Jason van Zyl
- * @version $Revision:$
+ * @version $Revision$
*/
public class ForkingWriterStreamConsumer
implements StreamConsumer
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java Mon Feb 27 17:02:24 2006
@@ -16,10 +16,10 @@
* limitations under the License.
*/
+import org.apache.maven.surefire.Surefire;
import org.apache.maven.surefire.battery.assertion.BatteryAssert;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterManager;
-import org.apache.maven.surefire.Surefire;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/DirectoryBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/DirectoryBattery.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/DirectoryBattery.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/DirectoryBattery.java Mon Feb 27 17:02:24 2006
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.util.DirectoryScanner;
-import org.apache.maven.surefire.util.StringUtils;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java Mon Feb 27 17:02:24 2006
@@ -21,8 +21,8 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
public class JUnitBattery
extends AbstractBattery
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java Mon Feb 27 17:02:24 2006
@@ -16,9 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.Surefire;
-
import junit.framework.TestCase;
+import org.apache.maven.surefire.Surefire;
public class BatteryAssert extends TestCase
{
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryComparisonFailure.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryComparisonFailure.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryComparisonFailure.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryComparisonFailure.java Mon Feb 27 17:02:24 2006
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.battery.assertion.BatteryAssert;
-import org.apache.maven.surefire.battery.assertion.BatteryAssertionFailedError;
-
/**
* Thrown when an assertion equals for Strings failed.
*
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java Mon Feb 27 17:02:24 2006
@@ -20,10 +20,6 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-// 1. only output the report
-// 2. prevent the header from coming out everytime
-// 3. have a summary at the end of the forked run
-
public class ConsoleReporter
extends AbstractReporter
{
@@ -112,6 +108,8 @@
}
writer.println( "" );
+
+ writer.flush();
completedCount = 0;
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java Mon Feb 27 17:02:24 2006
@@ -1,8 +1,5 @@
package org.apache.maven.surefire.report;
-import org.apache.maven.surefire.report.SummaryConsoleReporter;
-import org.apache.maven.surefire.report.ForkingReport;
-
/**
* Summary format console reporter.
*
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java Mon Feb 27 17:02:24 2006
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import java.io.BufferedOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
/**
* Summary format console reporter.
* @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
Modified: maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=381519&r1=381518&r2=381519&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original)
+++ maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Mon Feb 27 17:02:24 2006
@@ -16,19 +16,19 @@
* limitations under the License.
*/
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomWriter;
+
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Enumeration;
import java.util.Properties;
import java.util.StringTokenizer;
-
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomWriter;
/**