Author: mgrigorov
Date: Fri Nov 11 10:09:40 2011
New Revision: 1200800
URL: http://svn.apache.org/viewvc?rev=1200800&view=rev
Log:
WICKET-3979 Upgrade Wicket's tests to JUnit4
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.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
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
Fri Nov 11 10:09:40 2011
@@ -16,38 +16,37 @@
*/
package org.apache.wicket.examples;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+
+import com.meterware.httpunit.HttpUnitOptions;
/**
* Test decorator that starts a jetty instance
*
* @author ivaynberg
*/
-public class JettyTestCaseDecorator extends TestSetup
+public class JettyTestCaseDecorator extends Assert
{
private Server server;
private String contextPath;
private String webappLocation;
/**
- * Construct.
- *
- * @param test
+ * @throws Exception
*/
- public JettyTestCaseDecorator(Test test)
+ @Before
+ public void before() throws Exception
{
- super(test);
- }
+ HttpUnitOptions.setExceptionsThrownOnScriptError(false);
+
+ System.setProperty("wicket.configuration", "deployment");
- @Override
- protected void setUp() throws Exception
- {
server = new Server();
SelectChannelConnector connector = new SelectChannelConnector();
connector.setPort(8098);
@@ -76,14 +75,16 @@ public class JettyTestCaseDecorator exte
server.setHandler(web);
server.start();
-
- super.setUp();
}
- @Override
- protected void tearDown() throws Exception
+ /**
+ * @throws Exception
+ */
+ @After
+ public void after() throws Exception
{
- super.tearDown();
+ contextPath = null;
+ webappLocation = null;
server.stop();
server.join();
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketTestCase.java
Fri Nov 11 10:09:40 2011
@@ -16,22 +16,33 @@
*/
package org.apache.wicket.examples;
-import junit.framework.TestCase;
-
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
-public abstract class WicketTestCase extends TestCase
+/**
+ *
+ */
+public abstract class WicketTestCase extends Assert
{
+ /***/
public WicketTester tester;
- @Override
- protected void setUp() throws Exception
+ /**
+ *
+ */
+ @Before
+ public void before()
{
tester = new WicketTester();
}
- @Override
- protected void tearDown() throws Exception
+ /**
+ *
+ */
+ @After
+ public void after()
{
tester.destroy();
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
Fri Nov 11 10:09:40 2011
@@ -16,11 +16,9 @@
*/
package org.apache.wicket.examples;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.After;
+import org.junit.Before;
-import com.meterware.httpunit.HttpUnitOptions;
import com.meterware.httpunit.WebConversation;
import com.meterware.httpunit.WebResponse;
@@ -31,7 +29,7 @@ import com.meterware.httpunit.WebRespons
* @author Juergen Donnerstag
* @author Martijn Dashorst
*/
-public abstract class WicketWebTestCase extends TestCase
+public abstract class WicketWebTestCase extends JettyTestCaseDecorator
{
/** The base url used to connect the conversation to */
private String baseUrl = "http://localhost:8098/";;
@@ -40,44 +38,6 @@ public abstract class WicketWebTestCase
private WebConversation conversation;
/**
- * Suite method.
- *
- * @param clazz
- * @return Test suite
- */
- public static Test suite(Class clazz)
- {
- // The javascript 'history' variable is not supported by
- // httpunit and we don't want httpunit to throw an
- // exception just because they can not handle it.
- HttpUnitOptions.setExceptionsThrownOnScriptError(false);
-
- System.setProperty("wicket.configuration", "deployment");
-
- TestSuite suite = new TestSuite();
- suite.addTestSuite(clazz);
-
- return new JettyTestCaseDecorator(suite);
- }
-
- /**
- * Constructor
- *
- * @param name
- */
- public WicketWebTestCase(String name)
- {
- super(name);
- }
-
- /**
- * Constructor
- */
- public WicketWebTestCase()
- {
- }
-
- /**
* @param base
*/
public void setBaseUrl(String base)
@@ -86,14 +46,24 @@ public abstract class WicketWebTestCase
}
/**
- * @see junit.framework.TestCase#setUp()
+ * @throws Exception
*/
@Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
+ super.before();
conversation = new WebConversation();
}
+ @Override
+ @After
+ public void after() throws Exception
+ {
+ baseUrl = null;
+ super.after();
+ }
+
protected WebResponse beginAt(String part) throws Exception
{
return conversation.getResponse(baseUrl + part);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
Fri Nov 11 10:09:40 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.ajax.prototype;
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
@@ -28,6 +29,7 @@ public class AjaxTest extends WicketTest
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
Fri Nov 11 10:09:40 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
/**
@@ -29,6 +30,7 @@ public class ComprefTest extends WicketT
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
tester.startPage(Index.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
Fri Nov 11 10:09:40 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.encodings;
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
@@ -28,6 +29,7 @@ public class EncodingTest extends Wicket
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
tester.startPage(Home.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
Fri Nov 11 10:09:40 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.forminput;
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
/**
@@ -27,6 +28,7 @@ public class FormInputTest extends Wicke
/**
* Test page.
*/
+ @Test
public void test_1()
{
tester.startPage(FormInput.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
Fri Nov 11 10:09:40 2011
@@ -21,6 +21,8 @@ import java.util.ArrayList;
import org.apache.wicket.examples.WicketTestCase;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.tester.FormTester;
+import org.junit.Before;
+import org.junit.Test;
/**
@@ -30,13 +32,10 @@ public class GuestbookTest extends Wicke
{
/**
* Sets up the test.
- *
- * @throws Exception
*/
- @Override
- public void setUp() throws Exception
+ @Before
+ public void setUp()
{
- super.setUp();
GuestBook.clear();
}
@@ -45,6 +44,7 @@ public class GuestbookTest extends Wicke
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
tester.startPage(GuestBook.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
Fri Nov 11 10:09:40 2011
@@ -16,12 +16,11 @@
*/
package org.apache.wicket.examples.hangman;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Testcase for the <code>Game</code> class.
@@ -29,24 +28,14 @@ import org.apache.wicket.util.tester.Wic
* @author Chris Turner
* @version 1.0
*/
-public class HangManTest extends TestCase
+public class HangManTest extends Assert
{
/**
- * Create the test case.
- *
- * @param message
- * The test name
- */
- public HangManTest(String message)
- {
- super(message);
- }
-
- /**
* Tests the hangman class directly for a winning game.
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
Game hangman = new Game();
@@ -119,6 +108,7 @@ public class HangManTest extends TestCas
*
* @throws Exception
*/
+ @Test
public void testHangmanLoseGame() throws Exception
{
Game hangman = new Game();
@@ -147,50 +137,62 @@ public class HangManTest extends TestCas
/**
* Tests the webapplication for a successful match.
*/
+ @Test
public void testHangmanSuccessWebGame()
{
WicketTester tester = new WicketTester(new
HangmanApplication());
-
- tester.startPage(Home.class, new PageParameters().set("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);
- tester.destroy();
+ try
+ {
+ tester.startPage(Home.class, new
PageParameters().set("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);
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
/**
* Tests the webapplication for an unsuccessful match.
*/
+ @Test
public void testHangmanFailureWebGame()
{
WicketTester tester = new WicketTester(new
HangmanApplication());
-
- tester.startPage(Home.class, new PageParameters().set("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);
- tester.destroy();
+ try
+ {
+ tester.startPage(Home.class, new
PageParameters().set("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);
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
/**
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/WordGeneratorTest.java
Fri Nov 11 10:09:40 2011
@@ -19,9 +19,8 @@ package org.apache.wicket.examples.hangm
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
-
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +39,7 @@ public class WordGeneratorTest extends W
*
* @throws Exception
*/
+ @Test
public void testWordGenerator() throws Exception
{
WordGenerator wg = new WordGenerator();
@@ -50,7 +50,7 @@ public class WordGeneratorTest extends W
{
Word word = wg.next();
log.info("Word found: " + word);
- Assert.assertFalse("Word should not be returned twice",
words.contains(word));
+ assertFalse("Word should not be returned twice",
words.contains(word));
words.add(word);
}
log.info("Second iteration...");
@@ -58,10 +58,9 @@ public class WordGeneratorTest extends W
{
Word word = wg.next();
log.info("Word found: " + word);
- Assert.assertTrue("Word " + word + " should have been
returned only once",
- words.remove(word));
+ assertTrue("Word " + word + " should have been returned
only once", words.remove(word));
}
- Assert.assertTrue("All words should have been returned twice",
words.isEmpty());
+ assertTrue("All words should have been returned twice",
words.isEmpty());
}
/**
@@ -69,9 +68,10 @@ public class WordGeneratorTest extends W
*
* @throws Exception
*/
+ @Test
public void testSuppliedWordConstructor() throws Exception
{
WordGenerator wg = new WordGenerator(new String[] { "testing"
});
- Assert.assertEquals("Word should be as expected", "testing",
wg.next().asString());
+ assertEquals("Word should be as expected", "testing",
wg.next().asString());
}
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
Fri Nov 11 10:09:40 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.helloworld;
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
@@ -28,6 +29,7 @@ public class HelloWorldTest extends Wick
*
* @throws Exception
*/
+ @Test
public void testHelloWorld() throws Exception
{
tester.startPage(HelloWorld.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
Fri Nov 11 10:09:40 2011
@@ -16,25 +16,32 @@
*/
package org.apache.wicket.examples.images;
-import junit.framework.TestCase;
-
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
*/
-public class ImagesTest extends TestCase
+public class ImagesTest extends Assert
{
/**
* Test page.
*
* @throws Exception
*/
+ @Test
public void testImages() throws Exception
{
WicketTester tester = new WicketTester(new ImagesApplication());
- tester.startPage(Home.class);
- tester.assertContains("Wicket Examples - images");
- tester.destroy();
+ try
+ {
+ tester.startPage(Home.class);
+ tester.assertContains("Wicket Examples - images");
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
Fri Nov 11 10:09:40 2011
@@ -16,36 +16,43 @@
*/
package org.apache.wicket.examples.library;
-import junit.framework.TestCase;
-
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
*/
-public class LibraryTest extends TestCase
+public class LibraryTest extends Assert
{
/**
* Test page.
*
* @throws Exception
*/
+ @Test
public void test_1() throws Exception
{
WicketTester tester = new WicketTester(new
LibraryApplication());
- tester.startPage(SignIn.class);
- tester.assertContains("Wicket Examples - library");
- tester.assertContains("Username and password are both");
+ try
+ {
+ tester.startPage(SignIn.class);
+ tester.assertContains("Wicket Examples - library");
+ tester.assertContains("Username and password are both");
- FormTester formTester =
tester.newFormTester("signInPanel:signInForm");
- formTester.setValue("username", "wicket");
- formTester.setValue("password", "wicket");
- formTester.submit();
+ FormTester formTester =
tester.newFormTester("signInPanel:signInForm");
+ formTester.setValue("username", "wicket");
+ formTester.setValue("password", "wicket");
+ formTester.submit();
- tester.assertRenderedPage(Home.class);
- tester.assertContains("Wicket Examples - library");
- tester.assertLabel("books:0:author", "Effective Java (Joshua
Bloch)");
- tester.destroy();
+ tester.assertRenderedPage(Home.class);
+ tester.assertContains("Wicket Examples - library");
+ tester.assertLabel("books:0:author", "Effective Java
(Joshua Bloch)");
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
Fri Nov 11 10:09:40 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.linkomatic;
import org.apache.wicket.examples.WicketTestCase;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
@@ -26,6 +27,7 @@ public class LinkomaticTest extends Wick
/**
* Test page.
*/
+ @Test
public void testLinkomatic()
{
tester.startPage(Home.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
Fri Nov 11 10:09:40 2011
@@ -16,42 +16,43 @@
*/
package org.apache.wicket.examples.niceurl;
-import junit.framework.TestCase;
-
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
*/
-public class NiceUrlTest extends TestCase
+public class NiceUrlTest extends Assert
{
private WicketTester tester;
/**
- * @see junit.framework.TestCase#setUp()
+ *
*/
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void before()
{
tester = new WicketTester(new NiceUrlApplication());
tester.startPage(Home.class);
}
/**
- * @see junit.framework.TestCase#tearDown()
+ *
*/
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown()
{
tester.destroy();
}
/**
* Test page.
- *
- * @throws Exception
*/
- public void testHomePage() throws Exception
+ @Test
+ public void testHomePage()
{
tester.assertContains("Wicket Examples - niceurl");
tester.assertContains("This example displays how you can work
with 'nice' urls for bookmarkable pages.");
@@ -59,10 +60,9 @@ public class NiceUrlTest extends TestCas
/**
* Test page.
- *
- * @throws Exception
*/
- public void testPage1() throws Exception
+ @Test
+ public void testPage1()
{
tester.clickLink("page1Link");
tester.assertRenderedPage(Page1.class);
@@ -72,10 +72,9 @@ public class NiceUrlTest extends TestCas
/**
* Test page.
- *
- * @throws Exception
*/
- public void testPage2() throws Exception
+ @Test
+ public void testPage2()
{
tester.clickLink("page2Link");
tester.assertRenderedPage(Page2.class);
@@ -87,10 +86,9 @@ public class NiceUrlTest extends TestCas
/**
* Test page.
- *
- * @throws Exception
*/
- public void testPage2QP() throws Exception
+ @Test
+ public void testPage2QP()
{
tester.clickLink("page2LinkQP");
tester.assertRenderedPage(Page2QP.class);
@@ -102,10 +100,9 @@ public class NiceUrlTest extends TestCas
/**
* Test page.
- *
- * @throws Exception
*/
- public void testPage3() throws Exception
+ @Test
+ public void testPage3()
{
tester.clickLink("page3Link");
tester.assertRenderedPage(org.apache.wicket.examples.niceurl.mounted.Page3.class);
@@ -115,10 +112,9 @@ public class NiceUrlTest extends TestCas
/**
* Test page.
- *
- * @throws Exception
*/
- public void testPage4() throws Exception
+ @Test
+ public void testPage4()
{
tester.clickLink("page4Link");
tester.assertRenderedPage(org.apache.wicket.examples.niceurl.mounted.Page4.class);
@@ -128,10 +124,9 @@ public class NiceUrlTest extends TestCas
/**
* Test page.
- *
- * @throws Exception
*/
- public void testPage5() throws Exception
+ @Test
+ public void testPage5()
{
tester.clickLink("page5Link");
tester.assertRenderedPage(org.apache.wicket.examples.niceurl.mounted.Page5.class);
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
Fri Nov 11 10:09:40 2011
@@ -16,38 +16,43 @@
*/
package org.apache.wicket.examples.repeater;
-import junit.framework.TestCase;
-
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Test for Repeater application
*/
-public class RepeaterTest extends TestCase
+public class RepeaterTest extends Assert
{
/**
* Test page.
- *
- * @throws Exception
*/
- public void testHelloWorld() throws Exception
+ @Test
+ public void testHelloWorld()
{
WicketTester tester = new WicketTester(new
RepeaterApplication());
- tester.startPage(Index.class);
- tester.assertContains("Wicket Examples - repeater views");
+ try
+ {
+ tester.startPage(Index.class);
+ tester.assertContains("Wicket Examples - repeater
views");
- checkPage(tester, RepeatingPage.class);
- checkPage(tester, RefreshingPage.class);
- checkPage(tester, FormPage.class);
- checkPage(tester, SimplePage.class);
- checkPage(tester, PagingPage.class);
- checkPage(tester, SortingPage.class);
- checkPage(tester, OIRPage.class);
- checkPage(tester, DataGridPage.class);
- checkPage(tester, GridViewPage.class);
-// checkPage(tester, AjaxDataTablePage.class);
- tester.destroy();
+ checkPage(tester, RepeatingPage.class);
+ checkPage(tester, RefreshingPage.class);
+ checkPage(tester, FormPage.class);
+ checkPage(tester, SimplePage.class);
+ checkPage(tester, PagingPage.class);
+ checkPage(tester, SortingPage.class);
+ checkPage(tester, OIRPage.class);
+ checkPage(tester, DataGridPage.class);
+ checkPage(tester, GridViewPage.class);
+ checkPage(tester, AjaxDataTablePage.class);
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
private void checkPage(WicketTester tester, Class<? extends WebPage>
page)
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/signin2/Signin2Test.java
Fri Nov 11 10:09:40 2011
@@ -20,69 +20,75 @@ import java.util.Collection;
import javax.servlet.http.Cookie;
-import junit.framework.TestCase;
-
import org.apache.wicket.examples.authentication2.Home;
import org.apache.wicket.examples.authentication2.SignIn2;
import org.apache.wicket.examples.authentication2.SignIn2Application;
import org.apache.wicket.examples.authentication2.SignOut;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
+import org.junit.Test;
/**
* jWebUnit test for Hello World.
*/
-public class Signin2Test extends TestCase
+public class Signin2Test extends Assert
{
/**
* Test page.
*/
+ @Test
public void testSignIn2()
{
WicketTester tester = new WicketTester(new
SignIn2Application());
+ try
+ {
+ tester.startPage(Home.class);
- tester.startPage(Home.class);
-
- tester.assertRenderedPage(SignIn2.class);
+ tester.assertRenderedPage(SignIn2.class);
- FormTester formTester =
tester.newFormTester("signInPanel:signInForm");
- formTester.setValue("username", "wicket");
- formTester.setValue("password", "wicket");
- formTester.setValue("rememberMeRow:rememberMe", "true");
- formTester.submit();
- tester.assertRenderedPage(Home.class);
-
- // a) With wicket submitting a form will result in a temporary
redirect,
- // with the redirect setting the Cookie.
- // b) jWebUnits Cookie test methods are all using the http
response
- // object only
- // c) Like a browser, jwebunit will automatically handle the
redirect
- // request
- // Hence dumpCookie will not print an Cookie and
assertCookiePresent
- // will
- // fail.
- // The only mean available is to indirectly test the cookies.
Indirectly
- // because
- // the screen flow depends on the cookies.
- // this.dumpCookies(System.err);
- // this.assertCookiePresent("signInPanel.signInForm.username");
- // this.assertCookiePresent("signInPanel.signInForm.password");
+ FormTester formTester =
tester.newFormTester("signInPanel:signInForm");
+ formTester.setValue("username", "wicket");
+ formTester.setValue("password", "wicket");
+ formTester.setValue("rememberMeRow:rememberMe", "true");
+ formTester.submit();
+ tester.assertRenderedPage(Home.class);
+
+ // a) With wicket submitting a form will result in a
temporary redirect,
+ // with the redirect setting the Cookie.
+ // b) jWebUnits Cookie test methods are all using the
http response
+ // object only
+ // c) Like a browser, jwebunit will automatically
handle the redirect
+ // request
+ // Hence dumpCookie will not print an Cookie and
assertCookiePresent
+ // will
+ // fail.
+ // The only mean available is to indirectly test the
cookies. Indirectly
+ // because
+ // the screen flow depends on the cookies.
+ // this.dumpCookies(System.err);
+ //
this.assertCookiePresent("signInPanel.signInForm.username");
+ //
this.assertCookiePresent("signInPanel.signInForm.password");
- Collection<Cookie> cookies =
tester.getLastResponse().getCookies();
- for (Cookie cookie : cookies)
- {
- if
("signInPanel.signInForm.username".equals(cookie.getName()))
+ Collection<Cookie> cookies =
tester.getLastResponse().getCookies();
+ for (Cookie cookie : cookies)
{
- assertEquals("wicket", cookie.getValue());
+ if
("signInPanel.signInForm.username".equals(cookie.getName()))
+ {
+ assertEquals("wicket",
cookie.getValue());
+ }
}
- }
- tester.startPage(SignOut.class);
- tester.assertRenderedPage(SignOut.class);
+ tester.startPage(SignOut.class);
+ tester.assertRenderedPage(SignOut.class);
- tester.startPage(Home.class);
- tester.assertRenderedPage(SignIn2.class);
- tester.destroy();
+ tester.startPage(Home.class);
+ tester.assertRenderedPage(SignIn2.class);
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
Fri Nov 11 10:09:40 2011
@@ -16,21 +16,20 @@
*/
package org.apache.wicket.examples.template;
-import junit.framework.TestCase;
-
import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Test for Template application
*/
-public class TemplateTest extends TestCase
+public class TemplateTest extends Assert
{
/**
* Test page.
- *
- * @throws Exception
*/
- public void test_1() throws Exception
+ @Test
+ public void test_1()
{
WicketTester tester = new WicketTester(new
TemplateApplication());
tester.startPage(tester.getApplication().getHomePage());
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
Fri Nov 11 10:09:40 2011
@@ -16,10 +16,7 @@
*/
package org.apache.wicket.filtertest;
-import junit.framework.Test;
-
-import org.apache.wicket.examples.JettyTestCaseDecorator;
-import org.apache.wicket.examples.WicketWebTestCase;
+import org.junit.Before;
/**
@@ -29,29 +26,22 @@ public class WithCPWithFPTest extends Wi
{
/**
- * @see junit.framework.TestCase#setUp()
+ * @throws Exception
*/
@Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
setBaseUrl("http://localhost:8098/somecontext";);
- super.setUp();
- }
- /**
- *
- * @return Test
- */
- public static Test suite()
- {
- JettyTestCaseDecorator deco =
(JettyTestCaseDecorator)WicketWebTestCase.suite(WithCPWithFPTest.class);
- deco.setContextPath("/somecontext");
+ setContextPath("/somecontext");
String basedir = System.getProperty("basedir");
String path = "";
if (basedir != null)
path = basedir + "/";
path += "src/main/testwebapp1";
- deco.setWebappLocation(path);
- return deco;
+ setWebappLocation(path);
+
+ super.before();
}
}
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java?rev=1200800&r1=1200799&r2=1200800&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
Fri Nov 11 10:09:40 2011
@@ -16,9 +16,7 @@
*/
package org.apache.wicket.filtertest;
-import junit.framework.Test;
-
-import org.apache.wicket.examples.JettyTestCaseDecorator;
+import org.junit.Before;
/**
* jWebUnit test for Hello World.
@@ -26,29 +24,23 @@ import org.apache.wicket.examples.JettyT
public class WithCPWithoutFPTest extends WithoutCPWithoutFPTest
{
/**
- * @see junit.framework.TestCase#setUp()
+ * @throws Exception
+ *
*/
@Override
- public void setUp() throws Exception
+ @Before
+ public void before() throws Exception
{
setBaseUrl("http://localhost:8098/somecontext";);
- super.setUp();
- }
- /**
- *
- * @return Test
- */
- public static Test suite()
- {
- JettyTestCaseDecorator deco =
(JettyTestCaseDecorator)suite(WithCPWithoutFPTest.class);
- deco.setContextPath("/somecontext");
+ setContextPath("/somecontext");
String basedir = System.getProperty("basedir");
String path = "";
if (basedir != null)
path = basedir + "/";
path += "src/main/testwebapp2";
- deco.setWebappLocation(path);
- return deco;
+ setWebappLocation(path);
+
+ super.before();
}
}
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=1200800&r1=1200799&r2=1200800&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
Fri Nov 11 10:09:40 2011
@@ -16,10 +16,9 @@
*/
package org.apache.wicket.filtertest;
-import junit.framework.Test;
-
-import org.apache.wicket.examples.JettyTestCaseDecorator;
import org.apache.wicket.examples.WicketWebTestCase;
+import org.junit.Before;
+import org.junit.Test;
import com.meterware.httpunit.WebResponse;
@@ -29,20 +28,26 @@ import com.meterware.httpunit.WebRespons
public class WithoutCPWithFPTest extends WicketWebTestCase
{
/**
- *
- * @return Test
+ * @throws Exception
*/
- public static Test suite()
+ @Override
+ @Before
+ public void before() throws Exception
{
- JettyTestCaseDecorator deco =
(JettyTestCaseDecorator)WicketWebTestCase.suite(WithoutCPWithFPTest.class);
- deco.setContextPath("");
- String basedir = System.getProperty("basedir");
- String path = "";
- if (basedir != null)
- path = basedir + "/";
- path += "src/main/testwebapp1";
- deco.setWebappLocation(path);
- return deco;
+ if (getContextPath() == null)
+ {
+ setContextPath("");
+ }
+ if (getWebappLocation() == null)
+ {
+ String basedir = System.getProperty("basedir");
+ String path = "";
+ if (basedir != null)
+ path = basedir + "/";
+ path += "src/main/testwebapp1";
+ setWebappLocation(path);
+ }
+ super.before();
}
/**
@@ -50,6 +55,7 @@ public class WithoutCPWithFPTest extends
*
* @throws Exception
*/
+ @Test
public void testHelloWorld() throws Exception
{
WebResponse response =
beginAt("/filtertest/hello?message=Test");
@@ -57,6 +63,10 @@ public class WithoutCPWithFPTest extends
assertEquals("Message is: 'Test'",
response.getElementWithID("message").getText());
}
+ /**
+ * @throws Exception
+ */
+ @Test
public void testWithSlash() throws Exception
{
WebResponse response =
beginAt("/filtertest/hello?message=Test%2FWith%20a%20Slash");
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=1200800&r1=1200799&r2=1200800&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
Fri Nov 11 10:09:40 2011
@@ -16,10 +16,9 @@
*/
package org.apache.wicket.filtertest;
-import junit.framework.Test;
-
-import org.apache.wicket.examples.JettyTestCaseDecorator;
import org.apache.wicket.examples.WicketWebTestCase;
+import org.junit.Before;
+import org.junit.Test;
import com.meterware.httpunit.WebResponse;
@@ -29,20 +28,26 @@ import com.meterware.httpunit.WebRespons
public class WithoutCPWithoutFPTest extends WicketWebTestCase
{
/**
- *
- * @return Test
+ * @throws Exception
*/
- public static Test suite()
+ @Override
+ @Before
+ public void before() throws Exception
{
- JettyTestCaseDecorator deco =
(JettyTestCaseDecorator)suite(WithoutCPWithoutFPTest.class);
- deco.setContextPath("");
- String basedir = System.getProperty("basedir");
- String path = "";
- if (basedir != null)
- path = basedir + "/";
- path += "src/main/testwebapp2";
- deco.setWebappLocation(path);
- return deco;
+ if (getContextPath() == null)
+ {
+ setContextPath("");
+ }
+ if (getWebappLocation() == null)
+ {
+ String basedir = System.getProperty("basedir");
+ String path = "";
+ if (basedir != null)
+ path = basedir + "/";
+ path += "src/main/testwebapp2";
+ setWebappLocation(path);
+ }
+ super.before();
}
/**
@@ -50,6 +55,7 @@ public class WithoutCPWithoutFPTest exte
*
* @throws Exception
*/
+ @Test
public void testHelloWorld() throws Exception
{
WebResponse response = beginAt("/hello?message=Test");
@@ -62,6 +68,7 @@ public class WithoutCPWithoutFPTest exte
*
* @throws Exception
*/
+ @Test
public void testWithSlash() throws Exception
{
WebResponse response =
beginAt("/hello?message=Test%2FWith%20a%20Slash");
