git commit: fixed bootstrap (really, this time)
Updated Branches:
refs/heads/master 547b8c4c3 -> c5f54f8a6
fixed bootstrap (really, this time)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c5f54f8a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c5f54f8a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c5f54f8a
Branch: refs/heads/master
Commit: c5f54f8a6a842af1cc506d9f90ad169b617ba686
Parents: 547b8c4
Author: Hervé Boutemy
Authored: Thu Dec 20 08:58:13 2012 +0100
Committer: Hervé Boutemy
Committed: Thu Dec 20 08:58:13 2012 +0100
--
pom.xml | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/c5f54f8a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 91f918b..6b0fa21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,11 +162,6 @@
maven-repository-metadata
${project.version}
-
-ch.qos.logback
-logback-classic
-1.0.7
-
@@ -218,6 +213,11 @@
${slf4jVersion}
runtime
+
+ch.qos.logback
+logback-classic
+1.0.7
+
org.apache.maven.wagon
git commit: fix bootstrap (with Ant)
Updated Branches:
refs/heads/master 0ab0641d3 -> 547b8c4c3
fix bootstrap (with Ant)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/547b8c4c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/547b8c4c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/547b8c4c
Branch: refs/heads/master
Commit: 547b8c4c30d28acd9913f21e62cfd2a44681a66f
Parents: 0ab0641
Author: Hervé Boutemy
Authored: Thu Dec 20 08:49:02 2012 +0100
Committer: Hervé Boutemy
Committed: Thu Dec 20 08:49:02 2012 +0100
--
maven-embedder/pom.xml |1 -
pom.xml|5 +
2 files changed, 5 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/547b8c4c/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index c95eb87..5fb96dc 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -77,7 +77,6 @@
ch.qos.logback
logback-classic
- 1.0.7
true
http://git-wip-us.apache.org/repos/asf/maven/blob/547b8c4c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f53359f..91f918b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,11 @@
maven-repository-metadata
${project.version}
+
+ch.qos.logback
+logback-classic
+1.0.7
+
git commit: o Removed inadvertent soutv that actually broke IT's
Updated Branches:
refs/heads/master e7a18cb2c -> 71f44f611
o Removed inadvertent soutv that actually broke IT's
This is a clear disadvantage of working with a 1.2Ghz laptop under a tropical
palm tree; running IT's prior to commits tends to be given a lower priority.
If I had a drink while running tests this would probably further impair
code quality, so this tradeoff is not entirely clear-cut
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/71f44f61
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/71f44f61
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/71f44f61
Branch: refs/heads/master
Commit: 71f44f611fc314742adc8f377d1226607c946ad8
Parents: e7a18cb
Author: Kristian Rosenvold
Authored: Thu Dec 20 06:33:30 2012 +0100
Committer: Kristian Rosenvold
Committed: Thu Dec 20 06:33:30 2012 +0100
--
.../surefire/report/ConsoleOutputCapture.java |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/71f44f61/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index 342fee9..c7c6069 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -53,7 +53,8 @@ public class ConsoleOutputCapture
public void write( byte[] buf, int off, int len )
{
-System.out.println( "buf = " + buf );
+// Note: At this point the supplied "buf" instance is reused,
which means
+// data must be copied out of the buffer
target.writeTestOutput( buf, off, len, isStdout );
}
[1/2] git commit: o Fixed bug reported by olamy where tests in superclasses were nameless
Updated Branches:
refs/heads/master efd554f78 -> e7a18cb2c
o Fixed bug reported by olamy where tests in superclasses were nameless
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e7a18cb2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e7a18cb2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e7a18cb2
Branch: refs/heads/master
Commit: e7a18cb2c5ff7031da26d4387e87583bcc765462
Parents: 3fb7247
Author: Kristian Rosenvold
Authored: Thu Dec 20 04:04:45 2012 +0100
Committer: Kristian Rosenvold
Committed: Thu Dec 20 04:04:45 2012 +0100
--
.../surefire/report/SmartStackTraceParser.java | 35 ++-
.../surefire/report/SmartStackTraceParserTest.java |3 +-
2 files changed, 25 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e7a18cb2/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index 4f46ac7..74b5c71 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.report;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.utils.StringUtils;
/**
* @author Kristian Rosenvold
@@ -69,22 +68,34 @@ public class SmartStackTraceParser
}
-private static String getSimpleName(String className){
+private static String getSimpleName( String className )
+{
int i = className.lastIndexOf( "." );
-return className.substring( i + 1 );
+return className.substring( i + 1 );
}
+
@SuppressWarnings( "ThrowableResultOfMethodCallIgnored" )
public String getString()
{
StringBuilder result = new StringBuilder();
-result.append( simpleName );
-result.append( "#" );
List stackTraceElements = focusOnClass( stackTrace,
testClass );
Collections.reverse( stackTraceElements );
-for ( StackTraceElement stackTraceElement : stackTraceElements )
+StackTraceElement stackTraceElement;
+for ( int i = 0; i < stackTraceElements.size(); i++ )
{
-if (!stackTraceElement.getClassName().equals( testClassName )){
-result.append( "<" ).append( getSimpleName(
stackTraceElement.getClassName() )); // Add the name of the superclas
+stackTraceElement = stackTraceElements.get( i );
+if ( i == 0 )
+{
+result.append( simpleName );
+result.append( "#" );
+}
+if ( !stackTraceElement.getClassName().equals( testClassName ) )
+{
+if ( i > 0 )
+{
+result.append( "<" );
+}
+result.append( getSimpleName( stackTraceElement.getClassName()
) ); // Add the name of the superclas
result.append( "#" );
}
result.append( stackTraceElement.getMethodName() ).append( "("
).append(
@@ -140,10 +151,12 @@ public class SmartStackTraceParser
List result = new ArrayList();
for ( StackTraceElement element : stackTrace )
{
-if ( isInSupers( clazz, element.getClassName() ) ) {
-result.add( element );
+if ( isInSupers( clazz, element.getClassName() ) )
+{
+result.add( element );
+}
}
-} return result;
+return result;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e7a18cb2/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
--
diff --git
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
index cb4f658..9affc79 100644
---
a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
+++
b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java
@@ -127,8 +127,7 @@ public class SmartStackTra
[2/2] git commit: o Added support for smart-stacktrace in base class2
o Added support for smart-stacktrace in base class2
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3fb72473
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3fb72473
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3fb72473
Branch: refs/heads/master
Commit: 3fb724733f35ade8431a066f45de84801353bb93
Parents: efd554f
Author: Kristian Rosenvold
Authored: Wed Dec 19 17:06:45 2012 +0100
Committer: Kristian Rosenvold
Committed: Wed Dec 19 17:06:45 2012 +0100
--
.../surefire/report/ConsoleOutputCapture.java |1 +
.../surefire/report/SmartStackTraceParser.java | 53 ---
.../apache/maven/surefire/report/ABaseClass.java | 29
.../apache/maven/surefire/report/ASubClass.java| 24 +++
.../surefire/report/SmartStackTraceParserTest.java | 17 +
5 files changed, 114 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3fb72473/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
--
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index 9f237fd..342fee9 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -53,6 +53,7 @@ public class ConsoleOutputCapture
public void write( byte[] buf, int off, int len )
{
+System.out.println( "buf = " + buf );
target.writeTestOutput( buf, off, len, isStdout );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3fb72473/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
--
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index e3245a6..4f46ac7 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -22,6 +22,7 @@ package org.apache.maven.surefire.report;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.maven.shared.utils.StringUtils;
/**
* @author Kristian Rosenvold
@@ -38,30 +39,54 @@ public class SmartStackTraceParser
private String testClassName;
+private final Class testClass;
+
public SmartStackTraceParser( Class testClass, Throwable throwable )
{
this( testClass.getName(), throwable );
}
-public SmartStackTraceParser( String testClass, Throwable throwable )
+public SmartStackTraceParser( String testClassName, Throwable throwable )
{
-this.testClassName = testClass;
-this.simpleName = testClassName.substring( testClassName.lastIndexOf(
"." ) + 1 );
+this.testClassName = testClassName;
+this.testClass = getClass( testClassName );
+this.simpleName = this.testClassName.substring(
this.testClassName.lastIndexOf( "." ) + 1 );
this.throwable = new SafeThrowable( throwable );
stackTrace = throwable.getStackTrace();
}
+private static Class getClass( String name )
+{
+try
+{
+return Class.forName( name );
+}
+catch ( ClassNotFoundException e )
+{
+throw new RuntimeException( e );
+}
+}
+
+
+private static String getSimpleName(String className){
+int i = className.lastIndexOf( "." );
+return className.substring( i + 1 );
+}
@SuppressWarnings( "ThrowableResultOfMethodCallIgnored" )
public String getString()
{
StringBuilder result = new StringBuilder();
result.append( simpleName );
result.append( "#" );
-List stackTraceElements = focusOnClass( stackTrace,
testClassName );
+List stackTraceElements = focusOnClass( stackTrace,
testClass );
Collections.reverse( stackTraceElements );
for ( StackTraceElement stackTraceElement : stackTraceElements )
{
+if (!stackTraceElement.getClassName().equals( testClassName )){
+result.append( "<" ).append( getSimpleName(
stackTraceElement.getClassName() )); // Add the name of the superclas
+
