Author: dolander Date: Sat Jan 8 14:14:02 2005 New Revision: 124684 URL: http://svn.apache.org/viewcvs?view=rev&rev=124684 Log: Fix a bug where the non-HTML Controls didn't get added to the lookup tables.
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OnTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagSizeBinding.xml Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=124683&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Sat Jan 8 14:14:02 2005 @@ -288,8 +288,6 @@ if (_formSubmit) _form = getNearestForm(); - //HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); - //ServletContext ctxt = pageContext.getServletContext(); JavaScriptUtils jsu = getJavaScriptUtils(request); // check the parameters that the user provided Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r1=124683&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java Sat Jan 8 14:14:02 2005 @@ -487,7 +487,7 @@ // check to see if this is an instance of a HTML Control boolean ctrlState = (state instanceof AbstractHtmlControlState); - // form keeps track of this so that it can add this control to it's focus map + // form keeps track of this so that it can add this con*/trol to it's focus map if (parentForm != null && ctrlState) { parentForm.addTagID(state.id, ((AbstractHtmlControlState) state).name); } @@ -515,13 +515,12 @@ // map the tagId to the real id if (TagConfig.isDefaultJavaScript()) { String script; + String name = null; if (ctrlState) { AbstractHtmlControlState cState = (AbstractHtmlControlState) state; - script = mapTagId(id, cState.id, cState.name); - } - else { - script = mapLegacyTagId(id, state.id); + name = cState.name; } + script = mapTagId(id, state.id, name); // if we wrote out script in legacy mode, we need to make sure we preserve it. if (idScript != null) { Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml&r1=124683&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtImageButtonId.xml Sat Jan 8 14:14:02 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>CtImageButtonId</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>05 Jan 2005, 03:32:45.800 PM MST</ses:startDate> + <ses:startDate>08 Jan 2005, 12:31:03.921 PM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,11 +18,15 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> + <ses:name>---------------</ses:name> + <ses:value>------------</ses:value> + </ses:header> + <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> @@ -31,10 +35,6 @@ <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> @@ -44,7 +44,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $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>-43783df1:10144ff88e4:-7de6</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7de6</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -113,6 +113,7 @@ if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); netui_tagIdMap.textbox="textbox" +netui_tagIdMap.imageButton="imageButton" netui_tagIdMap.button="button" @@ -198,11 +199,15 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> + <ses:name>---------------</ses:name> + <ses:value>------------</ses:value> + </ses:header> + <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> @@ -211,10 +216,6 @@ <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> @@ -232,7 +233,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -244,7 +245,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7de6</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7de6</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -301,6 +302,7 @@ if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); netui_tagIdMap.textbox="textbox" +netui_tagIdMap.imageButton="imageButton" netui_tagIdMap.button="button" @@ -369,7 +371,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>05 Jan 2005, 03:32:46.411 PM MST</ses:endDate> + <ses:endDate>08 Jan 2005, 12:31:05.390 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>2</ses:testCount> <ses:passedCount>0</ses:passedCount> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml&r1=124683&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtScScopeId.xml Sat Jan 8 14:14:02 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>CtScScopeId</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>07 Jan 2005, 08:01:14.122 AM MST</ses:startDate> + <ses:startDate>08 Jan 2005, 12:31:05.453 PM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,11 +18,15 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>14592C5C06B4FD45EA5B234F4EE0D385</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> + <ses:name>---------------</ses:name> + <ses:value>------------</ses:value> + </ses:header> + <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> @@ -31,10 +35,6 @@ <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> @@ -44,7 +44,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=14592C5C06B4FD45EA5B234F4EE0D385; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $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>-a1bb3f1:1014daed030:-7de3</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7de3</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -204,6 +204,14 @@ netui_names.Results__postValue="html.Results.postValue" netui_names.Results__method="html.Results.method" + +// Build the netui_names table to map the tagId attributes +// to the real id written into the HTML +if (netui_tagIdMap == null) + var netui_tagIdMap = new Object(); +netui_tagIdMap.Results__postValue="html.Results.postValue" +netui_tagIdMap.Results__method="html.Results.method" + --> </script> @@ -239,7 +247,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>07 Jan 2005, 08:01:15.033 AM MST</ses:endDate> + <ses:endDate>08 Jan 2005, 12:31:06.625 PM MST</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/OnTest.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OnTest.xml?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OnTest.xml&r1=124683&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OnTest.xml&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OnTest.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OnTest.xml Sat Jan 8 14:14:02 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>OnTest</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>05 Jan 2005, 03:34:47.162 PM MST</ses:startDate> + <ses:startDate>08 Jan 2005, 12:34:26.781 PM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,17 +18,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7c1a</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7c14</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -292,7 +292,21 @@ <script language="JavaScript" type="text/JavaScript"> <!-- -netui_names.Godzilla="Godzilla" + +// map tagId to "real name" +if (netui_tagIdMap == null) + var netui_tagIdMap = new Object(); +netui_tagIdMap.Godzilla="Godzilla" +// lookup by tagId to "real id" +function lookupIdByTagId(id, tag) +{ + var scopeId = getScopeId(tag); + if (scopeId == "") + return netui_tagIdMap[id]; + else + return netui_tagIdMap[scopeId + "__" + id]; +} + --> </script> @@ -315,7 +329,7 @@ <script language="JavaScript" type="text/JavaScript"> <!-- -netui_names.Godzilla="Godzilla" +netui_tagIdMap.Godzilla="Godzilla" --> </script> @@ -346,7 +360,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>05 Jan 2005, 03:34:47.813 PM MST</ses:endDate> + <ses:endDate>08 Jan 2005, 12:34:27.953 PM MST</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/RtexpTagId.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml&r1=124683&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml Sat Jan 8 14:14:02 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>RtexpTagId</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>05 Jan 2005, 03:37:19.398 PM MST</ses:startDate> + <ses:startDate>08 Jan 2005, 12:38:58.781 PM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,17 +18,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7973</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7971</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -127,6 +127,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); +netui_tagIdMap.tagid3="tagid3" netui_tagIdMap.tagid1="tagid1" netui_tagIdMap.tagid2="tagid2" @@ -218,17 +219,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -252,7 +253,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -268,7 +269,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7973</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7971</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -339,6 +340,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); +netui_tagIdMap.tagid3="tagid3" netui_tagIdMap.tagid1="tagid1" netui_tagIdMap.tagid2="tagid2" @@ -409,7 +411,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>05 Jan 2005, 03:37:19.989 PM MST</ses:endDate> + <ses:endDate>08 Jan 2005, 12:39:00.234 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>2</ses:testCount> <ses:passedCount>0</ses:passedCount> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml&r1=124683&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml Sat Jan 8 14:14:02 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>TagIds</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>07 Jan 2005, 08:06:47.177 AM MST</ses:startDate> + <ses:startDate>08 Jan 2005, 12:40:08.234 PM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,17 +18,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>14592C5C06B4FD45EA5B234F4EE0D385</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=14592C5C06B4FD45EA5B234F4EE0D385; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-a1bb3f1:1014daed030:-78f6</ses:value> + <ses:value>-32a71897:10153ca7c1e:-7902</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -147,11 +147,19 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.submit="submit" netui_tagIdMap.form="form" +netui_tagIdMap.opt2="opt2" +netui_tagIdMap.opt1="opt1" netui_tagIdMap.firstName="firstName" -netui_tagIdMap.select="select" netui_tagIdMap.lastName="lastName" +netui_tagIdMap.select="select" +netui_tagIdMap.submit="submit" +netui_tagIdMap.imageButton="imageButton" +netui_tagIdMap.label="label" +netui_tagIdMap.image="image" +netui_tagIdMap.imageAnchor="imageAnchor" +netui_tagIdMap.opt3="opt3" +netui_tagIdMap.anchor="anchor" // Build the netui_names table to map the tagId attributes @@ -222,7 +230,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>07 Jan 2005, 08:06:48.259 AM MST</ses:endDate> + <ses:endDate>08 Jan 2005, 12:40:09.343 PM MST</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/TagSizeBinding.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagSizeBinding.xml?view=diff&rev=124684&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagSizeBinding.xml&r1=124683&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagSizeBinding.xml&r2=124684 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagSizeBinding.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagSizeBinding.xml Sat Jan 8 14:14:02 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>TagSizeBinding</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>05 Jan 2005, 03:37:58.774 PM MST</ses:startDate> + <ses:startDate>08 Jan 2005, 12:40:10.625 PM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,17 +18,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7900</ses:value> + <ses:value>-32a71897:10153ca7c1e:-78fe</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -111,17 +111,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -133,7 +133,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -149,7 +149,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7900</ses:value> + <ses:value>-32a71897:10153ca7c1e:-78fe</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -201,17 +201,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -223,7 +223,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -239,7 +239,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7900</ses:value> + <ses:value>-32a71897:10153ca7c1e:-78fe</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -310,6 +310,17 @@ netui_names.Option-3="Option-3" +// Build the netui_names table to map the tagId attributes +// to the real id written into the HTML +if (netui_tagIdMap == null) + var netui_tagIdMap = new Object(); +netui_tagIdMap.Option-1="Option-1" +netui_tagIdMap.Option-4="Option-4" +netui_tagIdMap.Option-2="Option-2" +netui_tagIdMap.Option-5="Option-5" +netui_tagIdMap.Option-3="Option-3" + + // **** This section contains functions typically run as events **** @@ -325,6 +336,16 @@ return netui_names[scopeId + "__" + id]; } +// lookup by tagId to "real id" +function lookupIdByTagId(id, tag) +{ + var scopeId = getScopeId(tag); + if (scopeId == "") + return netui_tagIdMap[id]; + else + return netui_tagIdMap[scopeId + "__" + id]; +} + // This method will walk the hierarchy from the pass element looking for a scopeId. // The first scopeId found will be returned or the empty string if a scopeId is not found. function getScopeId(tag) @@ -376,17 +397,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -410,7 +431,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -426,7 +447,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7900</ses:value> + <ses:value>-32a71897:10153ca7c1e:-78fe</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -498,17 +519,17 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>56BA56A09B762C1C84636272E60B0973</ses:value> + <ses:value>A40689681FEBC78DB425BAEFD773E696</ses:value> </ses:cookie> </ses:cookies> <ses:headers> <ses:header> - <ses:name>accept</ses:name> - <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> + <ses:name>---------------</ses:name> + <ses:value>----- -------- ------- --------- ----------</ses:value> </ses:header> <ses:header> - <ses:name>accept-encoding</ses:name> - <ses:value>gzip, deflate, x-gzip, compress, x-compress</ses:value> + <ses:name>accept</ses:name> + <ses:value>image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-powerpoint, application/vnd.ms-excel, application/msword, */*</ses:value> </ses:header> <ses:header> <ses:name>accept-language</ses:name> @@ -532,7 +553,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=56BA56A09B762C1C84636272E60B0973; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=A40689681FEBC78DB425BAEFD773E696; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -548,7 +569,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-43783df1:10144ff88e4:-7900</ses:value> + <ses:value>-32a71897:10153ca7c1e:-78fe</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -591,7 +612,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>05 Jan 2005, 03:38:01.418 PM MST</ses:endDate> + <ses:endDate>08 Jan 2005, 12:40:15.281 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>5</ses:testCount> <ses:passedCount>4</ses:passedCount>
