Repository: wicket Updated Branches: refs/heads/wicket-6.x c0d2ef035 -> 9a21be2b4
Add a unit test for OpenCloseTagExpander asserting that the created closing tag has the same namespace as the openClose/original one Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9a21be2b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9a21be2b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9a21be2b Branch: refs/heads/wicket-6.x Commit: 9a21be2b443fcb5ed48fe3b3ef90ad5a32395576 Parents: c0d2ef0 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Thu Mar 13 17:39:47 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Thu Mar 13 17:39:47 2014 +0200 ---------------------------------------------------------------------- .../parser/filter/OpenCloseTagExpanderTest.java | 40 ++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9a21be2b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java index 574f8e1..85c9a6c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java @@ -25,6 +25,8 @@ import org.apache.wicket.markup.WicketTag; import org.apache.wicket.markup.parser.AbstractMarkupFilter; import org.apache.wicket.markup.parser.IMarkupFilter; import org.apache.wicket.markup.parser.XmlTag; +import org.apache.wicket.markup.resolver.HtmlHeaderResolver; +import org.hamcrest.CoreMatchers; import org.junit.Test; /** @@ -56,8 +58,8 @@ public class OpenCloseTagExpanderTest extends WicketTestCase for (String htmlVoidElement : htmlVoidElements) { - - OpenCloseTagExpander expander = new OpenCloseTagExpander() { + OpenCloseTagExpander expander = new OpenCloseTagExpander() + { @Override public IMarkupFilter getNextFilter() { @@ -97,7 +99,8 @@ public class OpenCloseTagExpanderTest extends WicketTestCase { for (String htmlNonVoidElement : OpenCloseTagExpander.REPLACE_FOR_TAGS) { - OpenCloseTagExpander expander = new OpenCloseTagExpander() { + OpenCloseTagExpander expander = new OpenCloseTagExpander() + { @Override public IMarkupFilter getNextFilter() { @@ -129,6 +132,37 @@ public class OpenCloseTagExpanderTest extends WicketTestCase } } + /** + * Verifies that the namespace of the created closing tag is the same + * as of the opening one + * + * @throws ParseException + */ + @Test + public void expandWicketTagWithSameNamespace() throws ParseException + { + final String namespace = "customNS"; + + OpenCloseTagExpander expander = new OpenCloseTagExpander() + { + @Override + protected String getWicketNamespace() + { + return namespace; + } + }; + + ComponentTag tag = new ComponentTag(HtmlHeaderResolver.HEADER_ITEMS, XmlTag.TagType.OPEN_CLOSE); + tag.setNamespace(namespace); + expander.onComponentTag(tag); + + MarkupElement markupElement = expander.nextElement(); + + assertThat(markupElement, CoreMatchers.instanceOf(WicketTag.class)); + assertTrue(markupElement.closes(tag)); + assertEquals(namespace, ((ComponentTag) markupElement).getNamespace()); + } + private static class TestMarkupElement extends WicketTag { public TestMarkupElement()
