You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/04/07 14:23:22 UTC

wicket git commit: WICKET-5874 WicketTester TagTester does not work as expected when using non self closing tags

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x c31a65f31 -> 7fa2d45eb


WICKET-5874 WicketTester TagTester does not work as expected when using non self closing tags


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7fa2d45e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7fa2d45e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7fa2d45e

Branch: refs/heads/wicket-6.x
Commit: 7fa2d45eb74e0447950bb5e8826846069f34d204
Parents: c31a65f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 7 15:22:53 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 7 15:22:53 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/7fa2d45e/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 827aabb..abd10ae 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/7fa2d45e/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
 	 */