svn commit: r589234 - in /wicket/trunk/jdk-1.4/wicket/src: main/java/org/apache/wicket/util/tester/TagTester.java test/java/org/apache/wicket/util/tester/TagTesterTest.java

[fr...@apache.org]

Author: frankbille
Date: Sat Oct 27 15:52:43 2007
New Revision: 589234

URL: http://svn.apache.org/viewvc?rev=589234&view=rev
Log:
WICKET-1106: TagTester should provide access to the enclosed value of a tag

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
    wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java?rev=589234&r1=589233&r2=589234&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java Sat Oct 27 15:52:43 2007
@@ -45,7 +45,6 @@
  *  ...
  * </pre>
  * 
- * @author Frank Bille (billen)
  * @since 1.2.6
  */
 public class TagTester
@@ -321,9 +320,25 @@
 	{
 		int openPos = openTag.getPos();
 		int closePos = closeTag.getPos() + closeTag.getLength();
-		String markup = parser.getInput(openPos, closePos).toString();
+		String value = parser.getInput(openPos, closePos).toString();
 
-		return markup;
+		return value;
+	}
+
+	/**
+	 * Returns the value for this tag. This includes all data between the open tag and the close
+	 * tag.
+	 * 
+	 * @return all the data between the open tag and the close tag
+	 * @since 1.3
+	 */
+	public String getValue()
+	{
+		int openPos = openTag.getPos() + openTag.getLength();
+		int closePos = closeTag.getPos();
+		String value = parser.getInput(openPos, closePos).toString();
+
+		return value;
 	}
 
 	/**

Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java?rev=589234&r1=589233&r2=589234&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/tester/TagTesterTest.java Sat Oct 27 15:52:43 2007
@@ -20,8 +20,6 @@
 
 /**
  * Test of TagTester
- * 
- * @author Frank Bille (billen)
  */
 public class TagTesterTest extends TestCase
 {
@@ -226,5 +224,28 @@
 
 		assertFalse(tester.hasChildTag("span"));
 		assertFalse(tester.hasChildTag("p"));
+	}
+
+	/**
+	 * Test getMarkup returns the open-tag + content + close-tag
+	 */
+	public void testGetMarkup()
+	{
+		TagTester tagTester = TagTester.createTagByAttribute(MARKUP_1, "id", "test2");
+
+		assertEquals("<span class=\"class2\" id=\"test2\">mock</span>", tagTester.getMarkup());
+	}
+
+	/**
+	 * Test getValue returns the data between the open and close tag.
+	 */
+	public void testGetValue()
+	{
+		TagTester tagTester = TagTester.createTagByAttribute(MARKUP_1, "id", "test2");
+		assertEquals("mock", tagTester.getValue());
+
+		// Check that getValue also returns tags if the content of a tag is containing tags
+		TagTester tagTester2 = TagTester.createTagByAttribute(MARKUP_1, "id", "test");
+		assertEquals(tagTester.getMarkup(), tagTester2.getValue());
 	}
 }