Author: dashorst
Date: Mon Nov 26 02:39:42 2007
New Revision: 598211
URL: http://svn.apache.org/viewvc?rev=598211&view=rev
Log:
Removed dependency on jwebunit
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java?rev=598211&r1=598210&r2=598211&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
Mon Nov 26 02:39:42 2007
@@ -19,9 +19,11 @@
import java.util.Iterator;
import junit.framework.Assert;
-import junit.framework.Test;
+import junit.framework.TestCase;
-import org.apache.wicket.examples.WicketWebTestCase;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.util.tester.WicketTester;
/**
* Testcase for the <code>Game</code> class.
@@ -29,18 +31,9 @@
* @author Chris Turner
* @version 1.0
*/
-public class HangManTest extends WicketWebTestCase
+public class HangManTest extends TestCase
{
/**
- *
- * @return Test
- */
- public static Test suite()
- {
- return suite(HangManTest.class);
- }
-
- /**
* Create the test case.
*
* @param message
@@ -149,39 +142,32 @@
Assert.assertTrue(hangman.isLost());
}
+ private void clickLetter(WicketTester tester, char ch)
+ {
+ tester.clickLink("letters:" + (ch - 'a') + ":letter");
+ }
+
/**
* Tests the webapplication for a successful match.
*/
public void testHangmanSuccessWebGame()
{
+ WicketTester tester = new WicketTester(new
HangmanApplication());
-
getTestContext().setBaseUrl("http://localhost:8098/wicket-examples";);
- beginAt("/hangman/?word=hangman");
-
- assertTitleEquals("Wicket Examples - hangman");
- assertLinkPresent("start");
- clickLink("start");
- assertTitleEquals("Wicket Examples - hangman");
- assertTextPresent("guesses remaining");
-
- assertElementPresent("guessesRemaining");
- assertTextInElement("guessesRemaining", "5");
-
- clickLink("letter_f");
-
- assertElementPresent("guessesRemaining");
- assertTextInElement("guessesRemaining", "4");
-
- clickLink("letter_h");
- assertElementPresent("guessesRemaining");
- assertTextInElement("guessesRemaining", "4");
-
- clickLink("letter_a");
- clickLink("letter_n");
- clickLink("letter_g");
- clickLink("letter_m");
-
- assertTextPresent("Congratulations! You guessed that the word
was ");
+ tester.startPage(Home.class, new
PageParameters("word=hangman"));
+ tester.assertComponent("start", Link.class);
+ tester.assertContains("Wicket Examples - hangman");
+ tester.clickLink("start");
+ tester.assertLabel("guessesRemaining", "5");
+ clickLetter(tester, 'f');
+ tester.assertLabel("guessesRemaining", "4");
+ clickLetter(tester, 'h');
+ tester.assertLabel("guessesRemaining", "4");
+ clickLetter(tester, 'a');
+ clickLetter(tester, 'n');
+ clickLetter(tester, 'g');
+ clickLetter(tester, 'm');
+ tester.assertRenderedPage(Win.class);
}
/**
@@ -189,37 +175,23 @@
*/
public void testHangmanFailureWebGame()
{
-
getTestContext().setBaseUrl("http://localhost:8098/wicket-examples";);
- beginAt("/hangman/?word=hangman");
-
- assertTitleEquals("Wicket Examples - hangman");
- assertLinkPresent("start");
- clickLink("start");
- assertTitleEquals("Wicket Examples - hangman");
- assertTextPresent("guesses remaining");
-
- assertElementPresent("guessesRemaining");
- assertTextInElement("guessesRemaining", "5");
-
- clickLink("letter_f");
-
- assertElementPresent("guessesRemaining");
- assertTextInElement("guessesRemaining", "4");
-
- // todo jwebunit doesn't really test if it is a link!
- // it just finds a html element by that id, and we have one
-// assertLinkNotPresent("letter_f");
- clickLink("letter_x");
- assertTextInElement("guessesRemaining", "3");
-
- clickLink("letter_e");
- assertTextInElement("guessesRemaining", "2");
-
- clickLink("letter_t");
- assertTextInElement("guessesRemaining", "1");
+ WicketTester tester = new WicketTester(new
HangmanApplication());
- clickLink("letter_v");
- assertTextPresent("Bad luck. You failed to guess that the word
was");
+ tester.startPage(Home.class, new
PageParameters("word=hangman"));
+ tester.assertComponent("start", Link.class);
+ tester.assertContains("Wicket Examples - hangman");
+ tester.clickLink("start");
+ tester.assertLabel("guessesRemaining", "5");
+ clickLetter(tester, 'f');
+ tester.assertLabel("guessesRemaining", "4");
+ clickLetter(tester, 'e');
+ tester.assertLabel("guessesRemaining", "3");
+ clickLetter(tester, 't');
+ tester.assertLabel("guessesRemaining", "2");
+ clickLetter(tester, 'x');
+ tester.assertLabel("guessesRemaining", "1");
+ clickLetter(tester, 'z');
+ tester.assertRenderedPage(Lose.class);
}
/**
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java?rev=598211&r1=598210&r2=598211&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
Mon Nov 26 02:39:42 2007
@@ -16,47 +16,26 @@
*/
package org.apache.wicket.examples.helloworld;
-import org.apache.wicket.examples.WicketWebTestCase;
+import junit.framework.TestCase;
-import junit.framework.Test;
+import org.apache.wicket.util.tester.WicketTester;
/**
* jWebUnit test for Hello World.
*/
-public class HelloWorldTest extends WicketWebTestCase
+public class HelloWorldTest extends TestCase
{
/**
- *
- * @return Test
- */
- public static Test suite()
- {
- return suite(HelloWorldTest.class);
- }
-
- /**
- * Construct.
- *
- * @param name
- * name of test
- */
- public HelloWorldTest(String name)
- {
- super(name);
- }
-
- /**
* Test page.
*
* @throws Exception
*/
public void testHelloWorld() throws Exception
{
- beginAt("/helloworld");
- assertTitleEquals("Wicket Examples - helloworld");
- // assertXPath("//SPAN", "Hello World!");
- // assertWicketIdTagText("message", "Hello World");
-
- assertTextInElement("message", "Hello World!");
+ WicketTester tester = new WicketTester();
+ tester.setupRequestAndResponse();
+ tester.startPage(HelloWorld.class);
+ tester.assertContains("Wicket Examples - helloworld");
+ tester.assertLabel("message", "Hello World!");
}
}
