You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/12/30 18:13:58 UTC
svn commit: r1225867 [2/2] -
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenErrorsIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenErrorsIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
import junit.framework.Assert;
import org.apache.maven.it.VerificationException;
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenFailsafeErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenFailsafeErrorsIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenFailsafeErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenFailsafeErrorsIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
import org.apache.maven.it.VerificationException;
import junit.framework.Assert;
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java Fri Dec 30 17:13:55 2011
@@ -1,41 +1,41 @@
-package org.apache.maven.surefire.its;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-
-/**
- * SUREFIRE-685 Asserts that only the specified tests are run with comma separated includes
- *
- * @author Kristian Rosenvold
- */
-public class Surefire685CommaSeparatedIncludesIT
- extends SurefireVerifierTestClass
-{
- public Surefire685CommaSeparatedIncludesIT()
- {
- super( "/surefire-685-commaseparatedIncludes" );
- }
-
- public void testBuildFailingWhenErrors()
- throws Exception
- {
- executeTest();
- assertTestSuiteResults( 2, 0, 0, 0 );
- }
-}
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * SUREFIRE-685 Asserts that only the specified tests are run with comma separated includes
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire685CommaSeparatedIncludesIT
+ extends SurefireVerifierTestClass
+{
+ public Surefire685CommaSeparatedIncludesIT()
+ {
+ super( "/surefire-685-commaseparatedIncludes" );
+ }
+
+ public void testBuildFailingWhenErrors()
+ throws Exception
+ {
+ executeTest();
+ assertTestSuiteResults( 2, 0, 0, 0 );
+ }
+}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java Fri Dec 30 17:13:55 2011
@@ -1,44 +1,43 @@
-package org.apache.maven.surefire.its;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-
-/**
- * SUREFIRE-697 Asserts proper truncation of long exception messages
- * Some say testing this is a bit over the top.
- *
- * @author Kristian Rosenvold
- */
-public class Surefire697NiceSummaryIT
- extends SurefireVerifierTestClass
-{
- public Surefire697NiceSummaryIT()
- {
- super( "/surefire-697-niceSummary" );
- }
-
- public void testBuildFailingWhenErrors()
- throws Exception
- {
- failNever( );
- executeTest();
- verifyTextInLog( "testShortMultiline(junit.surefire697.BasicTest): A very short multiline message" );
- // Could assert that "Here is line 2" is not present too.
- }
-}
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * SUREFIRE-697 Asserts proper truncation of long exception messages Some say testing this is a bit over the top.
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire697NiceSummaryIT
+ extends SurefireVerifierTestClass
+{
+ public Surefire697NiceSummaryIT()
+ {
+ super( "/surefire-697-niceSummary" );
+ }
+
+ public void testBuildFailingWhenErrors()
+ throws Exception
+ {
+ failNever();
+ executeTest();
+ verifyTextInLog( "testShortMultiline(junit.surefire697.BasicTest): A very short multiline message" );
+ // Could assert that "Here is line 2" is not present too.
+ }
+}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire705ParallelForkTimeoutIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire705ParallelForkTimeoutIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire705ParallelForkTimeoutIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire705ParallelForkTimeoutIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java Fri Dec 30 17:13:55 2011
@@ -1,39 +1,41 @@
-package org.apache.maven.surefire.its;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.maven.it.VerificationException;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Surefire733AllOverrridesCapturedIT
- extends SurefireVerifierTestClass
-{
- public Surefire733AllOverrridesCapturedIT()
- {
- super( "/surefire-733-allOverridesCaptured" );
- }
-
- public void testLogOutput() throws VerificationException {
- executeTest();
- verifyTextInLog( "abc" );
- }
-}
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.maven.it.VerificationException;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire733AllOverrridesCapturedIT
+ extends SurefireVerifierTestClass
+{
+ public Surefire733AllOverrridesCapturedIT()
+ {
+ super( "/surefire-733-allOverridesCaptured" );
+ }
+
+ public void testLogOutput()
+ throws VerificationException
+ {
+ executeTest();
+ verifyTextInLog( "abc" );
+ }
+}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -41,7 +42,6 @@ public class Surefire747MethodParallelWi
public void testClassesParallelWithSuite()
throws Exception
{
-
parallel( "classes" );
executeTest();
verifyErrorFreeLog();
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,8 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
-
/**
* Test
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java Fri Dec 30 17:13:55 2011
@@ -39,7 +39,7 @@ import junit.framework.Assert;
import junit.framework.TestCase;
/**
- * Contains commonly used featurtes for most tests, encapsulating
+ * Contains commonly used features for most tests, encapsulating
* common use cases.
* <p/>
* Also includes thread-safe access to the extracted resource
@@ -59,7 +59,7 @@ public abstract class SurefireVerifierTe
private final Verifier verifier;
- private final Map<String, String> envvars = new HashMap<String, String>( );
+ private final Map<String, String> envvars = new HashMap<String, String>();
private final String testNgVersion = System.getProperty( "testng.version" );
@@ -102,8 +102,9 @@ public abstract class SurefireVerifierTe
}
- protected void addEnvVar(String key, String value){
- envvars.put( key, value );
+ protected void addEnvVar( String key, String value )
+ {
+ envvars.put( key, value );
}
private List<String> getInitialGoals()
@@ -231,13 +232,14 @@ public abstract class SurefireVerifierTe
addGoal( "-DprintSummary=" + printsummary );
}
- protected void redirectToFileReally(boolean redirect){
- addGoal( "-Dmaven.test.redirectTestOutputToFile=" + redirect);
+ protected void redirectToFileReally( boolean redirect )
+ {
+ addGoal( "-Dmaven.test.redirectTestOutputToFile=" + redirect );
}
protected void redirectToFile( boolean redirect )
{
- redirectToFileReally(redirect);
+ redirectToFileReally( redirect );
//addGoal( "-Dredirect.to.file=" + redirect );
}
@@ -261,7 +263,7 @@ public abstract class SurefireVerifierTe
addGoal( "-DforkMode=" + forkMode );
}
- protected void failIfNoTests( boolean fail)
+ protected void failIfNoTests( boolean fail )
{
addGoal( "-DfailIfNoTests=" + fail );
}
@@ -304,7 +306,6 @@ public abstract class SurefireVerifierTe
final List<String> list = getVerifier().loadFile( file, false );
for ( String line : list )
{
-
if ( line.contains( text ) )
{
return true;
@@ -369,7 +370,7 @@ public abstract class SurefireVerifierTe
protected String getSurefireReportGoal()
{
- return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report";
+ return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":report";
}
protected String getSurefireReportOnlyGoal()
@@ -402,13 +403,16 @@ public abstract class SurefireVerifierTe
protected void addD( String variable, String value )
{
- addGoal( "-D" + variable + "=" + value);
+ addGoal( "-D" + variable + "=" + value );
}
- public void setGroups(String groups){
+ public void setGroups( String groups )
+ {
addD( "groups", groups );
}
- public void setExcludedGroups(String excludedGroups){
+
+ public void setExcludedGroups( String excludedGroups )
+ {
addD( "excludedGroups", excludedGroups );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
*
@@ -33,7 +33,7 @@ public class TestNgGroupsIT
super( "/testng-groups" );
}
- public void testTestNgGroupThreadParallel ()
+ public void testTestNgGroupThreadParallel()
throws Exception
{
setExcludedGroups( "notincluded" );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
*
@@ -33,7 +33,7 @@ public class TestNgParallelWithAnnotatio
super( "/testng-parallel-with-annotations" );
}
- public void testTestNgGroupThreadParallel ()
+ public void testTestNgGroupThreadParallel()
throws Exception
{
executeTest();
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternAfterIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test project using -Dtest=mtClass#myMethod*
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternBeforeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternBeforeIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternBeforeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternBeforeIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test project using -Dtest=mtClass#myMethod*
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test project using -Dtest=mtClass#myMethod*
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test project using -Dtest=mtClass#myMethod
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test project using -Dtest=mtClass#myMethod
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
/**
* Test useSystemClassLoader option
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -118,7 +119,6 @@ public class WorkingDirectoryIT
public void testWorkingDirectoryChildOnlyNoFork()
throws Exception
{
-
Verifier verifier = new Verifier( childTestDir.getAbsolutePath() );
List<String> goals = this.getInitialGoals();
goals.add( "test" );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java?rev=1225867&r1=1225866&r2=1225867&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java Fri Dec 30 17:13:55 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -48,11 +49,11 @@ public class XmlReporterRunTimeIT
{
if ( "runorder.parallel.Test1".equals( report.getFullClassName() ) )
{
- assertTrue( report.getTimeElapsed() >= 1.2f);
+ assertTrue( report.getTimeElapsed() >= 1.2f );
}
else if ( "runorder.parallel.Test2".equals( report.getFullClassName() ) )
{
- assertTrue( report.getTimeElapsed() >= 0.9f);
+ assertTrue( report.getTimeElapsed() >= 0.9f );
}
else
{