Author: carlos
Date: Sun Jan 1 13:39:29 2006
New Revision: 360553
URL: http://svn.apache.org/viewcvs?rev=360553&view=rev
Log:
Set right svn properties
Modified:
maven/surefire/trunk/sandbox/surefire-jython/src/test/java/org/codehaus/surefire/battery/jython/JythonBatteryTest.java
(props changed)
maven/surefire/trunk/surefire-site/pom.xml (props changed)
maven/surefire/trunk/surefire-site/src/site/site.xml (props changed)
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
(contents, props changed)
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
(contents, props changed)
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
(contents, props changed)
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
(contents, props changed)
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
(contents, props changed)
Propchange:
maven/surefire/trunk/sandbox/surefire-jython/src/test/java/org/codehaus/surefire/battery/jython/JythonBatteryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/sandbox/surefire-jython/src/test/java/org/codehaus/surefire/battery/jython/JythonBatteryTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/surefire/trunk/surefire-site/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 1 13:39:29 2006
@@ -1 +1 @@
-Id
+Author Date Id Revision
Propchange: maven/surefire/trunk/surefire-site/src/site/site.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 1 13:39:29 2006
@@ -1 +1 @@
-Id
+Author Date Id Revision
Modified:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java?rev=360553&r1=360552&r2=360553&view=diff
==============================================================================
---
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
(original)
+++
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
Sun Jan 1 13:39:29 2006
@@ -1,160 +1,160 @@
-package org.apache.maven.surefire.report;
-
-/*
- * Copyright 2001-2005 The Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.BufferedOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * Brief format console reporter.
- * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
- * @version $Id: BriefConsoleReporter.java 62 2005-10-07 06:50:37Z jruiz $
- */
-
-public class BriefConsoleReporter
- extends AbstractReporter
-{
- private static final int BUFFER_SIZE = 4096;
-
- private PrintWriter writer;
-
- private StringBuffer reportContent;
-
- private long batteryStartTime;
-
- String newLine = System.getProperty("line.separator");
-
- public BriefConsoleReporter()
- {
- writer = new PrintWriter( new OutputStreamWriter( new
BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
- }
-
- public void writeMessage( String message )
- {
- writer.println( message );
- writer.flush();
- }
-
- public void runStarting( int testCount )
- {
- writer.println();
- writer.println(
"-------------------------------------------------------" );
- writer.println( " T E S T S" );
- writer.println(
"-------------------------------------------------------" );
- writer.flush();
-
- }
-
- public void batteryStarting( ReportEntry report )
- throws Exception
- {
- batteryStartTime = System.currentTimeMillis();
-
- reportContent = new StringBuffer();
-
- writer.println( "[surefire] Running " + report.getName() );
- }
-
- public void batteryCompleted( ReportEntry report )
- {
- long runTime = System.currentTimeMillis() - this.batteryStartTime;
-
- StringBuffer batterySummary = new StringBuffer();
-
- batterySummary.append( "[surefire] Tests run: " + String.valueOf(
this.getNbTests() ) )
- .append( ", Failures: " + String.valueOf(
this.getNbFailures() ) )
- .append( ", Errors: " + String.valueOf(
this.getNbErrors() ))
- .append( ", Time elapsed: " + elapsedTimeAsString(
runTime ))
- .append(" sec")
- .append(newLine)
- .append("[surefire] " + newLine);
-
- reportContent = batterySummary.append(reportContent);
-
- writer.println( reportContent.toString() );
-
- writer.flush();
- }
-
- public void testStarting( ReportEntry report )
- {
- super.testStarting(report);
- }
-
-
- public void testError( ReportEntry report, String stdOut, String stdErr )
- {
- super.testError(report, stdOut, stdErr);
-
- reportContent.append("[surefire] " + report.getName() );
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(" <<< ERROR!" + newLine);
-
- reportContent.append( getStackTrace( report ) + newLine );
- }
-
- public void testFailed( ReportEntry report, String stdOut, String stdErr )
- {
- super.testFailed(report, stdOut, stdErr);
-
- reportContent.append("[surefire] " + report.getName() );
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(" <<< FAILURE!" + newLine);
-
- reportContent.append( getStackTrace( report ) + newLine );
- }
-
- public void dispose()
- {
- errors = 0;
-
- failures = 0;
-
- completedCount = 0;
- }
-
- private void writeTimeElapsed(long sec)
- {
- reportContent.append( " Time elapsed: " + elapsedTimeAsString( sec )
+ " sec" );
- }
-
- /**
- * Returns stacktrace as String.
- * @param report ReportEntry object.
- * @return stacktrace as string.
- */
- private String getStackTrace(ReportEntry report)
- {
- StringWriter writer = new StringWriter();
-
- report.getThrowable().printStackTrace(new PrintWriter(writer));
-
- writer.flush();
-
- return writer.toString();
- }
-}
+package org.apache.maven.surefire.report;
+
+/*
+ * Copyright 2001-2005 The Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.BufferedOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * Brief format console reporter.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
+ * @version $Id$
+ */
+
+public class BriefConsoleReporter
+ extends AbstractReporter
+{
+ private static final int BUFFER_SIZE = 4096;
+
+ private PrintWriter writer;
+
+ private StringBuffer reportContent;
+
+ private long batteryStartTime;
+
+ String newLine = System.getProperty("line.separator");
+
+ public BriefConsoleReporter()
+ {
+ writer = new PrintWriter( new OutputStreamWriter( new
BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
+ }
+
+ public void writeMessage( String message )
+ {
+ writer.println( message );
+ writer.flush();
+ }
+
+ public void runStarting( int testCount )
+ {
+ writer.println();
+ writer.println(
"-------------------------------------------------------" );
+ writer.println( " T E S T S" );
+ writer.println(
"-------------------------------------------------------" );
+ writer.flush();
+
+ }
+
+ public void batteryStarting( ReportEntry report )
+ throws Exception
+ {
+ batteryStartTime = System.currentTimeMillis();
+
+ reportContent = new StringBuffer();
+
+ writer.println( "[surefire] Running " + report.getName() );
+ }
+
+ public void batteryCompleted( ReportEntry report )
+ {
+ long runTime = System.currentTimeMillis() - this.batteryStartTime;
+
+ StringBuffer batterySummary = new StringBuffer();
+
+ batterySummary.append( "[surefire] Tests run: " + String.valueOf(
this.getNbTests() ) )
+ .append( ", Failures: " + String.valueOf(
this.getNbFailures() ) )
+ .append( ", Errors: " + String.valueOf(
this.getNbErrors() ))
+ .append( ", Time elapsed: " + elapsedTimeAsString(
runTime ))
+ .append(" sec")
+ .append(newLine)
+ .append("[surefire] " + newLine);
+
+ reportContent = batterySummary.append(reportContent);
+
+ writer.println( reportContent.toString() );
+
+ writer.flush();
+ }
+
+ public void testStarting( ReportEntry report )
+ {
+ super.testStarting(report);
+ }
+
+
+ public void testError( ReportEntry report, String stdOut, String stdErr )
+ {
+ super.testError(report, stdOut, stdErr);
+
+ reportContent.append("[surefire] " + report.getName() );
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(" <<< ERROR!" + newLine);
+
+ reportContent.append( getStackTrace( report ) + newLine );
+ }
+
+ public void testFailed( ReportEntry report, String stdOut, String stdErr )
+ {
+ super.testFailed(report, stdOut, stdErr);
+
+ reportContent.append("[surefire] " + report.getName() );
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(" <<< FAILURE!" + newLine);
+
+ reportContent.append( getStackTrace( report ) + newLine );
+ }
+
+ public void dispose()
+ {
+ errors = 0;
+
+ failures = 0;
+
+ completedCount = 0;
+ }
+
+ private void writeTimeElapsed(long sec)
+ {
+ reportContent.append( " Time elapsed: " + elapsedTimeAsString( sec )
+ " sec" );
+ }
+
+ /**
+ * Returns stacktrace as String.
+ * @param report ReportEntry object.
+ * @return stacktrace as string.
+ */
+ private String getStackTrace(ReportEntry report)
+ {
+ StringWriter writer = new StringWriter();
+
+ report.getThrowable().printStackTrace(new PrintWriter(writer));
+
+ writer.flush();
+
+ return writer.toString();
+ }
+}
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=360553&r1=360552&r2=360553&view=diff
==============================================================================
---
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
(original)
+++
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
Sun Jan 1 13:39:29 2006
@@ -1,179 +1,179 @@
-package org.apache.maven.surefire.report;
-
-/*
- * Copyright 2001-2005 The Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * Brief format file reporter.
- * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
- * @version $Id: BriefeFileReporter.java 62 2005-10-07 04:07:33Z jruiz $
- */
-public class BriefFileReporter
- extends AbstractReporter
-{
- private PrintWriter writer;
-
- private StringBuffer reportContent;
-
- private long batteryStartTime;
-
- public void runStarting( int testCount )
- {
-
- }
-
- public void batteryStarting( ReportEntry report )
- throws Exception
- {
- batteryStartTime = System.currentTimeMillis();
-
- reportContent = new StringBuffer();
-
- File reportFile = new File( getReportsDirectory(), report.getName() +
".txt" );
-
- File reportDir = reportFile.getParentFile();
-
- reportDir.mkdirs();
-
- writer = new PrintWriter( new FileWriter( reportFile ) );
-
- writer.println(
"-------------------------------------------------------------------------------"
);
-
- writer.println( "Battery: " + report.getName() );
-
- writer.println(
"-------------------------------------------------------------------------------"
);
- }
-
- public void batteryCompleted( ReportEntry report )
- {
- long runTime = System.currentTimeMillis() - this.batteryStartTime;
-
- StringBuffer batterySummary = new StringBuffer();
-
- batterySummary.append( "Tests run: " + String.valueOf(
this.getNbTests() ) )
- .append( ", Failures: " + String.valueOf(
this.getNbFailures() ) )
- .append( ", Errors: " + String.valueOf(
this.getNbErrors() ))
- .append( ", Time elapsed: " + elapsedTimeAsString(
runTime ))
- .append(" sec \n\n");
-
- reportContent = batterySummary.append(reportContent);
-
- writer.println( reportContent.toString() );
-
- writer.flush();
-
- writer.close();
- }
-
- public void testStarting( ReportEntry report )
- {
- super.testStarting(report);
- }
-
- public void testError( ReportEntry report, String stdOut, String stdErr )
- {
- super.testError(report, stdOut, stdErr);
-
- reportContent.append(report.getName() );
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(" <<< ERROR!\n");
-
- writeStdLogs( stdOut, stdErr );
-
- reportContent.append( getStackTrace( report ) + "\n" );
- }
-
- public void testFailed( ReportEntry report, String stdOut, String stdErr )
- {
- super.testFailed(report, stdOut, stdErr);
-
- reportContent.append(report.getName() );
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(" <<< FAILURE!\n");
-
- writeStdLogs( stdOut, stdErr );
-
- reportContent.append( getStackTrace( report ) + "\n" );
- }
-
- public void dispose()
- {
- errors = 0;
-
- failures = 0;
-
- completedCount = 0;
- }
-
- private void writeTimeElapsed(long sec)
- {
- reportContent.append( " Time elapsed: " + elapsedTimeAsString( sec )
+ " sec" );
- }
-
- private void writeStdLogs( String stdOut, String stdErr )
- {
- reportContent.append("\n");
-
- reportContent.append( "[ stdout ]
---------------------------------------------------------------\n" );
-
- reportContent.append("\n");
-
- reportContent.append( stdOut + "\n");
-
- reportContent.append("\n");
-
- reportContent.append( "[ stderr ]
---------------------------------------------------------------\n" );
-
- reportContent.append("\n");
-
- reportContent.append( stdErr + "\n");
-
- reportContent.append("\n");
-
- reportContent.append( "[ stacktrace ]
-----------------------------------------------------------\n" );
-
- reportContent.append("\n");
- }
-
- /**
- * Returns stacktrace as String.
- * @param report ReportEntry object.
- * @return stacktrace as string.
- */
- private String getStackTrace(ReportEntry report)
- {
- StringWriter writer = new StringWriter();
-
- report.getThrowable().printStackTrace(new PrintWriter(writer));
-
- writer.flush();
-
- return writer.toString();
- }
-}
+package org.apache.maven.surefire.report;
+
+/*
+ * Copyright 2001-2005 The Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * Brief format file reporter.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
+ * @version $Id$
+ */
+public class BriefFileReporter
+ extends AbstractReporter
+{
+ private PrintWriter writer;
+
+ private StringBuffer reportContent;
+
+ private long batteryStartTime;
+
+ public void runStarting( int testCount )
+ {
+
+ }
+
+ public void batteryStarting( ReportEntry report )
+ throws Exception
+ {
+ batteryStartTime = System.currentTimeMillis();
+
+ reportContent = new StringBuffer();
+
+ File reportFile = new File( getReportsDirectory(), report.getName() +
".txt" );
+
+ File reportDir = reportFile.getParentFile();
+
+ reportDir.mkdirs();
+
+ writer = new PrintWriter( new FileWriter( reportFile ) );
+
+ writer.println(
"-------------------------------------------------------------------------------"
);
+
+ writer.println( "Battery: " + report.getName() );
+
+ writer.println(
"-------------------------------------------------------------------------------"
);
+ }
+
+ public void batteryCompleted( ReportEntry report )
+ {
+ long runTime = System.currentTimeMillis() - this.batteryStartTime;
+
+ StringBuffer batterySummary = new StringBuffer();
+
+ batterySummary.append( "Tests run: " + String.valueOf(
this.getNbTests() ) )
+ .append( ", Failures: " + String.valueOf(
this.getNbFailures() ) )
+ .append( ", Errors: " + String.valueOf(
this.getNbErrors() ))
+ .append( ", Time elapsed: " + elapsedTimeAsString(
runTime ))
+ .append(" sec \n\n");
+
+ reportContent = batterySummary.append(reportContent);
+
+ writer.println( reportContent.toString() );
+
+ writer.flush();
+
+ writer.close();
+ }
+
+ public void testStarting( ReportEntry report )
+ {
+ super.testStarting(report);
+ }
+
+ public void testError( ReportEntry report, String stdOut, String stdErr )
+ {
+ super.testError(report, stdOut, stdErr);
+
+ reportContent.append(report.getName() );
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(" <<< ERROR!\n");
+
+ writeStdLogs( stdOut, stdErr );
+
+ reportContent.append( getStackTrace( report ) + "\n" );
+ }
+
+ public void testFailed( ReportEntry report, String stdOut, String stdErr )
+ {
+ super.testFailed(report, stdOut, stdErr);
+
+ reportContent.append(report.getName() );
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(" <<< FAILURE!\n");
+
+ writeStdLogs( stdOut, stdErr );
+
+ reportContent.append( getStackTrace( report ) + "\n" );
+ }
+
+ public void dispose()
+ {
+ errors = 0;
+
+ failures = 0;
+
+ completedCount = 0;
+ }
+
+ private void writeTimeElapsed(long sec)
+ {
+ reportContent.append( " Time elapsed: " + elapsedTimeAsString( sec )
+ " sec" );
+ }
+
+ private void writeStdLogs( String stdOut, String stdErr )
+ {
+ reportContent.append("\n");
+
+ reportContent.append( "[ stdout ]
---------------------------------------------------------------\n" );
+
+ reportContent.append("\n");
+
+ reportContent.append( stdOut + "\n");
+
+ reportContent.append("\n");
+
+ reportContent.append( "[ stderr ]
---------------------------------------------------------------\n" );
+
+ reportContent.append("\n");
+
+ reportContent.append( stdErr + "\n");
+
+ reportContent.append("\n");
+
+ reportContent.append( "[ stacktrace ]
-----------------------------------------------------------\n" );
+
+ reportContent.append("\n");
+ }
+
+ /**
+ * Returns stacktrace as String.
+ * @param report ReportEntry object.
+ * @return stacktrace as string.
+ */
+ private String getStackTrace(ReportEntry report)
+ {
+ StringWriter writer = new StringWriter();
+
+ report.getThrowable().printStackTrace(new PrintWriter(writer));
+
+ writer.flush();
+
+ return writer.toString();
+ }
+}
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java?rev=360553&r1=360552&r2=360553&view=diff
==============================================================================
---
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
(original)
+++
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
Sun Jan 1 13:39:29 2006
@@ -1,167 +1,167 @@
-package org.apache.maven.surefire.report;
-
-/*
- * Copyright 2001-2005 The Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.BufferedOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * Detailed console reporter.
- * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
- * @version $Id: DetailedConsoleReporter.java 61 2005-10-07 04:07:33Z jruiz $
- */
-public class DetailedConsoleReporter
- extends AbstractReporter
-{
- private static final int BUFFER_SIZE = 4096;
-
- private PrintWriter writer;
-
- private StringBuffer reportContent;
-
- private long batteryStartTime;
-
- String newLine = System.getProperty("line.separator");
-
- public DetailedConsoleReporter()
- {
- writer = new PrintWriter( new OutputStreamWriter( new
BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
- }
-
- public void writeMessage( String message )
- {
- writer.println( message );
- writer.flush();
- }
-
- public void runStarting( int testCount )
- {
- writer.println();
- writer.println(
"-------------------------------------------------------" );
- writer.println( " T E S T S" );
- writer.println(
"-------------------------------------------------------" );
- writer.flush();
-
- }
-
- public void batteryStarting( ReportEntry report )
- throws Exception
- {
- batteryStartTime = System.currentTimeMillis();
-
- reportContent = new StringBuffer();
-
- writer.println( "[surefire] Running " + report.getName() );
- }
-
- public void batteryCompleted( ReportEntry report )
- {
- long runTime = System.currentTimeMillis() - this.batteryStartTime;
-
- StringBuffer batterySummary = new StringBuffer();
-
- batterySummary.append( "[surefire] Tests run: " + String.valueOf(
this.getNbTests() ) )
- .append( ", Failures: " + String.valueOf(
this.getNbFailures() ) )
- .append( ", Errors: " + String.valueOf(
this.getNbErrors() ))
- .append( ", Time elapsed: " + elapsedTimeAsString(
runTime ))
- .append(" sec")
- .append(newLine)
- .append("[surefire] " + newLine);
-
- reportContent = batterySummary.append(reportContent);
-
- writer.println( reportContent.toString() );
-
- writer.flush();
- }
-
- public void testStarting( ReportEntry report )
- {
- super.testStarting(report);
-
- reportContent.append("[surefire] " + report.getName() );
- }
-
- public void testSucceeded( ReportEntry report )
- {
- super.testSucceeded(report);
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(newLine);
- }
-
- public void testError( ReportEntry report, String stdOut, String stdErr )
- {
- super.testError(report, stdOut, stdErr);
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(" <<< ERROR!" + newLine);
-
- reportContent.append( getStackTrace( report ) + newLine );
- }
-
- public void testFailed( ReportEntry report, String stdOut, String stdErr )
- {
- super.testFailed(report, stdOut, stdErr);
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed(runTime);
-
- reportContent.append(" <<< FAILURE!" + newLine);
-
- reportContent.append( getStackTrace( report ) + newLine );
- }
-
- public void dispose()
- {
- errors = 0;
-
- failures = 0;
-
- completedCount = 0;
- }
-
- private void writeTimeElapsed(long sec)
- {
- reportContent.append( " Time elapsed: " + elapsedTimeAsString( sec )
+ " sec" );
- }
-
- /**
- * Returns stacktrace as string.
- * @param report ReportEntry object.
- * @return stacktrace as string.
- */
- private String getStackTrace(ReportEntry report)
- {
- StringWriter writer = new StringWriter();
-
- report.getThrowable().printStackTrace(new PrintWriter(writer));
-
- writer.flush();
-
- return writer.toString();
- }
-}
+package org.apache.maven.surefire.report;
+
+/*
+ * Copyright 2001-2005 The Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.BufferedOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * Detailed console reporter.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
+ * @version $Id$
+ */
+public class DetailedConsoleReporter
+ extends AbstractReporter
+{
+ private static final int BUFFER_SIZE = 4096;
+
+ private PrintWriter writer;
+
+ private StringBuffer reportContent;
+
+ private long batteryStartTime;
+
+ String newLine = System.getProperty("line.separator");
+
+ public DetailedConsoleReporter()
+ {
+ writer = new PrintWriter( new OutputStreamWriter( new
BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
+ }
+
+ public void writeMessage( String message )
+ {
+ writer.println( message );
+ writer.flush();
+ }
+
+ public void runStarting( int testCount )
+ {
+ writer.println();
+ writer.println(
"-------------------------------------------------------" );
+ writer.println( " T E S T S" );
+ writer.println(
"-------------------------------------------------------" );
+ writer.flush();
+
+ }
+
+ public void batteryStarting( ReportEntry report )
+ throws Exception
+ {
+ batteryStartTime = System.currentTimeMillis();
+
+ reportContent = new StringBuffer();
+
+ writer.println( "[surefire] Running " + report.getName() );
+ }
+
+ public void batteryCompleted( ReportEntry report )
+ {
+ long runTime = System.currentTimeMillis() - this.batteryStartTime;
+
+ StringBuffer batterySummary = new StringBuffer();
+
+ batterySummary.append( "[surefire] Tests run: " + String.valueOf(
this.getNbTests() ) )
+ .append( ", Failures: " + String.valueOf(
this.getNbFailures() ) )
+ .append( ", Errors: " + String.valueOf(
this.getNbErrors() ))
+ .append( ", Time elapsed: " + elapsedTimeAsString(
runTime ))
+ .append(" sec")
+ .append(newLine)
+ .append("[surefire] " + newLine);
+
+ reportContent = batterySummary.append(reportContent);
+
+ writer.println( reportContent.toString() );
+
+ writer.flush();
+ }
+
+ public void testStarting( ReportEntry report )
+ {
+ super.testStarting(report);
+
+ reportContent.append("[surefire] " + report.getName() );
+ }
+
+ public void testSucceeded( ReportEntry report )
+ {
+ super.testSucceeded(report);
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(newLine);
+ }
+
+ public void testError( ReportEntry report, String stdOut, String stdErr )
+ {
+ super.testError(report, stdOut, stdErr);
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(" <<< ERROR!" + newLine);
+
+ reportContent.append( getStackTrace( report ) + newLine );
+ }
+
+ public void testFailed( ReportEntry report, String stdOut, String stdErr )
+ {
+ super.testFailed(report, stdOut, stdErr);
+
+ long runTime = this.endTime - this.startTime;
+
+ writeTimeElapsed(runTime);
+
+ reportContent.append(" <<< FAILURE!" + newLine);
+
+ reportContent.append( getStackTrace( report ) + newLine );
+ }
+
+ public void dispose()
+ {
+ errors = 0;
+
+ failures = 0;
+
+ completedCount = 0;
+ }
+
+ private void writeTimeElapsed(long sec)
+ {
+ reportContent.append( " Time elapsed: " + elapsedTimeAsString( sec )
+ " sec" );
+ }
+
+ /**
+ * Returns stacktrace as string.
+ * @param report ReportEntry object.
+ * @return stacktrace as string.
+ */
+ private String getStackTrace(ReportEntry report)
+ {
+ StringWriter writer = new StringWriter();
+
+ report.getThrowable().printStackTrace(new PrintWriter(writer));
+
+ writer.flush();
+
+ return writer.toString();
+ }
+}
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=360553&r1=360552&r2=360553&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
Sun Jan 1 13:39:29 2006
@@ -1,90 +1,90 @@
-package org.apache.maven.surefire.report;
-
-/*
- * Copyright 2001-2005 The Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.BufferedOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-/**
- * Summary format console reporter.
- * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
- * @version $Id: SummaryConsoleReporter.java 61 2005-10-07 04:07:33Z jruiz $
- */
-public class SummaryConsoleReporter
- extends AbstractReporter
-{
- private static final int BUFFER_SIZE = 4096;
-
- private PrintWriter writer;
-
- public SummaryConsoleReporter()
- {
- writer = new PrintWriter( new OutputStreamWriter( new
BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
- }
-
- public void writeMessage( String message )
- {
- writer.println( message );
- writer.flush();
- }
-
- public void runStarting( int testCount )
- {
- writer.println();
- writer.println(
"-------------------------------------------------------" );
- writer.println( " T E S T S" );
- writer.println(
"-------------------------------------------------------" );
- writer.flush();
- }
-
- public void runAborted( ReportEntry report )
- {
- writer.println( "RUN ABORTED" );
- writer.println( report.getSource().getClass().getName() );
- writer.println( report.getName() );
- writer.println( report.getMessage() );
- writer.println( report.getThrowable().getMessage() );
- writer.flush();
- }
-
- public void batteryAborted( ReportEntry report )
- {
- writer.println( "BATTERY ABORTED" );
- writer.println( report.getSource().getClass().getName() );
- writer.println( report.getName() );
- writer.println( report.getMessage() );
- writer.println( report.getThrowable().getMessage() );
- writer.flush();
- }
-
- public void batteryCompleted( ReportEntry report )
- {
- if ( failures > 0 || errors > 0 )
- {
- writer.println( "[surefire] " + report.getName() + " <<<<<<<<
FAILURE !! " );
- }
-
- writer.flush();
-
- completedCount = 0;
-
- errors = 0;
-
- failures = 0;
- }
-}
+package org.apache.maven.surefire.report;
+
+/*
+ * Copyright 2001-2005 The Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.BufferedOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
+/**
+ * Summary format console reporter.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
+ * @version $Id$
+ */
+public class SummaryConsoleReporter
+ extends AbstractReporter
+{
+ private static final int BUFFER_SIZE = 4096;
+
+ private PrintWriter writer;
+
+ public SummaryConsoleReporter()
+ {
+ writer = new PrintWriter( new OutputStreamWriter( new
BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
+ }
+
+ public void writeMessage( String message )
+ {
+ writer.println( message );
+ writer.flush();
+ }
+
+ public void runStarting( int testCount )
+ {
+ writer.println();
+ writer.println(
"-------------------------------------------------------" );
+ writer.println( " T E S T S" );
+ writer.println(
"-------------------------------------------------------" );
+ writer.flush();
+ }
+
+ public void runAborted( ReportEntry report )
+ {
+ writer.println( "RUN ABORTED" );
+ writer.println( report.getSource().getClass().getName() );
+ writer.println( report.getName() );
+ writer.println( report.getMessage() );
+ writer.println( report.getThrowable().getMessage() );
+ writer.flush();
+ }
+
+ public void batteryAborted( ReportEntry report )
+ {
+ writer.println( "BATTERY ABORTED" );
+ writer.println( report.getSource().getClass().getName() );
+ writer.println( report.getName() );
+ writer.println( report.getMessage() );
+ writer.println( report.getThrowable().getMessage() );
+ writer.flush();
+ }
+
+ public void batteryCompleted( ReportEntry report )
+ {
+ if ( failures > 0 || errors > 0 )
+ {
+ writer.println( "[surefire] " + report.getName() + " <<<<<<<<
FAILURE !! " );
+ }
+
+ writer.flush();
+
+ completedCount = 0;
+
+ errors = 0;
+
+ failures = 0;
+ }
+}
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=360553&r1=360552&r2=360553&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
Sun Jan 1 13:39:29 2006
@@ -33,7 +33,7 @@
/**
* XML format reporter.
* @author <a href="mailto:[EMAIL PROTECTED]">Johnny R. Ruiz III</a>
- * @version $Id: XMLReporter.java 61 2005-10-07 04:07:33Z jruiz $
+ * @version $Id$
*/
public class XMLReporter
extends AbstractReporter
@@ -74,7 +74,7 @@
reportDir.mkdirs();
- writer = new PrintWriter( new FileWriter( reportFile ) );
+ writer = new PrintWriter( reportFile, "UTF-8" );
writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/surefire/trunk/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
