Author: ekoneil
Date: Sun Apr 24 16:59:29 2005
New Revision: 164507
URL: http://svn.apache.org/viewcvs?rev=164507&view=rev
Log:
Fix for JIRA 555.
This turned out to be a particularly bad bug. The row index is used to
calculate the whether to use even or odd styles and can be used to index into
the data set with URL parameters.
The ${container.index} is now zero based and is consistent with the other
IDataAccessProvider based tags.
BB: self
DRT: NetUI pass
BVT: NetUI pass
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/containerIndex.jsp
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridContainerIndex.xml
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCustomHeaderStyle.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCustomTagAttributes.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridEmptyColumnsTag.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridEmptyStylePolicy.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFooterTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridHeaderCellDecorator.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridHeaderTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridImageAnchorColumnTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridImageColumnTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ401.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ420.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJavaScriptSmoke.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJira493.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridModelTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridNestedJSTL.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerDisable.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerExplicitHref.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerImplicitHref.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerOverride.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerRendererSmoke.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerStickyParam.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridRowGroups.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridRowGroupsEmptyStyle.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridScriptletTagFile.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSimpleSort.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridStylesFiltered.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridTemplateColumnTest.xml
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
Sun Apr 24 16:59:29 2005
@@ -31,17 +31,16 @@
private static final Logger LOGGER =
Logger.getInstance(PagedDataSet.class);
- private boolean _advancedToPage = false;
-
- private int _currentIndex = 0;
+ private boolean _completedBootstrap = false;
private int _dataSetSize = 0;
+ private int _currentIndex = -1;
private int _startWindow = -1;
private int _endWindow = -1;
+ private String _dataSource = null;
private ArrayList _list = null;
private Iterator _dataSetIterator = null;
private Object _currentItem = null;
- private String _dataSource = null;
public PagedDataSet(String dataSource, Iterator iterator) {
_dataSource = dataSource;
@@ -53,33 +52,33 @@
LOGGER.debug("iterator type: " +
_dataSetIterator.getClass().getName());
+ /* todo: would be nice to have a limit here so that this isn't needed
in order to find the end of the data set */
_list = new ArrayList();
while(_dataSetIterator.hasNext()) {
_list.add(_dataSetIterator.next());
_dataSetSize++;
- LOGGER.debug("dataSetSize: " + _dataSetSize);
}
_dataSetIterator = _list.iterator();
}
- public void createWindow(int startWindow, int endWindow) {
+ public void createWindow(int startWindow, int windowSize) {
+ /* todo: error checking */
_startWindow = startWindow;
- _endWindow = endWindow;
+ /* the size of the window is inclusive, so remove one from the total
size */
+ _endWindow = _startWindow + windowSize - 1;
}
public boolean hasNext() {
- if(!_advancedToPage && _startWindow > -1) {
- assert _currentIndex == 0;
+ if(!_completedBootstrap && _startWindow > 0) {
- while(_dataSetIterator.hasNext() && _currentIndex != _startWindow)
{
+ while(_dataSetIterator.hasNext() && (_currentIndex+1) !=
_startWindow) {
_dataSetIterator.next();
_currentIndex++;
}
- _advancedToPage = true;
+ _completedBootstrap = true;
}
else if(_endWindow > -1 && (_currentIndex >= _endWindow)) {
- LOGGER.debug("current index: " + _currentIndex + "
_endRenderWindiw: " +
- _endWindow + " end data set: " + (_currentIndex >=
_endWindow));
+ LOGGER.debug("current index: " + _currentIndex + "
_endRenderWindiw: " + _endWindow + " end data set: " + (_currentIndex >=
_endWindow));
return false;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
Sun Apr 24 16:59:29 2005
@@ -42,7 +42,6 @@
import org.apache.beehive.netui.tags.ExpressionHandling;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.tags.IBehaviorConsumer;
-import org.apache.beehive.netui.tags.databinding.repeater.Repeater;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
import org.apache.beehive.netui.tags.rendering.TableTag;
@@ -55,8 +54,8 @@
* @netui.tldx:tag whitespace="indent"
renderer="workshop.netui.jspdesigner.tldx.GridRenderer"
*/
public class DataGrid
- extends AbstractSimpleTag
- implements IDataAccessProvider, IBehaviorConsumer {
+ extends AbstractSimpleTag
+ implements IDataAccessProvider, IBehaviorConsumer {
private static final String FACET_RESOURCE = "resource";
@@ -219,7 +218,7 @@
/* todo: this needs to move into the DataGridTagModel */
PagerModel pm = _dataGridTagModel.getState().getPagerModel();
- _dataGridTagModel.getDataSet().createWindow(pm.getRow(),
pm.getRow() + pm.getPageSize());
+ _dataGridTagModel.getDataSet().createWindow(pm.getRow(),
pm.getPageSize());
/* now that the model objects have been initialized, it's time
to start rendering */
_dataGridTagModel.changeRenderState(DataGridTagModel.RENDER_STATE_START);
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/containerIndex.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/containerIndex.jsp?rev=164507&view=auto
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/containerIndex.jsp
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/containerIndex.jsp
Sun Apr 24 16:59:29 2005
@@ -0,0 +1,85 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0";
prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0";
prefix="netui-template"%>
+<netui-template:template templatePage="../site/template.jsp">
+ <netui-template:setAttribute name="title" value="Data Grid container.index
Test"/>
+ <netui-template:section name="body">
+ <p>
+ <br/>
+<%
+ pageContext.setAttribute("fiveStrings", new String[] {"zero", "one",
"two", "three", "four"});
+%>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio">
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio1">
+ <netui-data:configurePager pageSize="1"/>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio2">
+ <netui-data:configurePager pageSize="2"/>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio3">
+ <netui-data:configurePager pageSize="3"/>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio4">
+ <netui-data:configurePager pageSize="4"/>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio5">
+ <netui-data:configurePager pageSize="5"/>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.fiveStrings" name="portfolio5">
+ <netui-data:configurePager pageSize="6"/>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.index}"/>
+ <netui-data:spanCell value="${container.item}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ </p>
+ <p>
+ <table>
+ <netui-data:repeater dataSource="pageScope.fiveStrings">
+ <tr>
+ <td><netui:span value="${container.index}"/></td>
+ <td><netui:span value="${container.item}"/></td>
+ </tr>
+ </netui-data:repeater>
+ <table>
+ </p>
+ </netui-template:section>
+</netui-template:template>
Propchange:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/containerIndex.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
Sun Apr 24 16:59:29 2005
@@ -18,10 +18,10 @@
<netui-data:rows>
<netui-data:spanCell value="${container.item.symbol}"/>
<c:choose>
- <c:when test="${container.index == 1}">
+ <c:when test="${container.index == 0}">
<netui-data:spanCell value="BEA Systems"/>
</c:when>
- <c:when test="${container.index == 2}">
+ <c:when test="${container.index == 1}">
<netui-data:spanCell value="Cisco"/>
</c:when>
<c:otherwise>
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?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
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
Sun Apr 24 16:59:29 2005
@@ -2700,6 +2700,21 @@
</features>
</test>
<test>
+ <name>DataGridContainerIndex</name>
+ <description>DataGridContainerIndex</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>DataGridCSSPrefix</name>
<description>DataGridCSSPrefix</description>
<webapp>coreWeb</webapp>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml
Sun Apr 24 16:59:29 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>DataGridCSSPrefix</ses:sessionName>
<ses:tester>ekoneil</ses:tester>
- <ses:startDate>21 Feb 2005, 02:27:07.148 PM MST</ses:startDate>
+ <ses:startDate>24 Apr 2005, 04:47:56.571 PM MDT</ses:startDate>
<ses:description>ekoneil</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>F729A7431C101AA4DE3DE928CBC96828</ses:value>
+ <ses:value>540BAC00651BB89E804869735792D4BF</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +44,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=F729A7431C101AA4DE3DE928CBC96828; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=540BAC00651BB89E804869735792D4BF; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -56,7 +56,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>4d9cca5e:10236ad19f8:-7f41</ses:value>
+ <ses:value>-6dc17ca0:1037664f187:-7fe6</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -118,48 +118,48 @@
-<tr class="foo-even">
+<tr class="foo-odd">
<td class="foo"><span>BEAS</span></td>
<td class="foo"><span>14.35</span></td>
- <td class="foo"><a
href="http://www.bea.com?rowid=1&symbol=BEAS";><span>BEA Systems</span></a></td>
+ <td class="foo"><a
href="http://www.bea.com?rowid=0&symbol=BEAS";><span>BEA Systems</span></a></td>
</tr>
-<tr class="foo-odd">
+<tr class="foo-even">
<td class="foo"><span>CSCO</span></td>
<td class="foo"><span>19.42</span></td>
- <td class="foo"><a
href="http://www.cisco.com?rowid=2&symbol=CSCO";><span>Cisco
Systems</span></a></td>
+ <td class="foo"><a
href="http://www.cisco.com?rowid=1&symbol=CSCO";><span>Cisco
Systems</span></a></td>
</tr>
-<tr class="foo-even">
+<tr class="foo-odd">
<td class="foo"><span>GE</span></td>
<td class="foo"><span>59.42</span></td>
- <td class="foo"><a
href="http://www.ge.com?rowid=3&symbol=GE";><span>General
Electric</span></a></td>
+ <td class="foo"><a
href="http://www.ge.com?rowid=2&symbol=GE";><span>General
Electric</span></a></td>
</tr>
-<tr class="foo-odd">
+<tr class="foo-even">
<td class="foo"><span>RHAT</span></td>
<td class="foo"><span>18.2</span></td>
- <td class="foo"><a
href="http://www.redhat.com?rowid=4&symbol=RHAT";><span>RedHat
Systems</span></a></td>
+ <td class="foo"><a
href="http://www.redhat.com?rowid=3&symbol=RHAT";><span>RedHat
Systems</span></a></td>
</tr>
-<tr class="foo-even">
+<tr class="foo-odd">
<td class="foo"><span>YHOO</span></td>
<td class="foo"><span>48.16</span></td>
- <td class="foo"><a
href="http://www.yahoo.com?rowid=5&symbol=YHOO";><span>Yahoo Inc</span></a></td>
+ <td class="foo"><a
href="http://www.yahoo.com?rowid=4&symbol=YHOO";><span>Yahoo Inc</span></a></td>
</tr>
@@ -176,7 +176,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>21 Feb 2005, 02:27:08.350 PM MST</ses:endDate>
+ <ses:endDate>24 Apr 2005, 04:47:58.003 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>1</ses:testCount>
<ses:passedCount>0</ses:passedCount>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml
Sun Apr 24 16:59:29 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>DataGridCaptionAttributes</ses:sessionName>
<ses:tester>ekoneil</ses:tester>
- <ses:startDate>21 Feb 2005, 02:26:58.446 PM MST</ses:startDate>
+ <ses:startDate>24 Apr 2005, 04:47:46.897 PM MDT</ses:startDate>
<ses:description>ekoneil</ses:description>
<ses:tests>
<ses:test>
@@ -47,7 +47,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>4d9cca5e:10236ad19f8:-7f47</ses:value>
+ <ses:value>-6dc17ca0:1037664f187:-7fff</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -120,35 +120,35 @@
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>BEAS</span></td>
<td class="datagrid"><span>14.35</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>CSCO</span></td>
<td class="datagrid"><span>19.42</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>GE</span></td>
<td class="datagrid"><span>59.42</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>RHAT</span></td>
<td class="datagrid"><span>18.2</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>YHOO</span></td>
<td class="datagrid"><span>48.16</span></td>
@@ -194,35 +194,35 @@
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>BEAS</span></td>
<td class="datagrid"><span>14.35</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>CSCO</span></td>
<td class="datagrid"><span>19.42</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>GE</span></td>
<td class="datagrid"><span>59.42</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>RHAT</span></td>
<td class="datagrid"><span>18.2</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>YHOO</span></td>
<td class="datagrid"><span>48.16</span></td>
@@ -265,35 +265,35 @@
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>BEAS</span></td>
<td class="datagrid"><span>14.35</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>CSCO</span></td>
<td class="datagrid"><span>19.42</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>GE</span></td>
<td class="datagrid"><span>59.42</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>RHAT</span></td>
<td class="datagrid"><span>18.2</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>YHOO</span></td>
<td class="datagrid"><span>48.16</span></td>
@@ -318,7 +318,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>21 Feb 2005, 02:27:02.572 PM MST</ses:endDate>
+ <ses:endDate>24 Apr 2005, 04:47:50.593 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>1</ses:testCount>
<ses:passedCount>0</ses:passedCount>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml
Sun Apr 24 16:59:29 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>DataGridCaptionJavaScript</ses:sessionName>
<ses:tester>ekoneil</ses:tester>
- <ses:startDate>21 Feb 2005, 02:27:05.866 PM MST</ses:startDate>
+ <ses:startDate>24 Apr 2005, 04:47:53.217 PM MDT</ses:startDate>
<ses:description>ekoneil</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>F729A7431C101AA4DE3DE928CBC96828</ses:value>
+ <ses:value>540BAC00651BB89E804869735792D4BF</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +44,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=F729A7431C101AA4DE3DE928CBC96828; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=540BAC00651BB89E804869735792D4BF; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -56,7 +56,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>4d9cca5e:10236ad19f8:-7f43</ses:value>
+ <ses:value>-6dc17ca0:1037664f187:-7ffb</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -121,35 +121,35 @@
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>BEAS</span></td>
<td class="datagrid"><span>14.35</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>CSCO</span></td>
<td class="datagrid"><span>19.42</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>GE</span></td>
<td class="datagrid"><span>59.42</span></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>RHAT</span></td>
<td class="datagrid"><span>18.2</span></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>YHOO</span></td>
<td class="datagrid"><span>48.16</span></td>
@@ -177,7 +177,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>21 Feb 2005, 02:27:07.078 PM MST</ses:endDate>
+ <ses:endDate>24 Apr 2005, 04:47:54.659 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>1</ses:testCount>
<ses:passedCount>0</ses:passedCount>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml?rev=164507&r1=164506&r2=164507&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml
Sun Apr 24 16:59:29 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>DataGridCaptionTest</ses:sessionName>
<ses:tester>ekoneil</ses:tester>
- <ses:startDate>21 Feb 2005, 02:27:02.802 PM MST</ses:startDate>
+ <ses:startDate>24 Apr 2005, 04:47:50.783 PM MDT</ses:startDate>
<ses:description>ekoneil</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>F729A7431C101AA4DE3DE928CBC96828</ses:value>
+ <ses:value>540BAC00651BB89E804869735792D4BF</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +44,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=F729A7431C101AA4DE3DE928CBC96828; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=540BAC00651BB89E804869735792D4BF; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -56,7 +56,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>4d9cca5e:10236ad19f8:-7f45</ses:value>
+ <ses:value>-6dc17ca0:1037664f187:-7ffd</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -122,48 +122,48 @@
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>BEAS</span></td>
<td class="datagrid"><span>14.35</span></td>
- <td class="datagrid"><a
href="http://www.bea.com?rowid=1&symbol=BEAS";><span>BEA Systems</span></a></td>
+ <td class="datagrid"><a
href="http://www.bea.com?rowid=0&symbol=BEAS";><span>BEA Systems</span></a></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>CSCO</span></td>
<td class="datagrid"><span>19.42</span></td>
- <td class="datagrid"><a
href="http://www.cisco.com?rowid=2&symbol=CSCO";><span>Cisco
Systems</span></a></td>
+ <td class="datagrid"><a
href="http://www.cisco.com?rowid=1&symbol=CSCO";><span>Cisco
Systems</span></a></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>GE</span></td>
<td class="datagrid"><span>59.42</span></td>
- <td class="datagrid"><a
href="http://www.ge.com?rowid=3&symbol=GE";><span>General
Electric</span></a></td>
+ <td class="datagrid"><a
href="http://www.ge.com?rowid=2&symbol=GE";><span>General
Electric</span></a></td>
</tr>
-<tr class="datagrid-odd">
+<tr class="datagrid-even">
<td class="datagrid"><span>RHAT</span></td>
<td class="datagrid"><span>18.2</span></td>
- <td class="datagrid"><a
href="http://www.redhat.com?rowid=4&symbol=RHAT";><span>RedHat
Systems</span></a></td>
+ <td class="datagrid"><a
href="http://www.redhat.com?rowid=3&symbol=RHAT";><span>RedHat
Systems</span></a></td>
</tr>
-<tr class="datagrid-even">
+<tr class="datagrid-odd">
<td class="datagrid"><span>YHOO</span></td>
<td class="datagrid"><span>48.16</span></td>
- <td class="datagrid"><a
href="http://www.yahoo.com?rowid=5&symbol=YHOO";><span>Yahoo Inc</span></a></td>
+ <td class="datagrid"><a
href="http://www.yahoo.com?rowid=4&symbol=YHOO";><span>Yahoo Inc</span></a></td>
</tr>
@@ -190,7 +190,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>21 Feb 2005, 02:27:05.816 PM MST</ses:endDate>
+ <ses:endDate>24 Apr 2005, 04:47:53.176 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>1</ses:testCount>
<ses:passedCount>0</ses:passedCount>
