Author: lukaszlenart
Date: Wed Sep 12 19:11:29 2012
New Revision: 1384088
URL: http://svn.apache.org/viewvc?rev=1384088&view=rev
Log:
WW-3144 Adds additional test case to prove that there no problem
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-6.txt
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java?rev=1384088&r1=1384087&r2=1384088&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
Wed Sep 12 19:11:29 2012
@@ -244,18 +244,6 @@ public abstract class AbstractUITagTest
* @throws Exception if the validation failed
*/
public void verify(URL url) throws Exception {
- verify(url, null);
- }
-
- /**
- * Attempt to verify the contents of this.writer against the contents of
the URL specified. verify() performs a
- * trim on both ends
- *
- * @param url the HTML snippet that we want to validate against
- * @param excluded
- * @throws Exception if the validation failed
- */
- public void verify(URL url, String[] excluded) throws Exception {
if (url == null) {
fail("unable to verify a null URL");
} else if (this.writer == null) {
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java?rev=1384088&r1=1384087&r2=1384088&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
Wed Sep 12 19:11:29 2012
@@ -21,12 +21,12 @@
package org.apache.struts2.views.jsp.ui;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
+import java.util.HashMap;
+import java.util.Map;
+
/**
*/
@@ -152,4 +152,23 @@ public class LabelTest extends AbstractU
verify(LabelTest.class.getResource("Label-4.txt"));
}
+ public void testWithJustKeyValueFromStack() throws Exception {
+ TestAction testAction = (TestAction) action;
+ final String key = "labelKey";
+ final String value = "baz";
+
+ // put key with message in a "resource"
+ testAction.setText(key, value);
+
+ LabelTag tag = new LabelTag();
+ tag.setPageContext(pageContext);
+ tag.setKey(key);
+ tag.setTheme("simple");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(LabelTest.class.getResource("Label-6.txt"));
+ }
+
}
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-6.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-6.txt?rev=1384088&view=auto
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-6.txt
(added)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-6.txt
Wed Sep 12 19:11:29 2012
@@ -0,0 +1 @@
+<label id="labelKey">baz</label>
