svn commit: r1060394 - /maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java

2011-01-18 Thread krosenvold 
Author: krosenvold
Date: Tue Jan 18 14:36:36 2011
New Revision: 1060394

URL: http://svn.apache.org/viewvc?rev=1060394&view=rev
Log:
[SUREFIRE-500] Ensured consistency in testset reporting

Modified:

maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java

Modified: 
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java?rev=1060394&r1=1060393&r2=1060394&view=diff
==
--- 
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
 Tue Jan 18 14:36:36 2011
@@ -118,16 +118,18 @@ public class JUnit4Provider
 }
 catch ( TestSetFailedException e )
 {
-  throw e;
+throw e;
 }
 catch ( Throwable e )
 {
 reporter.testError( new SimpleReportEntry( report.getSourceName(), 
report.getName(),
-new 
PojoStackTraceWriter( report.getSourceName(),
-   
   report.getName(), e ) ) );
+   new 
PojoStackTraceWriter( report.getSourceName(),
+   
  report.getName(), e ) ) );
+}
+finally
+{
+reporter.testSetCompleted( report );
 }
-
-reporter.testSetCompleted( report );
 }
 
 private RunNotifier getRunNotifer( RunListener main, List 
others )

svn commit: r1060395 - in /maven/surefire/trunk: maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/ surefire-booter/src/main/java/org/apache/maven/surefire/booter/ surefire-integrat

2011-01-18 Thread krosenvold 
Author: krosenvold
Date: Tue Jan 18 14:37:17 2011
New Revision: 1060395

URL: http://svn.apache.org/viewvc?rev=1060395&view=rev
Log:
[SUREFIRE-685] Multiple includes/excludes on same parameter not respected 
(regresion)

Added:

maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java
   (with props)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
   (with props)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestA.java
   (with props)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestB.java
   (with props)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestC.java
   (with props)
Modified:

maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java

maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java

Modified: 
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=1060395&r1=1060394&r2=1060395&view=diff
==
--- 
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
 (original)
+++ 
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
 Tue Jan 18 14:37:17 2011
@@ -213,6 +213,10 @@ public class IntegrationTestMojo
  **/*ITCase.java
 
  * 
+ *
+ * Each include item may also contain a comma-separated sublist of items, 
which will be treated as multiple  
+ * entries.
+ *
  * This parameter is ignored if the TestNG suiteXmlFiles 
parameter is specified.
  *
  * @parameter
@@ -230,6 +234,9 @@ public class IntegrationTestMojo
  * (which excludes all inner classes).
  * This parameter is ignored if the TestNG suiteXmlFiles 
parameter is specified.
  *
+ * Each exclude item may also contain a comma-separated sublist of items, 
which will be treated as multiple  
+ * entries.
+ *
  * @parameter
  */
 private List excludes;

Modified: 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java?rev=1060395&r1=1060394&r2=1060395&view=diff
==
--- 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
 (original)
+++ 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
 Tue Jan 18 14:37:17 2011
@@ -233,14 +233,23 @@ public class PropertiesWrapper
 {
 return;
 }
-for ( int i = 0; i < items.size(); i++ )
+int i = 0;
+for (Iterator iterator = items.iterator(); iterator.hasNext();)
 {
-Object item = items.get( i );
+Object item = iterator.next();
 if ( item == null )
 {
 throw new NullPointerException( propertyPrefix + i + " has 
null value" );
 }
-properties.setProperty( propertyPrefix + i, item.toString() );
+
+String[] stringArray = StringUtils.split(item.toString(), ",");
+
+for ( int j = 0; j < stringArray.length; j++ )
+{
+properties.setProperty( propertyPrefix + i, stringArray[j] );
+i++;
+}
+
 }
 }
 

Added: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java
URL: 
http://svn.apache.org/vie

svn commit: r1060396 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/ resources/classpath-filtering/src/test/java/classpathFiltering/ resources/class

2011-01-18 Thread krosenvold 
Author: krosenvold
Date: Tue Jan 18 14:37:46 2011
New Revision: 1060396

URL: http://svn.apache.org/viewvc?rev=1060396&view=rev
Log:
o Fixed some incorrect filemodes

Modified:

maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
   (contents, props changed)

maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
   (contents, props changed)

Modified: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java?rev=1060396&r1=1060395&r2=1060396&view=diff
==
(empty)

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
('svn:executable' removed)

Modified: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java?rev=1060396&r1=1060395&r2=1060396&view=diff
==
(empty)

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
('svn:executable' removed)

Modified: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java?rev=1060396&r1=1060395&r2=1060396&view=diff
==
(empty)

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
('svn:executable' removed)

Modified: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml?rev=1060396&r1=1060395&r2=1060396&view=diff
==
(empty)

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
('svn:executable' removed)

Modified: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java?rev=1060396&r1=1060395&r2=1060396&view=diff
==
(empty)

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java
('svn:executable' removed)

Modified: 
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/sure