Author: hlship
Date: Tue Dec 12 08:18:28 2006
New Revision: 486214
URL: http://svn.apache.org/viewvc?view=rev&rev=486214
Log:
Experment with TestNG parallel execution, and discard it again (still not
consistent between Eclipse and Maven).
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
tapestry/tapestry5/tapestry-project/trunk/pom.xml
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml?view=diff&rev=486214&r1=486213&r2=486214
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/conf/testng.xml Tue Dec 12
08:18:28 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<suite name="Tapestry Core" parallel="false" annotations="1.5" verbose="2">
+<suite name="Tapestry Core" parallel="false" thread-count="10"
annotations="1.5" verbose="2">
<test name="Tapestry Core">
<packages>
<package name="org.apache.tapestry.integration"/>
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java?view=diff&rev=486214&r1=486213&r2=486214
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
Tue Dec 12 08:18:28 2006
@@ -27,9 +27,17 @@
* Extends from [EMAIL PROTECTED] org.testng.Assert} to bring in all the
public static assert methods without
* requiring extra imports.
* <p>
- * Provides common mock factory and mock trainer methods. Uses a thread-local
<em>nice</em> mock
- * control for all created mocks. Nice mocks don't care about the order in
which mock methods are
- * invoked, and will return an appropriate null/0/false value for any
unexpected method invocations.
+ * Provides common mock factory and mock trainer methods. A single
<em>standard</em> mock control
+ * is used for all mock objects. Standard mocks do not care about the exact
order in which methods
+ * are invoked, though they are as rigourous as strict mocks when checking
that parameters are the
+ * correct values.
+ * <p>
+ * This class is thread safe (it uses a thread local to store the mock
control). In theory, this
+ * should allow TestNG to execute tests in parallel. Unfortunately, as of this
writing (TestNG 5.1
+ * and maven-surefire 2.8-SNAPSHOT) parallel execution does not always work
fully and consistently,
+ * some tests are dropped, and so Tapestry does not make use of TestNG
parallel execution.
+ *
+ * @see EasyMock#createControl()
*/
public class TestBase extends Assert
{
Modified: tapestry/tapestry5/tapestry-project/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-project/trunk/pom.xml?view=diff&rev=486214&r1=486213&r2=486214
==============================================================================
--- tapestry/tapestry5/tapestry-project/trunk/pom.xml (original)
+++ tapestry/tapestry5/tapestry-project/trunk/pom.xml Tue Dec 12 08:18:28 2006
@@ -162,10 +162,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.8-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
