WICKET-6173 WICKET-6172 makes TagTester.createTagsByAttribute stop working Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/86009a44 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/86009a44 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/86009a44
Branch: refs/heads/WICKET-6183 Commit: 86009a4436cf76b76a12e3c7f4dcb886c2041cf0 Parents: 37906ba Author: Andrea Del Bene <[email protected]> Authored: Tue May 31 22:36:59 2016 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Thu Jun 9 11:17:06 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/tester/TagTester.java | 3 ++- .../org/apache/wicket/util/tester/TagTesterTest.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/86009a44/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 e2cc83c..c6818f6 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 @@ -24,6 +24,7 @@ import java.util.regex.Pattern; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.markup.parser.XmlPullParser; import org.apache.wicket.markup.parser.XmlTag; +import org.apache.wicket.markup.parser.filter.HtmlHandler; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.value.IValueMap; @@ -671,7 +672,7 @@ public class TagTester openTag = null; closeTag = null; } - else if (openTag != null) + else if (openTag != null && !HtmlHandler.requiresCloseTag(openTag.getName())) { TagTester tester = new TagTester(parser, openTag, openTag); testers.add(tester); http://git-wip-us.apache.org/repos/asf/wicket/blob/86009a44/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 9a60a88..e7863a8 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 @@ -21,11 +21,11 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import java.util.List; + import org.junit.Assert; import org.junit.Test; -import java.util.List; - /** * Test of TagTester */ @@ -330,4 +330,14 @@ public class TagTesterTest extends Assert TagTester tagTester2 = TagTester.createTagByAttribute(MARKUP_1, "id", "test"); assertEquals(tagTester.getMarkup(), tagTester2.getValue()); } + + /** + * https://issues.apache.org/jira/browse/WICKET-6173 + */ + @Test + public void valueFromTagsByAttribute() + { + TagTester tagTester = TagTester.createTagsByAttribute(MARKUP_1, "id", "test2"); + assertEquals("mock", tagTester.getValue()); + } }
