Author: dolander
Date: Wed Mar 2 16:46:31 2005
New Revision: 155985
URL: http://svn.apache.org/viewcvs?view=rev&rev=155985
Log:
Jira 359 -- Remove the legacy <div> tag that was being generated when a idScope
was set
on the HTML tag.
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TemplateXhtml.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtCbgId.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalScopingTest2.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java?view=diff&r1=155984&r2=155985
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
Wed Mar 2 16:46:31 2005
@@ -245,9 +245,9 @@
ErrorHandling.reportCollectedErrors(pageContext, this);
// The body tag may cause the scope Div to be closed, if not we must
do it now
- if (getIdScope() != null && !_scopeEnded) {
- _writer.append("</div>");
- }
+ //if (getIdScope() != null && !_scopeEnded) {
+ // _writer.append("</div>");
+ //}
// the script can be written out by another tag, typically this would
be the <body> tag.
writeScript(_writer);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java?view=diff&r1=155984&r2=155985
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
Wed Mar 2 16:46:31 2005
@@ -381,7 +381,7 @@
}
}
- public void addParameter(String name, Object value, String facet) throws
JspException
+ public void addParameter(String name, Object value, String facet)
{
// use this to force the creation of the _info variable.
ExtendedInfo info = getInfo(this);
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java?view=diff&r1=155984&r2=155985
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
Wed Mar 2 16:46:31 2005
@@ -23,11 +23,35 @@
import org.apache.beehive.netui.util.logging.Logger;
/**
- *
+ * This class is used by NetUI tags that use parameters.
*/
public class ParamHelper
{
private static final Logger logger = Logger.getInstance(ParamHelper.class);
+
+ /**
+ * Add a new parameter or update an existing parameter's list of values.
+ * <p/>
+ * <em>Implementation Note:</em> in the case that a Map was provided for
+ * the <code>value</code> parameter, the this returns without doing
+ * anything; in any other case, params is updated (even in
+ * <code>value</code> is null).
+ * </p>
+ * <p/>
+ * If value is some object (not an array or list), the string
+ * representation of that object is added as a value for name. If the
+ * value is a list (or array) of objects, then the string representation
+ * of each element is added as a value for name. When there are multiple
+ * values for a name, then an array of Strings is used in Map.
+ * </p>
+ *
+ * @param params an existing Map of names and values to update
+ * @param name the name of the parameter to add or update
+ * @param value an item or list of items to put into the map
+ * @throws IllegalArgumentException in the case that either the params
+ * <p/>
+ * or name given was null
+ */
public static void addParam(Map params, String name, Object value)
{
@@ -94,7 +118,7 @@
else
params.put(name,"");
}
- else
+ else
params.put(name,value.toString());
return;
}
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=155984&r2=155985
==============================================================================
---
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
Wed Mar 2 16:46:31 2005
@@ -6625,6 +6625,21 @@
</features>
</test>
<test>
+ <name>TemplateXhtml</name>
+ <description>verification of XHTML inside a template</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>templates</category>
+ <category>xhtml</category>
+ </categories>
+ <features>
+ <feature>Templates</feature>
+ <feature>xhtml</feature>
+ </features>
+ </test>
+ <test>
<name>TempException</name>
<description>Throwing an exception from inside a
template</description>
<webapp>coreWeb</webapp>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtCbgId.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtCbgId.xml?view=diff&r1=155984&r2=155985
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtCbgId.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtCbgId.xml
Wed Mar 2 16:46:31 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>CtCbgId</ses:sessionName>
<ses:tester>Daryl</ses:tester>
- <ses:startDate>11 Feb 2005, 06:22:12.334 PM MST</ses:startDate>
+ <ses:startDate>02 Mar 2005, 05:26:46.878 PM MST</ses:startDate>
<ses:description>Daryl</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D816AF65DAC4C913C3202ED2A55FC180</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</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=D816AF65DAC4C913C3202ED2A55FC180; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $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>f624cb5:102041cb937:-7b85</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7dd5</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -130,7 +130,7 @@
</table>
</form>
</body>
-</div><script language="JavaScript" type="text/JavaScript">
+<script language="JavaScript" type="text/JavaScript">
<!--
// **** Start the NetUI Framework Generated JavaScript ****
@@ -219,7 +219,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D816AF65DAC4C913C3202ED2A55FC180</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -253,7 +253,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D816AF65DAC4C913C3202ED2A55FC180; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -265,7 +265,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7b85</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7dd5</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -306,7 +306,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>11 Feb 2005, 06:22:15.840 PM MST</ses:endDate>
+ <ses:endDate>02 Mar 2005, 05:26:48.370 PM MST</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>2</ses:testCount>
<ses:passedCount>1</ses:passedCount>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml?view=diff&r1=155984&r2=155985
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
Wed Mar 2 16:46:31 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>MockPortal</ses:sessionName>
<ses:tester>rich</ses:tester>
- <ses:startDate>11 Feb 2005, 06:32:36.873 PM MST</ses:startDate>
+ <ses:startDate>02 Mar 2005, 05:29:45.084 PM MST</ses:startDate>
<ses:description>rich</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</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=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $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>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -251,7 +251,7 @@
</html>]]></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>fail</ses:testStatus>
+ <ses:testStatus>pass</ses:testStatus>
</ses:testResults>
</ses:test>
<ses:test>
@@ -280,7 +280,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -314,7 +314,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -326,7 +326,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -498,7 +498,7 @@
</html>]]></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>fail</ses:testStatus>
+ <ses:testStatus>pass</ses:testStatus>
</ses:testResults>
</ses:test>
<ses:test>
@@ -527,7 +527,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -561,7 +561,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -573,7 +573,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -695,7 +695,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -721,7 +721,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -733,7 +733,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -905,7 +905,7 @@
</html>]]></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>fail</ses:testStatus>
+ <ses:testStatus>pass</ses:testStatus>
</ses:testResults>
</ses:test>
<ses:test>
@@ -930,7 +930,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -956,7 +956,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -968,7 +968,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -1016,8 +1016,8 @@
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=done&smokeTestA_submit=true">done</a>
- </body>
-
+ </div>
+</body>
</html>
@@ -1065,7 +1065,7 @@
</html>]]></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>pass</ses:testStatus>
+ <ses:testStatus>fail</ses:testStatus>
</ses:testResults>
</ses:test>
<ses:test>
@@ -1090,7 +1090,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -1116,7 +1116,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -1128,7 +1128,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -1173,8 +1173,8 @@
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=done&smokeTestA_submit=true">done</a>
- </body>
-
+ </div>
+</body>
</html>
@@ -1325,7 +1325,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>D4E953FA0410A5376F1B9E5CC645441E</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -1351,7 +1351,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=D4E953FA0410A5376F1B9E5CC645441E; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -1363,7 +1363,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>f624cb5:102041cb937:-7635</ses:value>
+ <ses:value>-11bc3486:10265cc17b1:-7b45</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -1555,13 +1555,13 @@
</html>]]></ses:responseBody>
</ses:response>
<ses:testResults>
- <ses:testStatus>fail</ses:testStatus>
+ <ses:testStatus>pass</ses:testStatus>
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>11 Feb 2005, 06:32:44.133 PM MST</ses:endDate>
+ <ses:endDate>02 Mar 2005, 05:29:47.868 PM MST</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>7</ses:testCount>
- <ses:passedCount>2</ses:passedCount>
- <ses:failedCount>5</ses:failedCount>
-</ses:recorderSession>
+ <ses:passedCount>5</ses:passedCount>
+ <ses:failedCount>2</ses:failedCount>
+</ses:recorderSession>
\ No newline at end of file
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalScopingTest2.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalScopingTest2.xml?view=diff&r1=155984&r2=155985
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalScopingTest2.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalScopingTest2.xml
Wed Mar 2 16:46:31 2005
@@ -2,8 +2,8 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>MockPortalScopingTest2</ses:sessionName>
<ses:tester>rich</ses:tester>
- <ses:startDate>27 Feb 2005, 12:30:53.882 PM MST</ses:startDate>
- <ses:description>Test of targeting a particular portlet scope from a popup
window.</ses:description>
+ <ses:startDate>02 Mar 2005, 05:29:57.141 PM MST</ses:startDate>
+ <ses:description>rich</ses:description>
<ses:tests>
<ses:test>
<ses:testNumber>1</ses:testNumber>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +44,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -55,6 +55,10 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</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>
@@ -102,7 +106,7 @@
</form>
<p>
</body>
-</div><script language="JavaScript" type="text/JavaScript">
+<script language="JavaScript" type="text/JavaScript">
<!--
// **** Start the NetUI Framework Generated JavaScript ****
@@ -211,7 +215,7 @@
</form>
<p>
</body>
-</div><script language="JavaScript" type="text/JavaScript">
+<script language="JavaScript" type="text/JavaScript">
<!--
// **** Start the NetUI Framework Generated JavaScript ****
@@ -242,6 +246,9 @@
</body>
</html>]]></ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>fail</ses:testStatus>
+ </ses:testResults>
</ses:test>
<ses:test>
<ses:testNumber>2</ses:testNumber>
@@ -269,7 +276,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -295,7 +302,7 @@
</ses:header>
<ses:header>
<ses:name>content-length</ses:name>
- <ses:value>31</ses:value>
+ <ses:value>80</ses:value>
</ses:header>
<ses:header>
<ses:name>content-type</ses:name>
@@ -303,7 +310,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -314,8 +321,8 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
- <ses:name>referer</ses:name>
-
<ses:value>http://localhost:8080/coreWeb/mockportal/scoping2/ScopedPortal.jsp</ses:value>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -367,7 +374,7 @@
<br/>
<a
href="/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletA2altAction=begin&portletA2_submit=true">go
back</a>
</body>
-</div>
+
</html>
</td></tr>
</table><br><br>
@@ -399,7 +406,7 @@
</form>
<p>
</body>
-</div><script language="JavaScript" type="text/JavaScript">
+<script language="JavaScript" type="text/JavaScript">
<!--
// **** Start the NetUI Framework Generated JavaScript ****
@@ -485,6 +492,9 @@
</body>
</html>]]></ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>fail</ses:testStatus>
+ </ses:testResults>
</ses:test>
<ses:test>
<ses:testNumber>3</ses:testNumber>
@@ -512,7 +522,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -538,7 +548,7 @@
</ses:header>
<ses:header>
<ses:name>content-length</ses:name>
- <ses:value>31</ses:value>
+ <ses:value>80</ses:value>
</ses:header>
<ses:header>
<ses:name>content-type</ses:name>
@@ -546,7 +556,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -557,8 +567,8 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
- <ses:name>referer</ses:name>
-
<ses:value>http://localhost:8080/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletA2altAction=submit&portletA2_submit=true</ses:value>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -607,7 +617,7 @@
<br/>
<a
href="/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletA2altAction=begin&portletA2_submit=true">go
back</a>
</body>
-</div>
+
</html>
</td></tr>
</table><br><br>
@@ -644,7 +654,7 @@
<br/>
<a
href="/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletB2altAction=begin&portletB2_submit=true">go
back</a>
</body>
-</div>
+
</html>
</td></tr>
</table><br><br>
@@ -656,6 +666,9 @@
</body>
</html>]]></ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>fail</ses:testStatus>
+ </ses:testResults>
</ses:test>
<ses:test>
<ses:testNumber>4</ses:testNumber>
@@ -675,7 +688,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -701,7 +714,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -712,8 +725,8 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
- <ses:name>referer</ses:name>
-
<ses:value>http://localhost:8080/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletB2altAction=submit&portletB2_submit=true</ses:value>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -819,6 +832,9 @@
</script>
</html></ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>pass</ses:testStatus>
+ </ses:testResults>
</ses:test>
<ses:test>
<ses:testNumber>5</ses:testNumber>
@@ -842,7 +858,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -868,7 +884,7 @@
</ses:header>
<ses:header>
<ses:name>content-length</ses:name>
- <ses:value>47</ses:value>
+ <ses:value>48</ses:value>
</ses:header>
<ses:header>
<ses:name>content-type</ses:name>
@@ -876,7 +892,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -887,8 +903,8 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
- <ses:name>referer</ses:name>
-
<ses:value>http://localhost:8080/coreWeb/mockportal/scoping2/launchPopUp.do?jpfScopeID=portletA2</ses:value>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -916,6 +932,9 @@
</html>]]></ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>pass</ses:testStatus>
+ </ses:testResults>
</ses:test>
<ses:test>
<ses:testNumber>6</ses:testNumber>
@@ -939,7 +958,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -965,7 +984,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -976,8 +995,8 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
- <ses:name>referer</ses:name>
-
<ses:value>http://localhost:8080/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletB2altAction=submit&portletB2_submit=true</ses:value>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -1029,7 +1048,7 @@
<br/>
<a
href="/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletA2altAction=begin&portletA2_submit=true">go
back</a>
</body>
-</div>
+
</html>
</td></tr>
</table><br><br>
@@ -1063,7 +1082,7 @@
<br/>
<a
href="/coreWeb/mockportal/scoping2/ScopedPortal.jsp?portletB2altAction=begin&portletB2_submit=true">go
back</a>
</body>
-</div>
+
</html>
</td></tr>
</table><br><br>
@@ -1075,6 +1094,9 @@
</body>
</html>]]></ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>fail</ses:testStatus>
+ </ses:testResults>
</ses:test>
<ses:test>
<ses:testNumber>7</ses:testNumber>
@@ -1089,7 +1111,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>9EB087AB2F45B3A51BA73F28068F6298</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -1115,7 +1137,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=3163E06D4A52E31CF88A568443A5C412</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=9EB087AB2F45B3A51BA73F28068F6298; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -1126,6 +1148,10 @@
<ses:value>300</ses:value>
</ses:header>
<ses:header>
+ <ses:name>testrecorder.playback.testid</ses:name>
+ <ses:value>-11bc3486:10265cc17b1:-7b29</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>
@@ -1136,8 +1162,14 @@
<ses:reason/>
<ses:responseBody>OK -- reset MockPortal</ses:responseBody>
</ses:response>
+ <ses:testResults>
+ <ses:testStatus>pass</ses:testStatus>
+ </ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>27 Feb 2005, 12:31:44.545 PM MST</ses:endDate>
+ <ses:endDate>02 Mar 2005, 05:30:00.336 PM MST</ses:endDate>
+ <ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>7</ses:testCount>
-</ses:recorderSession>
+ <ses:passedCount>3</ses:passedCount>
+ <ses:failedCount>4</ses:failedCount>
+</ses:recorderSession>
\ No newline at end of file
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TemplateXhtml.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TemplateXhtml.xml?view=auto&rev=155985
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TemplateXhtml.xml
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TemplateXhtml.xml
Wed Mar 2 16:46:31 2005
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>TemplateXhtml</ses:sessionName>
+ <ses:tester>Daryl</ses:tester>
+ <ses:startDate>23 Feb 2005, 03:05:56.553 PM MST</ses:startDate>
+ <ses:description>Verification of setting a document to XHTML inside a
template</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/template/xhtml/Controller.jpf</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>E271590DD884574DA8317B9711CEAA2B</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=E271590DD884574DA8317B9711CEAA2B</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
XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml";>
+
+ <head>
+ <title>Simple Test</title>
+ <base href="http://localhost:8080/coreWeb/template/xhtml/Test.jsp"; />
+ </head>
+ <body>
+ <h1>Simple Test</h1>
+ <p><form action="/coreWeb/template/xhtml/search.do" method="post"
style="display:inline">
+ <input type="text" name="{pageFlow.search}" />
+ <input type="submit" value="Search" />
+ </form></p>
+ <table width="100%">
+ <tr><td valign="top">
+ <div style="height="200px">
+ <h4>'left' Section</h4>
+
+ <form action="/coreWeb/template/xhtml/post.do" method="post">
+ <input type="hidden"
name="wlw-select_key:{pageFlow.selectedValue}OldValue" value="true" />
+<select name="wlw-select_key:{pageFlow.selectedValue}">
+<option value="Select One">Select One</option>
+<option value="Select Two">Select Two</option>
+<option value="Select Three">Select Three</option></select><br />
+ <input type="submit" value="submit" />
+ </form>
+
+ </div>
+ </td><td valign="top">
+ <div style="height="200px">
+ <h4>'right Section</h4>
+
+ Enter some value in the form fool....
+
+ </div>
+ </td>
+ </tr>
+ </table>
+ <hr>
+ Selected Value: <span></span>
+ </body>
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>23 Feb 2005, 03:06:08.089 PM MST</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file
