Author: dolander
Date: Thu Mar 10 13:27:40 2005
New Revision: 156994
URL: http://svn.apache.org/viewcvs?view=rev&rev=156994
Log:
BVT for Jira 410
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J410.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&r1=156993&r2=156994
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Thu Mar 10 13:27:40 2005
@@ -43,17 +43,23 @@
* Netui tag that renders a tree control represented by a set of
* <code>TreeElement</code> objects.
* @jsptagref.tagdescription Renders a navigable tree of [EMAIL PROTECTED]
TreeElement}
- * tags.
+ * objects.
+ *
+ * <p>The tree is bound to a variable through the <code>tree</code> attribute.
+ * If the bound variable exists, then the body content of this tag is not
processed
+ * and the tree is rendered. If the bound variable doesn't exist, we will
process
+ * the body and create the <code>TreeElement</code> tree structure and set the
+ * the bound variable with the newly created tree.
*
* <p>This tag can automatically handle display icons for the tree nodes
* through the <code>imageRoot</code> attribute. If you point the
* <code>imageRoot</code> attribute at a folder containing appropriately
* named image files, the correct images will be used for any given state
- * of the tree's nodes. The image names should be:
+ * of the tree's nodes. The default image names are:
*
* <blockquote>
* <ul>
- * <li>folder_16_pad.gif</li>
+ * <li>folder.gif</li>
* <li>handledownlast.gif</li>
* <li>handledownmiddle.gif</li>
* <li>handlerightlast.gif</li>
@@ -64,6 +70,7 @@
* <li>spacer.gif</li>
* </ul>
* </blockquote>
+ *
* @example The following example shows a <netui:tree> tag with a set of
* children <netui:treeLabel> and <netui:treeItem> tags that form the
* tree's navigational structure. The <code>dataSource</code> attribute
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=156993&r2=156994
==============================================================================
---
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
Thu Mar 10 13:27:40 2005
@@ -4203,6 +4203,15 @@
</categories>
</test>
<test>
+ <name>J410</name>
+ <description>ScriptBlock with a couple of invalid configurations
resulting in JavaScript errors</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>jiriBugs</category>
+ </categories>
+ </test>
+ <test>
<name>JpfScopedFormsTest49</name>
<description>JpfScopedFormsTest49</description>
<webapp>coreWeb</webapp>
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J410.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J410.xml?view=auto&rev=156994
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J410.xml
(added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J410.xml
Thu Mar 10 13:27:40 2005
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>J410</ses:sessionName>
+ <ses:tester>Daryl</ses:tester>
+ <ses:startDate>10 Mar 2005, 02:03:33.809 PM MST</ses:startDate>
+ <ses:description>ScriptBlock errors when the tags are used in certain
configurations.</ses:description>
+ <ses:tests>
+ <ses:test>
+ <ses:testNumber>1</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+ <ses:uri>/coreWeb/bugs/j410/index.jsp</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>4984AE648880D536DB948FF02DC9765F</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+
<ses:value>JSESSIONID=4984AE648880D536DB948FF02DC9765F</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7.5) Gecko/20041107 Firefox/1.0</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML
4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+
+ <head>
+ <title>
+ scriptHeader tag
+ </title>
+ </head>
+<body>
+ <p style="color:green">This test will test various configurations
+ of the ScriptBlock tag. It verifies that we create valid
+ script blocks. you should see two alerts and no errors on
+ the Java Console.</p>
+
+<script language="JavaScript" type="text/JavaScript">
+<!--
+alert('alert one');
+-->
+</script>
+
+
+
+<script language="JavaScript" type="text/JavaScript">
+<!--
+
+alert('alert two');
+-->
+</script>
+
+</body>
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>10 Mar 2005, 02:03:41.891 PM MST</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file
