You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/02/22 17:53:03 UTC

[2/6] git commit: Convert the test to JUnit4

Convert the test to JUnit4


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7da82df2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7da82df2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7da82df2

Branch: refs/heads/master
Commit: 7da82df297138b630419b927a8d32d99b7f638f3
Parents: 098fed9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Feb 22 16:09:14 2012 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Feb 22 16:09:14 2012 +0100

----------------------------------------------------------------------
 .../wicket/request/cycle/UrlRendererTest.java      |   17 ++++++++++++--
 1 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7da82df2/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
index 8e30778..bf82a02 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
@@ -16,20 +16,21 @@
  */
 package org.apache.wicket.request.cycle;
 
-import junit.framework.TestCase;
-
 import org.apache.wicket.mock.MockWebRequest;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.UrlRenderer;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * @author Matej Knopp
  */
-public class UrlRendererTest extends TestCase
+public class UrlRendererTest extends Assert
 {
 	/**
 	 * 
 	 */
+	@Test
 	public void test1()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b")));
@@ -42,6 +43,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test2()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b")));
@@ -52,6 +54,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test3()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?a=b")));
@@ -61,6 +64,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test5()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url")));
@@ -70,6 +74,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test6()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url/")));
@@ -79,6 +84,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test7()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(
@@ -89,6 +95,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test8()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(
@@ -100,6 +107,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test9()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a/b/q/d/e")));
@@ -109,6 +117,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * 
 	 */
+	@Test
 	public void test10()
 	{
 		MockWebRequest request = new MockWebRequest(Url.parse("a/b/q/d/e"), "/contextPath",
@@ -134,6 +143,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * <a href="https://issues.apache.org/jira/browse/WICKET-3337">WICKET-3337</a>
 	 */
+	@Test
 	public void test11()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a")));
@@ -143,6 +153,7 @@ public class UrlRendererTest extends TestCase
 	/**
 	 * <a href="https://issues.apache.org/jira/browse/WICKET-3567">WICKET-3567</a>
 	 */
+	@Test
 	public void test12()
 	{
 		UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?0")));