You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/02 04:13:27 UTC
svn commit: r481496 - in /tapestry/tapestry4/trunk:
tapestry-framework/src/test/org/apache/tapestry/asset/
tapestry-framework/src/test/org/apache/tapestry/enhance/
tapestry-framework/src/test/org/apache/tapestry/html/
tapestry-framework/src/test/org/ap...
Author: jkuhnert
Date: Fri Dec 1 19:13:25 2006
New Revision: 481496
URL: http://svn.apache.org/viewvc?view=rev&rev=481496
Log:
More test case fixes to be compatible with parallel testing mode.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestImage.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebContext.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?view=diff&rev=481496&r1=481495&r2=481496
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java Fri Dec 1 19:13:25 2006
@@ -41,7 +41,7 @@
*
* @author jkuhnert
*/
-@Test
+@Test(sequential=true)
public class TestUnprotectedAsset extends BaseComponentTestCase
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java?view=diff&rev=481496&r1=481495&r2=481496
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java Fri Dec 1 19:13:25 2006
@@ -19,6 +19,7 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isNull;
+import static org.easymock.EasyMock.startsWith;
import java.lang.reflect.Modifier;
import java.util.HashMap;
@@ -215,7 +216,7 @@
int dotx = className.lastIndexOf('.');
String baseName = className.substring(dotx + 1);
- expect(factory.newClass("$" + baseName + "_97", baseClass)).andReturn(classFab);
+ expect(factory.newClass(startsWith("$" + baseName), eq(baseClass))).andReturn(classFab);
return factory;
}
@@ -276,7 +277,7 @@
ClassFactory factory = newMock(ClassFactory.class);
ClassFab classfab = newMock(ClassFab.class);
- expect(factory.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(classfab);
+ expect(factory.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(classfab);
classfab.addInterface(PageDetachListener.class);
@@ -302,7 +303,7 @@
ClassFactory factory = newMock(ClassFactory.class);
ClassFab classfab = newMock(ClassFab.class);
- expect(factory.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(classfab);
+ expect(factory.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(classfab);
classfab.addInterface(PageDetachListener.class);
@@ -423,7 +424,7 @@
ClassFactory cf = newMock(ClassFactory.class);
ClassFab fab = newMock(ClassFab.class);
- expect(cf.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(fab);
+ expect(cf.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(fab);
fab.addField("fred", String.class);
@@ -444,7 +445,7 @@
ClassFactory cf = newMock(ClassFactory.class);
ClassFab fab = newMock(ClassFab.class);
- expect(cf.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(fab);
+ expect(cf.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(fab);
// String because "FRED_VALUE" is a String
@@ -499,7 +500,7 @@
// We force the uid to 97 in setUp()
- expect(cf.newClass("$Insert_97", baseClass)).andReturn(fab);
+ expect(cf.newClass(startsWith("$Insert"), eq(baseClass))).andReturn(fab);
expect(fab.addMethod(Modifier.PUBLIC, sig, "method body")).andReturn(null);
@@ -528,7 +529,7 @@
// We force the uid to 97 in setUp()
- expect(cf.newClass("$Insert_97", baseClass)).andReturn(fab);
+ expect(cf.newClass(startsWith("$Insert"), eq(baseClass))).andReturn(fab);
expect(fab.addMethod(Modifier.PUBLIC, sig, "method body")).andReturn(null);
@@ -717,7 +718,7 @@
ClassFab fab = newMock(ClassFab.class);
- expect(cf.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(fab);
+ expect(cf.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(fab);
fab.addInterface(PageDetachListener.class);
@@ -764,7 +765,7 @@
ClassFab fab = newMock(ClassFab.class);
- expect(cf.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(fab);
+ expect(cf.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(fab);
replay();
@@ -800,7 +801,7 @@
ClassFab fab = newMock(ClassFab.class);
- expect(cf.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(fab);
+ expect(cf.newClass(startsWith("$BaseComponent"), eq(BaseComponent.class))).andReturn(fab);
replay();
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestImage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestImage.java?view=diff&rev=481496&r1=481495&r2=481496
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestImage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestImage.java Fri Dec 1 19:13:25 2006
@@ -31,7 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-@Test
+@Test(sequential=true)
public class TestImage extends BaseComponentTestCase
{
public void testRewinding()
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?view=diff&rev=481496&r1=481495&r2=481496
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java Fri Dec 1 19:13:25 2006
@@ -36,7 +36,7 @@
* @author jkuhnert
*/
@SuppressWarnings("cast")
-@Test
+@Test(sequential=true)
public class DefaultResponseBuilderTest extends BaseComponentTestCase
{
@@ -52,7 +52,7 @@
return new PrintWriter(_writer);
}
- @AfterClass
+ @AfterClass(alwaysRun=true)
protected void cleanup() throws Exception
{
_writer = null;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?view=diff&rev=481496&r1=481495&r2=481496
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Fri Dec 1 19:13:25 2006
@@ -50,7 +50,7 @@
* @author jkuhnert
*/
@SuppressWarnings("cast")
-@Test
+@Test(sequential=true)
public class DojoAjaxResponseBuilderTest extends BaseComponentTestCase
{
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebContext.java?view=diff&rev=481496&r1=481495&r2=481496
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebContext.java (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/TestPortletWebContext.java Fri Dec 1 19:13:25 2006
@@ -28,7 +28,7 @@
/**
* @author Howard M. Lewis Ship
*/
-@Test
+@Test(sequential=true)
public class TestPortletWebContext extends BasePortletWebTestCase
{