You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/05/10 08:03:00 UTC
svn commit: r169420 - in /incubator/beehive/trunk/netui/test/webapps:
drt/coreWeb/bugs/b38182/results.jsp drt/testRecorder/tests/B38182.xml
urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml
Author: rich
Date: Mon May 9 23:02:59 2005
New Revision: 169420
URL: http://svn.apache.org/viewcvs?rev=169420&view=rev
Log:
This is a contribution from Carlin Rogers to address http://issues.apache.org/jira/browse/BEEHIVE-614 : fix NetUI test B38182 so we don't get false failures.
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B38182.xml
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp?rev=169420&r1=169419&r2=169420&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp Mon May 9 23:02:59 2005
@@ -7,15 +7,23 @@
<body>
<h4>Request Paramaters</h4>
<p sytle="color:green">This results page will simply dump the request parameters to the page
- using a repeater. This does sometimes fail when the order is changed because we dump this
- as an unordered enumgerator of the parameter names.
+ using a repeater. To avoid false test failures, we first sort the parameter names to impose
+ order on the items within the Enumerator.
</p>
<%
- request.setAttribute("parameterNames",request.getParameterNames());
- //java.util.Enumeration e = request.getParameterNames();
- //while (e.hasMoreElements()) {
- // System.err.println("Element:" + e.nextElement());
- //}
+ //request.setAttribute("parameterNames",request.getParameterNames());
+ // not sure if this test was specific to Enumerator or not, so
+ // step through some convoluted steps to sort and get an Enumerator.
+ java.util.Enumeration e = request.getParameterNames();
+ String[] names = new String[0];
+ java.util.List list = new java.util.ArrayList();
+ while (e.hasMoreElements()) {
+ //System.err.println("Element:" + e.nextElement());
+ list.add(e.nextElement());
+ }
+ java.util.Collections.sort(list);
+ request.setAttribute("parameterNames",
+ (new java.util.Vector(list)).elements());
%>
<netui-data:repeater dataSource="requestScope.parameterNames">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B38182.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B38182.xml?rev=169420&r1=169419&r2=169420&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B38182.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B38182.xml Mon May 9 23:02:59 2005
@@ -206,14 +206,14 @@
<body>
<h4>Request Paramaters</h4>
<p sytle="color:green">This results page will simply dump the request parameters to the page
- using a repeater. This does sometimes fail when the order is changed because we dump this
- as an unordered enumgerator of the parameter names.
+ using a repeater. To avoid false test failures, we first sort the parameter names to impose
+ order on the items within the Enumerator.
</p>
- <ul><li><span>foo</span></li>
- <li><span>wlw-select_key:{actionForm.select}OldValue</span></li>
- <li><span>baz</span></li>
+ <ul><li><span>baz</span></li>
+ <li><span>foo</span></li>
<li><span>wlw-select_key:{actionForm.select}</span></li>
+ <li><span>wlw-select_key:{actionForm.select}OldValue</span></li>
</ul>
</body>
@@ -229,4 +229,4 @@
<ses:testCount>2</ses:testCount>
<ses:passedCount>1</ses:passedCount>
<ses:failedCount>1</ses:failedCount>
-</ses:recorderSession>
\ No newline at end of file
+</ses:recorderSession>
Modified: incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml?rev=169420&r1=169419&r2=169420&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/beehive-url-template-config.xml Mon May 9 23:02:59 2005
@@ -4,7 +4,7 @@
<url-template>
<name>default</name>
<value>
- {url:scheme}://{url:domain}:{url:port}/{url:prefix}/{url:path}?{url:queryString}
+ {url:scheme}://{url:domain}:{url:port}/{url:path}?{url:queryString}
</value>
</url-template>
<url-template>