Author: michiel
Date: 2009-11-12 12:04:09 +0100 (Thu, 12 Nov 2009)
New Revision: 39663
Added:
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/Import.java
Modified:
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/StringListTagTest.java
Log:
cleaned up a bit
Added:
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/Import.java
===================================================================
---
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/Import.java
(rev 0)
+++
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/Import.java
2009-11-12 11:04:09 UTC (rev 39663)
@@ -0,0 +1,46 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
+
+package org.mmbase.bridge.jsp.taglib;
+
+import javax.servlet.jsp.*;
+import java.util.*;
+
+/**
+ * @version $Id: StringListTagTest.java 39651 2009-11-11 18:17:50Z michiel $
+ */
+
+public class Import {
+
+
+ public static void tag(PageContext pageContext, ContextReferrerTag
context, String key, String value) throws Exception {
+ tag(pageContext, context, key, value, "string", false);
+ }
+ public static void tag(PageContext pageContext, ContextReferrerTag
context, String key, String value, boolean reset) throws Exception {
+ tag(pageContext, context, key, value, "string", reset);
+ }
+ public static void tag(PageContext pageContext, ContextReferrerTag
context, String key, String value, String type) throws Exception {
+ tag(pageContext, context, key, value, type, false);
+ }
+ public static void tag(PageContext pageContext, ContextReferrerTag
context, String key, String value, String type, boolean reset) throws Exception
{
+ WriteTag i = new WriteTag();
+ i.setPageContext(pageContext);
+ i.setParent(context);
+ i.setId(key);
+ i.setVartype(type);
+ i.setReset(reset);
+ i.setWrite("false"); // getOut not supported in MockPageContext
+ i.setValue(value);
+ i.doStartTag();
+ i.doEndTag();
+ }
+
+
+}
Modified:
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/StringListTagTest.java
===================================================================
---
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/StringListTagTest.java
2009-11-12 09:17:35 UTC (rev 39662)
+++
mmbase/trunk/applications/taglib/src/test/java/org/mmbase/bridge/jsp/taglib/StringListTagTest.java
2009-11-12 11:04:09 UTC (rev 39663)
@@ -34,28 +34,9 @@
context.setPageContext(pageContext);
context.doStartTag();
context.setId("TEST");
- {
- WriteTag i = new WriteTag();
- i.setPageContext(pageContext);
- i.setParent(context);
- i.setId("list");
- i.setVartype("list");
- i.setWrite("false"); // getOut not supported in MockPageContext
- i.setValue("A,B,C");
- i.doStartTag();
- i.doEndTag();
- }
- {
- WriteTag i = new WriteTag();
- i.setPageContext(pageContext);
- i.setParent(context);
- i.setId("foo");
- i.setWrite("false"); // getOut not supported in MockPageContext
- i.setValue("bar");
- i.doStartTag();
- i.doEndTag();
- }
+ Import.tag(pageContext, context, "list", "A,B,C", "list");
+ Import.tag(pageContext, context, "foo", "bar");
List<String> list = (List<String>) pageContext.getAttribute("list");
@@ -77,19 +58,7 @@
while (it == 2) {
tag.doInitBody();
- {
- WriteTag i = new WriteTag();
- i.setPageContext(pageContext);
- i.setParent(tag);
- assertEquals(tag, i.getContextProvider());
- i.setId("foo");
- i.setWrite("false");
- i.setValue("bla" + (++index));
- i.setReset(true);
- i.doStartTag();
- i.doAfterBody();
- i.doEndTag();
- }
+ Import.tag(pageContext, tag, "foo", "bla" + (++index), true);
assertEquals("bla" + index, pageContext.getAttribute("foo"));
assertEquals("bla" + index, context.getObject("foo"));
@@ -107,5 +76,19 @@
}
+ //@Test
+ public void nested() throws Exception {
+ final PageContext pageContext = new MockPageContext();
+
+ ContextTag context = new ContextTag();
+ context.setPageContext(pageContext);
+ context.doStartTag();
+ context.setId("TEST");
+
+
+
+ }
+
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
