You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/11/27 22:46:12 UTC
svn commit: r1039766 - in
/wicket/trunk/wicket/src/test/java/org/apache/wicket:
BehaviorRequestTest.java BehaviorUrlTest.java
Author: pedro
Date: Sat Nov 27 21:46:11 2010
New Revision: 1039766
URL: http://svn.apache.org/viewvc?rev=1039766&view=rev
Log:
code cleanup and fixing the BehaviorUrlTest#testUrlRemainsStableAfterComponentReceiveAnModel that was falling depending on the test execution order ( application object may not be setted on the ThreadLocal variable)
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java?rev=1039766&r1=1039765&r2=1039766&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java Sat Nov 27 21:46:11 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket;
-import junit.framework.TestCase;
-
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.behavior.IBehaviorListener;
@@ -30,21 +28,18 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.apache.wicket.util.tester.WicketTester;
/**
* @see https://issues.apache.org/jira/browse/WICKET-3098
*/
-public class BehaviorRequestTest extends TestCase
+public class BehaviorRequestTest extends WicketTestCase
{
- private WicketTester tester;
private TestPage page;
@Override
protected void setUp() throws Exception
{
- tester = new WicketTester();
page = new TestPage();
tester.startPage(page);
}
@@ -52,7 +47,7 @@ public class BehaviorRequestTest extends
public void testEnabledBehaviorRequest()
{
tester.executeUrl(urlForBehavior(page.enabledBehavior));
- assertTrue(page.enabledBehavior.isCalled());
+ assertTrue(page.enabledBehavior.wasCalled());
}
public void testDisabledBehaviorRequest()
@@ -64,7 +59,7 @@ public class BehaviorRequestTest extends
}
catch (ListenerInvocationNotAllowedException expected)
{
- assertTrue(!page.disabledBehavior.isCalled());
+ assertFalse(page.disabledBehavior.wasCalled());
}
}
@@ -130,7 +125,7 @@ public class BehaviorRequestTest extends
return component.isEnabledInHierarchy() && enabled;
}
- public boolean isCalled()
+ public boolean wasCalled()
{
return called;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java?rev=1039766&r1=1039765&r2=1039766&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java Sat Nov 27 21:46:11 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket;
-import junit.framework.TestCase;
-
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.behavior.IBehaviorListener;
import org.apache.wicket.markup.ComponentTag;
@@ -27,18 +25,15 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.apache.wicket.util.tester.WicketTester;
-public class BehaviorUrlTest extends TestCase
+public class BehaviorUrlTest extends WicketTestCase
{
/**
* @see https://issues.apache.org/jira/browse/WICKET-3097
*/
public void testUrlRemainsStable()
{
- WicketTester tester = new WicketTester();
-
TestPage page = new TestPage();
int indexBeforeRender = page.container.getBehaviorId(page.callbackBehavior);