You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by do...@apache.org on 2005/02/15 21:47:04 UTC

svn commit: r153956 [1/2] - in incubator/beehive/trunk/netui/test/webapps/drt: coreWeb/bugs/j297/ coreWeb/bugs/j297/Controller.jpf coreWeb/bugs/j297/Test.jsp testRecorder/config/testRecorder-tests.xml testRecorder/tests/J297.xml

Author: dolander
Date: Tue Feb 15 12:46:42 2005
New Revision: 153956

URL: http://svn.apache.org/viewcvs?view=rev&rev=153956
Log:
Add verification for Jira Bug 297


Added:
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Controller.jpf
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J297.xml
Modified:
    incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml

Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Controller.jpf
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Controller.jpf?view=auto&rev=153956
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Controller.jpf (added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Controller.jpf Tue Feb 15 12:46:42 2005
@@ -0,0 +1,106 @@
+package bugs.j297;
+
+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;
+
+@Jpf.Controller (
+)
+public class Controller extends PageFlowController
+{
+    private String _action;
+    private TreeElement _root;
+
+    public TreeElement getRoot()
+    {
+        return _root;
+    }
+    public void setRoot(TreeElement tree) 
+    {
+	_root = tree;
+    }
+    
+    public String getAction() {
+	return _action;
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward begin()
+    {
+        NameService ns = NameService.instance(getRequest().getSession());
+	ns.debugSetNameIntValue(653);
+	_action="begin";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward select()
+    {
+	_action="select";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward subTreeSelect()
+    {
+	_action="subTreeSelect";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward selectOverride()
+    {
+	_action="selectOverride";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="index", path="Test.jsp")
+        }
+    )
+    protected Forward reset()
+    {
+        _root = null;
+	_action="reset";
+        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/bugs/j297/Test.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp?view=auto&rev=153956
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp (added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp Tue Feb 15 12:46:42 2005
@@ -0,0 +1,49 @@
+<%@ 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>Verify Action Override</h4>
+<p style="color:green">Verify that the action on a treeItem
+overrides the inheritted action and is not applied to the children.
+</p>
+<netui:anchor action="reset">Reset</netui:anchor><br>
+Action: ${pageFlow.action}<br>
+<!--Begin scriptContainer-->
+<div style="border: thin solid;height: 300px;">
+<netui:scriptContainer>
+    <netui:scriptHeader/>
+    <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"
+    >
+            <netui:treeItem expanded="true">
+                <netui:treeLabel>0</netui:treeLabel>
+                <netui:treeItem expanded="true">
+                    <netui:treeLabel>0.0 [sts]</netui:treeLabel>
+                    <netui:treePropertyOverride selectionAction="subTreeSelect" />
+                    <netui:treeItem action="selectOverride" expanded="true">
+                        <netui:treeLabel>0.0.0 [O]</netui:treeLabel>
+                        <netui:treeItem icon="alien.gif">0.0.0.0 [sts]</netui:treeItem>
+                        <netui:treeItem icon="alien.gif">0.0.0.1 [sts]</netui:treeItem>
+                    </netui:treeItem>
+                </netui:treeItem>
+                <netui:treeItem expanded="true" action="selectOverride">
+                    <netui:treeLabel>0.1 [0]</netui:treeLabel>
+                    <netui:treeItem icon="cool.gif">0.1.0</netui:treeItem>
+                    <netui:treeItem icon="cool.gif">0.1.1</netui:treeItem>
+                </netui:treeItem>
+                <netui:treeItem expanded="true">0.2
+                    <netui:treeItem icon="cool.gif" action="selectOverride">0.2.0 [O]</netui:treeItem>
+                    <netui:treeItem icon="cool.gif">0.2.1</netui:treeItem>
+		</netui:treeItem>
+            </netui:treeItem>
+    </netui:tree>
+</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=153955&r2=153956
==============================================================================
--- 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 12:46:42 2005
@@ -3917,6 +3917,15 @@
          </categories>
       </test>
       <test>
+         <name>J297</name>
+         <description>Verify that Action on a treeElement only overrides that item</description>
+         <webapp>coreWeb</webapp>
+         <categories>
+            <category>bvt</category>
+            <category>jiriBugs</category>
+         </categories>
+      </test>
+      <test>
          <name>JpfScopedFormsTest49</name>
          <description>JpfScopedFormsTest49</description>
          <webapp>coreWeb</webapp>