Author: mgrigorov Date: Mon Oct 3 09:34:47 2011 New Revision: 1178357 URL: http://svn.apache.org/viewvc?rev=1178357&view=rev Log: WICKET-4099 SmartLinkLabel doesn't recognize already tagged links WICKET-3979 Upgrade Wicket's tests to JUnit4
Convert test to JUnit4 Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java?rev=1178357&r1=1178356&r2=1178357&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java (original) +++ wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java Mon Oct 3 09:34:47 2011 @@ -16,48 +16,48 @@ */ package org.apache.wicket.extensions.markup.html.basic; -import junit.framework.Assert; -import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Juergen Donnerstag */ -public class DefaultLinkParserTest extends TestCase +public class DefaultLinkParserTest extends Assert { /** * */ + @Test public void test1() { ILinkParser parser = new DefaultLinkParser(); - Assert.assertNull(parser.parse(null)); - Assert.assertEquals("", parser.parse("")); - Assert.assertEquals("test", parser.parse("test")); + assertNull(parser.parse(null)); + assertEquals("", parser.parse("")); + assertEquals("test", parser.parse("test")); - Assert.assertEquals("<a href=\"mailto:t...@email.com\">t...@email.com</a>", + assertEquals("<a href=\"mailto:t...@email.com\">t...@email.com</a>", parser.parse("t...@email.com")); - Assert.assertEquals("text (<a href=\"mailto:t...@email.com\">t...@email.com</a>) text", + assertEquals("text (<a href=\"mailto:t...@email.com\">t...@email.com</a>) text", parser.parse("text (t...@email.com) text")); - Assert.assertEquals("text <a href=\"mailto:t...@email.com\">t...@email.com</a> text", + assertEquals("text <a href=\"mailto:t...@email.com\">t...@email.com</a> text", parser.parse("text t...@email.com text")); - Assert.assertEquals("<a href=\"http://www.test.com\">http://www.test.com</a>", + assertEquals("<a href=\"http://www.test.com\">http://www.test.com</a>", parser.parse("http://www.test.com")); - Assert.assertEquals("text (<a href=\"http://www.test.com\">http://www.test.com</a>) text", + assertEquals("text (<a href=\"http://www.test.com\">http://www.test.com</a>) text", parser.parse("text (http://www.test.com) text")); - Assert.assertEquals("text <a href=\"http://www.test.com\">http://www.test.com</a> text", + assertEquals("text <a href=\"http://www.test.com\">http://www.test.com</a> text", parser.parse("text http://www.test.com text")); - Assert.assertEquals( - "text <a href=\"http://www.test.com:8080\">http://www.test.com:8080</a> text", + assertEquals("text <a href=\"http://www.test.com:8080\">http://www.test.com:8080</a> text", parser.parse("text http://www.test.com:8080 text")); - Assert.assertEquals( + assertEquals( "text <a href=\"http://www.test.com/test/murx.jsp\">http://www.test.com/test/murx.jsp</a> text", parser.parse("text http://www.test.com/test/murx.jsp text")); - Assert.assertEquals( + assertEquals( "text <a href=\"http://www.test.com/test/murx.jsp?query=test&q2=murx\">http://www.test.com/test/murx.jsp</a> text", parser.parse("text http://www.test.com/test/murx.jsp?query=test&q2=murx text")); - Assert.assertEquals( + assertEquals( "line 1 <a href=\"http://www.test.com/test/murx.jsp\">http://www.test.com/test/murx.jsp</a> \nline2 <a href=\"mailto:m...@email.de\">m...@email.de</a> \r\nline3", parser.parse("line 1 http://www.test.com/test/murx.jsp \nline2 m...@email.de \r\nline3")); } @@ -65,6 +65,7 @@ public class DefaultLinkParserTest exten /** * testEmailWithPlusChar() */ + @Test public void testEmailWithPlusChar() { final String testEmailAddress = "my+t...@example.com"; @@ -72,7 +73,7 @@ public class DefaultLinkParserTest exten ILinkParser parser = new DefaultLinkParser(); final String result = parser.parse(testEmailAddress); - Assert.assertEquals("Expected chars to left of + to be included in the link.", - testExpectedLink, result); + assertEquals("Expected chars to left of + to be included in the link.", testExpectedLink, + result); } }