You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/03/13 18:10:11 UTC
svn commit: r922615 - in /wicket/trunk:
wicket-examples/src/test/java/org/apache/wicket/filtertest/
wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/
Author: ivaynberg
Date: Sat Mar 13 17:10:11 2010
New Revision: 922615
URL: http://svn.apache.org/viewvc?rev=922615&view=rev
Log:
WICKET-2758 Patches for tests in trunk
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java?rev=922615&r1=922614&r2=922615&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java Sat Mar 13 17:10:11 2010
@@ -18,6 +18,7 @@ package org.apache.wicket.filtertest;
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
+import org.apache.wicket.ng.request.mapper.MountedMapper;
/**
* Application class.
@@ -39,7 +40,7 @@ public class Application extends WicketE
{
super.init();
- mountBookmarkablePage("/hello", HelloWorld.class);
+ getRootMapperAsCompound().add(new MountedMapper("/hello", HelloWorld.class));
}
/**
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java?rev=922615&r1=922614&r2=922615&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java Sat Mar 13 17:10:11 2010
@@ -52,14 +52,14 @@ public class WithoutCPWithFPTest extends
*/
public void testHelloWorld() throws Exception
{
- WebResponse response = beginAt("/filtertest/hello/message/Test");
+ WebResponse response = beginAt("/filtertest/hello?message=Test");
assertEquals("Wicket Examples - helloworld", response.getTitle());
assertEquals("Message is: 'Test'", response.getElementWithID("message").getText());
}
public void testWithSlash() throws Exception
{
- WebResponse response = beginAt("/filtertest/hello/message/Test%2FWith%20a%20Slash");
+ WebResponse response = beginAt("/filtertest/hello?message=Test%2FWith%20a%20Slash");
assertEquals("Wicket Examples - helloworld", response.getTitle());
assertEquals("Message is: 'Test/With a Slash'", response.getElementWithID("message")
.getText());
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java?rev=922615&r1=922614&r2=922615&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java Sat Mar 13 17:10:11 2010
@@ -52,7 +52,7 @@ public class WithoutCPWithoutFPTest exte
*/
public void testHelloWorld() throws Exception
{
- WebResponse response = beginAt("/hello/message/Test");
+ WebResponse response = beginAt("/hello?message=Test");
assertEquals("Wicket Examples - helloworld", response.getTitle());
assertEquals("Message is: 'Test'", response.getElementWithID("message").getText());
}
@@ -64,7 +64,7 @@ public class WithoutCPWithoutFPTest exte
*/
public void testWithSlash() throws Exception
{
- WebResponse response = beginAt("/hello/message/Test%2FWith%20a%20Slash");
+ WebResponse response = beginAt("/hello?message=Test%2FWith%20a%20Slash");
assertEquals("Wicket Examples - helloworld", response.getTitle());
assertEquals("Message is: 'Test/With a Slash'", response.getElementWithID("message")
.getText());
Modified: wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java?rev=922615&r1=922614&r2=922615&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java (original)
+++ wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java Sat Mar 13 17:10:11 2010
@@ -18,8 +18,6 @@ package org.apache.wicket.contrib.markup
import junit.framework.TestCase;
-import org.apache.velocity.app.Velocity;
-
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -29,18 +27,6 @@ import org.apache.wicket.util.tester.Wic
*/
public class VelocityPanelTest extends TestCase
{
- static
- {
- try
- {
- Velocity.init();
- }
- catch (Exception e)
- {
- throw new RuntimeException("Could not initialize the Velocity engine", e);
- }
- }
-
/**
* Basic test
*/