Author: krosenvold
Date: Fri Jun 22 19:30:11 2012
New Revision: 1353003
URL: http://svn.apache.org/viewvc?rev=1353003&view=rev
Log:
Fixed integration tests on windows. All tests now pass
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
(contents, props changed)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java?rev=1353003&r1=1353002&r2=1353003&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
------------------------------------------------------------------------------
svn:executable = *
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java?rev=1353003&r1=1353002&r2=1353003&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
Fri Jun 22 19:30:11 2012
@@ -23,12 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
+import java.util.*;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
@@ -50,7 +45,7 @@ public class TestSuiteXmlParser
private Map<String, ReportTestSuite> classesToSuites;
- private final NumberFormat numberFormat = NumberFormat.getInstance();
+ private final NumberFormat numberFormat =
NumberFormat.getInstance(Locale.US);
/**
* @noinspection StringBufferField
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
------------------------------------------------------------------------------
svn:executable = *
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java?rev=1353003&r1=1353002&r2=1353003&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
Fri Jun 22 19:30:11 2012
@@ -9,7 +9,7 @@ public class Surefire809GroupExpressions
{
public void testJUnitRunCategoryAB()
{
- OutputValidator validator = unpackJUnit().groups(
"junit4.CategoryA&&junit4.CategoryB" ).executeTest();
+ OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA
AND junit4.CategoryB" ).executeTest();
validator.verifyErrorFreeLog();
validator.assertTestSuiteResults( 2, 0, 0, 0 );
validator.verifyTextInLog( "catA: 1" );
@@ -35,7 +35,7 @@ public class Surefire809GroupExpressions
public void testTestNGRunCategoryAB()
{
- OutputValidator validator = unpackTestNG().groups(
"CategoryA&&CategoryB" ).debugLogging().executeTest();
+ OutputValidator validator = unpackTestNG().groups( "CategoryA AND
CategoryB" ).debugLogging().executeTest();
validator.verifyErrorFreeLog();
validator.assertTestSuiteResults( 2, 0, 0, 0 );
validator.verifyTextInLog( "BasicTest.testInCategoriesAB()" );
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
------------------------------------------------------------------------------
svn:executable = *
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java?rev=1353003&r1=1353002&r2=1353003&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
Fri Jun 22 19:30:11 2012
@@ -9,7 +9,7 @@ public class Surefire832ProviderSelectio
{
public void testJUnitRunCategoryAB()
{
- OutputValidator validator = unpackJUnit().groups(
"junit4.CategoryA&&junit4.CategoryB" ).executeTest();
+ OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA
AND junit4.CategoryB" ).executeTest();
validator.verifyErrorFreeLog();
validator.assertTestSuiteResults( 2, 0, 0, 0 );
validator.verifyTextInLog( "catA: 1" );
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
------------------------------------------------------------------------------
svn:executable = *
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java?rev=1353003&r1=1353002&r2=1353003&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
Fri Jun 22 19:30:11 2012
@@ -14,9 +14,13 @@ public class Test1
static void sleep( int ms )
{
+ long target = System.currentTimeMillis() + ms;
try
{
- Thread.sleep( ms );
+ do
+ {
+ Thread.sleep( ms );
+ } while ( System.currentTimeMillis() < target);
}
catch ( InterruptedException e )
{
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
------------------------------------------------------------------------------
svn:executable = *
