Author: dolander
Date: Tue Feb 15 10:38:55 2005
New Revision: 153946
URL: http://svn.apache.org/viewcvs?view=rev&rev=153946
Log:
Add BVT results for runAtClient trees that support the
non-default images. TreeImage is a single tree with it's
own images. TreeImage2 is the same as TreeImage except there
is an additional tree (two trees on the page) using the
default images.
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeImage.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeImage2.xml
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Controller.jpf?view=auto&rev=153946
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Controller.jpf
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Controller.jpf
Tue Feb 15 10:38:55 2005
@@ -0,0 +1,80 @@
+package tree.images2;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.tags.tree.ITreeRootElement;
+import org.apache.beehive.netui.tags.tree.TreeElement;
+import org.apache.beehive.netui.tags.tree.TreeRenderState;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpSession;
+import org.apache.beehive.netui.pageflow.Forward;
+
[EMAIL PROTECTED] (
+ simpleActions = {
+ @Jpf.SimpleAction(name = "select", path = "Test.jsp")
+ }
+)
+public class Controller extends PageFlowController
+{
+ private TreeElement _root;
+ private TreeElement _tree;
+
+ public TreeElement getRoot()
+ {
+ return _root;
+ }
+ public void setRoot(TreeElement tree)
+ {
+ _root = tree;
+ }
+
+ public TreeElement getTree()
+ {
+ return _tree;
+ }
+ public void setTree(TreeElement tree)
+ {
+ _tree = tree;
+ }
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="index", path="Test.jsp")
+ }
+ )
+ protected Forward begin()
+ {
+ NameService ns = NameService.instance(getRequest().getSession());
+ ns.debugSetNameIntValue(941);
+ return new Forward("index");
+ }
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="index", path="Test.jsp")
+ }
+ )
+ protected Forward reset()
+ {
+ _root = null;
+ _tree = null;
+ return new Forward("index");
+ }
+
+ /**
+ * Callback that is invoked when this controller instance is created.
+ */
+ protected void onCreate()
+ {
+ }
+
+ /**
+ * Callback that is invoked when this controller instance is destroyed.
+ */
+ protected void onDestroy(HttpSession session)
+ {
+ }
+}
+
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp?view=auto&rev=153946
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp
Tue Feb 15 10:38:55 2005
@@ -0,0 +1,86 @@
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<netui:html>
+<head>
+ <title>Dynamic Tree with RunAtClient and ExpandOnClient
+ </title>
+</head>
+<netui:body>
+<h4>Dynamic Tree with RunAtClient and ExpandOnClient</h4>
+<p style="color:green">This test creates a dynamic tree that is both
runAtClient and expandOnServer. The
+children are created during the onExpand method.</p>
+<netui:anchor action="reset">Reset</netui:anchor>
+<!--Begin scriptContainer-->
+<div style="border: thin solid;height: 300px;">
+<netui:scriptContainer>
+ <netui:scriptHeader/>
+<table width="100%">
+<tr><td width="50%" valign="top">
+ <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
+ selectionAction="select" tagId="tree" runAtClient="true"
+ selectionStyle="background-color: #FFD185; font-color: #FFFFFF;
text-decoration: none;"
+ unselectStyle="text-decoration: none"
+ imageRoot="/coreWeb/tree/images"
+ imageHandleRightLast="plusbottom.gif"
+ imageHandleRightMiddle="plus.gif"
+ imageHandleDownLast="minusbottom.gif"
+ imageHandleDownMiddle="minus.gif"
+ imageLineMiddle="join.gif"
+ imageLineVertical="line.gif"
+ imageLineLast="joinbottom.gif"
+ defaultIcon="folder.gif"
+ >
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0</netui:treeLabel>
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0.0</netui:treeLabel>
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0.0.0</netui:treeLabel>
+ <netui:treeItem icon="alien.gif"
action="select">0.0.0.0</netui:treeItem>
+ <netui:treeItem icon="alien.gif"
action="select">0.0.0.1</netui:treeItem>
+ </netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0.1</netui:treeLabel>
+ <netui:treeItem icon="cool.gif"
action="select">0.1.0</netui:treeItem>
+ <netui:treeItem icon="cool.gif"
action="select">0.1.1</netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="select">0.2
+ <netui:treeItem icon="cool.gif"
action="select">0.2.0</netui:treeItem>
+ <netui:treeItem icon="cool.gif"
action="select">0.2.1</netui:treeItem>
+ </netui:treeItem>
+ </netui:treeItem>
+ </netui:tree>
+</td><td width="50%" valign="top">
+ <netui:tree dataSource="pageFlow.tree" escapeForHtml="true"
+ selectionAction="select" tagId="tree2" runAtClient="true"
+ selectionStyle="background-color: #FFD185; font-color: #FFFFFF;
text-decoration: none;"
+ unselectStyle="text-decoration: none"
+ >
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0</netui:treeLabel>
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0.0</netui:treeLabel>
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0.0.0</netui:treeLabel>
+ <netui:treeItem icon="alien.gif"
action="select">0.0.0.0</netui:treeItem>
+ <netui:treeItem icon="alien.gif"
action="select">0.0.0.1</netui:treeItem>
+ </netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="select">
+ <netui:treeLabel>0.1</netui:treeLabel>
+ <netui:treeItem icon="cool.gif"
action="select">0.1.0</netui:treeItem>
+ <netui:treeItem icon="cool.gif"
action="select">0.1.1</netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="select">0.2
+ <netui:treeItem icon="cool.gif"
action="select">0.2.0</netui:treeItem>
+ <netui:treeItem icon="cool.gif"
action="select">0.2.1</netui:treeItem>
+ </netui:treeItem>
+ </netui:treeItem>
+ </netui:tree>
+</td></tr>
+</table>
+</netui:scriptContainer>
+</div>
+<!--End scriptContainer-->
+ </netui:body>
+</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&r1=153945&r2=153946
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Tue Feb 15 10:38:55 2005
@@ -6574,6 +6574,34 @@
</features>
</test>
<test>
+ <name>TreeImage</name>
+ <description>runAtClient tree with different images</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>trees</category>
+ </categories>
+ <features>
+ <feature>Tree</feature>
+ <feature>runAtClient</feature>
+ </features>
+ </test>
+ <test>
+ <name>TreeImage2</name>
+ <description>two runAtClient tree with different images</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>trees</category>
+ </categories>
+ <features>
+ <feature>Tree</feature>
+ <feature>runAtClient</feature>
+ </features>
+ </test>
+ <test>
<name>TreeMultiAttr1</name>
<description>Basic verification that setting multiple attribute with
the treeHtmlAttribute</description>
<webapp>coreWeb</webapp>
