Repository: wicket Updated Branches: refs/heads/master ca153fd4a -> 907f891af
WICKET-5874 WicketTester TagTester does not work as expected when using non self closing tags (cherry picked from commit 7fa2d45eb74e0447950bb5e8826846069f34d204) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/907f891a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/907f891a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/907f891a Branch: refs/heads/master Commit: 907f891af1a158ef015e7fcd70e0c997b227d22a Parents: ca153fd Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Apr 7 15:22:53 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Apr 7 15:23:27 2015 +0300 ---------------------------------------------------------------------- .../org/apache/wicket/util/tester/TagTester.java | 4 ++++ .../apache/wicket/util/tester/TagTesterTest.java | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/907f891a/wicket-core/src/main/java/org/apache/wicket/util/tester/TagTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/TagTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/TagTester.java index 415117d..b5aac3e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/TagTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/TagTester.java @@ -540,6 +540,10 @@ public class TagTester { tester = new TagTester(parser, openTag, closeTag); } + else if (openTag != null) + { + tester = new TagTester(parser, openTag, openTag); + } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/wicket/blob/907f891a/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java index 8041601..f604739 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java @@ -17,9 +17,9 @@ package org.apache.wicket.util.tester; import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; import org.junit.Assert; import org.junit.Test; @@ -35,6 +35,22 @@ public class TagTesterTest extends Assert private static final String AJAX_MARKUP_1 = "<?xml version='1.0' encoding='UTF-8'?>" + "<ajax-response><component id='comp1'><![CDATA[<div class='cls' id='compId'></div>]]></component></ajax-response>"; + // WICKET-5874 + private static final String NON_CLOSED_INPUT = "<p><input wicket:id=\"wicketId\" type=\"text\"></p>"; + + /** + * https://issues.apache.org/jira/browse/WICKET-5874 + */ + @Test + public void getTagTestedForNonClosedTag() + { + TagTester tester = TagTester.createTagByAttribute(NON_CLOSED_INPUT, "wicket:id", "wicketId"); + assertThat(tester, is(notNullValue())); + + String type = tester.getAttribute("type"); + assertThat(type, is(equalTo("text"))); + } + /** * https://issues.apache.org/jira/browse/WICKET-5137 */
