You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/16 17:53:46 UTC
svn commit: r233010 - in /beehive/trunk/netui/test/webapps/drt:
coreWeb/databinding/datagrid/bugs/ coreWeb/databinding/datagrid/misc/
testRecorder/config/ testRecorder/tests/
Author: ekoneil
Date: Tue Aug 16 08:53:40 2005
New Revision: 233010
URL: http://svn.apache.org/viewcvs?rev=233010&view=rev
Log:
Add additional tests for:
- formatting Date objects using the <netui:formatDate> tag
- using the new "value" attribute on the headerCell
BB: self
DRT: NetUI pass
BVT: NetUI pass
Added:
beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/bugs/
beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/bugs/j886.jsp
- copied, changed from r232999, beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/j348/index.jsp
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ886.xml
Modified:
beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/formatTest.jsp
beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml
Copied: beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/bugs/j886.jsp (from r232999, beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/j348/index.jsp)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/bugs/j886.jsp?p2=beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/bugs/j886.jsp&p1=beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/j348/index.jsp&r1=232999&r2=233010&rev=233010&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/j348/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/bugs/j886.jsp Tue Aug 16 08:53:40 2005
@@ -1,29 +1,24 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/sql" prefix="sql" %>
+<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %>
<netui:html>
<head>
- <title>JIRA 348</title>
+ <title>JIRA 886 -- adding a 'value' attribute to the headerCell tag</title>
</head>
+ <datagrid:portfolioXmlBean/>
<netui:body>
- <script language="JavaScript" type="text/JavaScript" src="${pageContext.request.contextPath}/resources/beehive/version1/javascript/netui-datagrid.js"></script>
- <netui:form action="begin" tagId="filterForm">
- <table>
- <tr>
- <td>Customer ID</td><td><input type="text" value="" id="customerid"/></td>
- <td>Company Name</td><td><input type="text" value="" id="companyname"/></td>
- </tr>
- <tr><td colspan="2" align="left"><netui:anchor href="index.jsp" onClick="return doNetUIFilters('filterForm', 'customers');">Search</netui:anchor></td></tr>
- </table>
- </netui:form>
- <script language="JavaScript">
- doLoadNetUIFilters('filterForm', 'customers');
- </script>
- <br/>
- <netui:anchor action="begin" value="Link with Param">
- <netui:parameter name="foo" value="bar"/>
- </netui:anchor>
+ <netui-data:dataGrid dataSource="pageScope.stocks" name="stocks">
+ <netui-data:header>
+ <netui-data:headerCell headerText="Symbol"/>
+ <netui-data:headerCell value="Price"/>
+ </netui-data:header>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.item.symbol}"/>
+ <netui-data:spanCell value="${container.item.price}">
+ <netui:formatNumber language="EN" country = "US" type="currency"/>
+ </netui-data:spanCell>
+ </netui-data:rows>
+ </netui-data:dataGrid>
</netui:body>
</netui:html>
Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/formatTest.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/formatTest.jsp?rev=233010&r1=233009&r2=233010&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/formatTest.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/formatTest.jsp Tue Aug 16 08:53:40 2005
@@ -32,6 +32,22 @@
</netui-data:footer>
</netui-data:dataGrid>
<br/>
+<%
+ java.util.Calendar c = java.util.Calendar.getInstance();
+ c.set(2002,0,17,13,30,8);
+ java.util.Date[] dates = new java.util.Date[] {c.getTime()};
+ pageContext.setAttribute("dates", dates);
+%>
+ <netui-data:dataGrid dataSource="pageScope.dates" name="stocks">
+ <netui-data:header>
+ <netui-data:headerCell value="Date"/>
+ </netui-data:header>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.item}">
+ <netui:formatDate pattern="yyyy.MM.dd"/>
+ </netui-data:spanCell>
+ </netui-data:rows>
+ </netui-data:dataGrid>
</p>
</netui-template:section>
</netui-template:template>
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=233010&r1=233009&r2=233010&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Tue Aug 16 08:53:40 2005
@@ -3055,6 +3055,21 @@
</features>
</test>
<test>
+ <name>DataGridJ886</name>
+ <description>DataGridJ886</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>databinding</category>
+ <category>datagrid</category>
+ </categories>
+ <features>
+ <feature>Databinding</feature>
+ <feature>Data Grid</feature>
+ </features>
+ </test>
+ <test>
<name>DataGridJavaScriptSmoke</name>
<description>DataGridJavaScriptSmoke</description>
<webapp>coreWeb</webapp>
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml?rev=233010&r1=233009&r2=233010&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml Tue Aug 16 08:53:40 2005
@@ -2,8 +2,8 @@
<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
<ses:sessionName>DataGridFormatTest</ses:sessionName>
<ses:tester>ekoneil</ses:tester>
- <ses:startDate>26 Apr 2005, 06:54:59.328 PM MDT</ses:startDate>
- <ses:description>ekoneil</ses:description>
+ <ses:startDate>16 Aug 2005, 09:48:28.713 AM MDT</ses:startDate>
+ <ses:description>Test of using the NetUI formatters to format data grid *Cell contents.</ses:description>
<ses:tests>
<ses:test>
<ses:testNumber>1</ses:testNumber>
@@ -18,7 +18,15 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>B03D7B9751C39776E6BE33B89A758571</ses:value>
+ <ses:value>0970261D1A6EC54EF580E5BD1A01B3D0</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>nde-textsize</ses:name>
+ <ses:value>16px</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>1t0r0ke8twn3k</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +52,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0; JSESSIONID=B03D7B9751C39776E6BE33B89A758571; $Path=/coreWeb</ses:value>
+ <ses:value>JSESSIONID=0970261D1A6EC54EF580E5BD1A01B3D0; nde-textsize=16px; JSESSIONID=1t0r0ke8twn3k</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -55,12 +63,8 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
- <ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>1be1c38c:1038123d4ed:-7fcf</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:value>Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.10) Gecko/20050720 Fedora/1.0.6-1.1.fc3 Firefox/1.0.6</ses:value>
</ses:header>
</ses:headers>
</ses:request>
@@ -173,6 +177,32 @@
<br/>
+
+ Page 1 of 1
+<table class="datagrid">
+
+
+
+
+
+<tr class="datagrid-header">
+ <th class="datagrid">Date</th>
+
+
+
+</tr>
+
+
+
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>2002.01.17</span></td>
+
+
+</tr>
+ </table>
+
+
</p>
</td></tr>
@@ -185,14 +215,8 @@
</html>]]></ses:responseBody>
</ses:response>
- <ses:testResults>
- <ses:testStatus>fail</ses:testStatus>
- </ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>26 Apr 2005, 06:54:59.438 PM MDT</ses:endDate>
- <ses:sessionStatus>fail</ses:sessionStatus>
+ <ses:endDate>16 Aug 2005, 09:48:34.194 AM MDT</ses:endDate>
<ses:testCount>1</ses:testCount>
- <ses:passedCount>0</ses:passedCount>
- <ses:failedCount>1</ses:failedCount>
</ses:recorderSession>
Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ886.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ886.xml?rev=233010&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ886.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ886.xml Tue Aug 16 08:53:40 2005
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+ <ses:sessionName>DataGridJ886</ses:sessionName>
+ <ses:tester>ekoneil</ses:tester>
+ <ses:startDate>16 Aug 2005, 09:16:25.404 AM MDT</ses:startDate>
+ <ses:description>Test of formatting an object and the use of the 'value' attribute of the headerCell tag.</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/databinding/datagrid/bugs/j886.jsp</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>7F770D4E3E5BB1302BB5CBDF125611BB</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>nde-textsize</ses:name>
+ <ses:value>16px</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>1t0r0ke8twn3k</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=7F770D4E3E5BB1302BB5CBDF125611BB; nde-textsize=16px; JSESSIONID=1t0r0ke8twn3k</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 (X11; U; Linux i686; en-US; rv:1.7.10) Gecko/20050720 Fedora/1.0.6-1.1.fc3 Firefox/1.0.6</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>JIRA 886 -- adding a 'value' attribute to the headerCell tag</title>
+ </head>
+
+
+
+
+
+
+
+ <body>
+ Page 1 of 1
+<table class="datagrid">
+
+
+
+
+
+<tr class="datagrid-header">
+ <th class="datagrid">Symbol</th>
+
+
+ <th class="datagrid">Price</th>
+
+
+
+</tr>
+
+
+
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>BEAS</span></td>
+
+ <td class="datagrid"><span>$14.35</span></td>
+
+
+</tr>
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>CSCO</span></td>
+
+ <td class="datagrid"><span>$19.42</span></td>
+
+
+</tr>
+<tr class="datagrid-even">
+ <td class="datagrid"><span>GE</span></td>
+
+ <td class="datagrid"><span>$59.42</span></td>
+
+
+</tr>
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>RHAT</span></td>
+
+ <td class="datagrid"><span>$18.20</span></td>
+
+
+</tr>
+<tr class="datagrid-even">
+ <td class="datagrid"><span>YHOO</span></td>
+
+ <td class="datagrid"><span>$48.16</span></td>
+
+
+</tr>
+ </table>
+
+
+ </body>
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>16 Aug 2005, 09:16:37.762 AM MDT</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file