Updated Branches: refs/heads/master 696c212e0 -> 2624d2db8
WICKET-4477 SmartLinkLabel escape minus in pattern Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2624d2db Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2624d2db Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2624d2db Branch: refs/heads/master Commit: 2624d2db86bb3762a1e6e51691d02127dcbf229c Parents: 696c212 Author: Sven Meier <[email protected]> Authored: Tue Mar 27 13:14:43 2012 +0200 Committer: Sven Meier <[email protected]> Committed: Tue Mar 27 13:14:43 2012 +0200 ---------------------------------------------------------------------- .../markup/html/basic/DefaultLinkParser.java | 2 +- .../markup/html/basic/DefaultLinkParserTest.java | 19 ++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2624d2db/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java index 54705e4..515bba9 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java @@ -29,7 +29,7 @@ import org.apache.wicket.util.string.AppendingStringBuffer; public class DefaultLinkParser extends LinkParser { /** Email address pattern */ - private static final String emailPattern = "[\\w\\.-\\\\+]+@[\\w\\.-]+"; + private static final String emailPattern = "[\\w\\.\\-\\\\+]+@[\\w\\.\\-]+"; /** URL pattern */ private static final String urlPattern = "([a-zA-Z]+://[\\w\\.\\-\\:\\/~]+)[\\w\\.:\\-/?&=%]*"; http://git-wip-us.apache.org/repos/asf/wicket/blob/2624d2db/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java index 992509b..c5fb083 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParserTest.java @@ -20,6 +20,8 @@ import org.junit.Assert; import org.junit.Test; /** + * Test for {@link DefaultLinkParser}. + * * @author Juergen Donnerstag */ public class DefaultLinkParserTest extends Assert @@ -76,7 +78,7 @@ public class DefaultLinkParserTest extends Assert } /** - * testEmailWithPlusChar() + * WICKET-3174 */ @Test public void testEmailWithPlusChar() @@ -89,4 +91,19 @@ public class DefaultLinkParserTest extends Assert assertEquals("Expected chars to left of + to be included in the link.", testExpectedLink, result); } + + /** + * WICKET-4477 + */ + @Test + public void testEmailWithMinusChar() + { + final String testEmailAddress = "[email protected]"; + final String testExpectedLink = "<a href=\"mailto:[email protected]\";>[email protected]</a>"; + + ILinkParser parser = new DefaultLinkParser(); + final String result = parser.parse(testEmailAddress); + assertEquals("Expected chars to left of - to be included in the link.", testExpectedLink, + result); + } }
