svn commit: r396222 - in /incubator/webwork2/action/src: main/java/org/apache/struts/action2/components/Text.java test/java/org/apache/struts/action2/views/jsp/TextTagTest.java

[tm...@apache.org]

Author: tmjee
Date: Sat Apr 22 23:45:05 2006
New Revision: 396222

URL: http://svn.apache.org/viewcvs?rev=396222&view=rev
Log:
ww-1268


Modified:
    incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Text.java
    incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java

Modified: incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Text.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Text.java?rev=396222&r1=396221&r2=396222&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Text.java (original)
+++ incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Text.java Sat Apr 22 23:45:05 2006
@@ -89,8 +89,14 @@
  * <pre>
  * <!-- START SNIPPET: i18nExample -->
  * 
+ * &lt;-- Third Example --&gt;
  * &lt;a:text name="some.key" /&gt;
  * 
+ * &lt;-- Fourth Example --&gt;
+ * &lt;a:text name="some.invalid.key" &gt;
+ *    The Default Message That Will Be Displayed
+ * &lt;/a:text&gt;
+ * 
  * <!-- END SNIPPET: i18nExample -->
  * </pre>
  * 
@@ -116,6 +122,14 @@
      */
     public void setName(String name) {
         this.name = name;
+    }
+    
+    
+    public boolean usesBody() {
+    	// overriding this to true such that EVAL_BODY_BUFFERED is return and 
+    	// bodyContent will be valid hence, text between start & end tag will
+    	// be honoured as default message (WW-1268)
+    	return true;
     }
 
     public boolean end(Writer writer, String body) {

Modified: incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java?rev=396222&r1=396221&r2=396222&view=diff
==============================================================================
--- incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java (original)
+++ incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java Sat Apr 22 23:45:05 2006
@@ -22,11 +22,18 @@
 import org.apache.struts.action2.components.Text;
 import org.apache.struts.action2.views.jsp.ui.TestAction1;
 import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent;
+
+import com.mockobjects.servlet.MockBodyContent;
+import com.mockobjects.servlet.MockJspWriter;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTag;
+import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.TagSupport;
+
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -49,6 +56,22 @@
         action.setFoo(fooValue);
 
         return action;
+    }
+    
+    public void testDefaultMessageOk() throws Exception {
+    	// NOTE:
+    	// simulate the condition
+    	// <saf:text name="some.invalid.key">My Default Message</saf:text>
+    	
+    	StrutsMockBodyContent mockBodyContent = new StrutsMockBodyContent(new MockJspWriter());
+    	mockBodyContent.setString("Sample Of Default Message");
+    	tag.setBodyContent(mockBodyContent);
+    	tag.setName("some.invalid.key.so.we.should.get.the.default.message");
+    	int startStatus = tag.doStartTag();
+    	tag.doEndTag();
+    	
+    	assertEquals(startStatus, BodyTag.EVAL_BODY_BUFFERED);
+    	assertEquals("Sample Of Default Message", writer.toString());
     }
 
     public void testExpressionsEvaluated() throws Exception {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org