Browse Source

fixed test suite

svn path=/trunk/mcs/; revision=83070
Igor Zelmanovich 18 years ago
parent
commit
a1de5be007
15 changed files with 155 additions and 123 deletions
  1. 11 6
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.CultureInfo.CurrentCulture.dateTimeFormat/Default.html
  2. 11 6
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.CultureInfo.CurrentCulture.numberFormat/Default.html
  3. 84 84
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Debug/Default.html
  4. 0 5
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.CallWebServiceMethods/CallWebServiceMethods.html
  5. 1 1
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.ConnectingEndPoints/ConnectingEndPoints.html
  6. 1 1
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.XmlHttpExecutor/XmlHttpExecutor.html
  7. 7 7
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.UI.DomEvent/default.html
  8. 7 7
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.UI.DomEvent2/default.html
  9. 3 0
      mcs/class/System.Web.Extensions/Test/AUT/Sys.CultureInfo.CurrentCulture.dateTimeFormat/default.aspx
  10. 3 0
      mcs/class/System.Web.Extensions/Test/AUT/Sys.CultureInfo.CurrentCulture.numberFormat/default.aspx
  11. 1 1
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.CallWebServiceMethods/CallWebServiceMethods.aspx
  12. 1 2
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.ConnectingEndPoints/getTarget.htm
  13. 3 2
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.XmlHttpExecutor/XmlHttpExecutor.js
  14. 20 0
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.XmlHttpExecutor/getTarget.aspx
  15. 2 1
      mcs/class/System.Web.Extensions/Test/AUT/SystemWebExtensionsAUT.JavaEE.csproj

+ 11 - 6
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.CultureInfo.CurrentCulture.dateTimeFormat/Default.html

@@ -14,9 +14,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertText</td>
-	<td>//table/</td>
-	<td>FormatTypeFormatValueCulture Name: en-USAMDesignatorAMCalendar[object Object]DateSeparator/FirstDayOfWeek0CalendarWeekRule0FullDateTimePatterndddd, MMMM dd, yyyy h:mm:ss ttLongDatePatterndddd, MMMM dd, yyyyLongTimePatternh:mm:ss ttMonthDayPatternMMMM ddPMDesignatorPMRFC1123Patternddd, dd MMM yyyy HH':'mm':'ss 'GMT'ShortDatePatternM/d/yyyyShortTimePatternh:mm ttSortableDateTimePatternyyyy'-'MM'-'dd'T'HH':'mm':'ssTimeSeparator:UniversalSortableDateTimePatternyyyy'-'MM'-'dd HH':'mm':'ss'Z'YearMonthPatternMMMM, yyyyAbbreviatedDayNamesSun,Mon,Tue,Wed,Thu,Fri,SatShortestDayNamesSu,Mo,Tu,We,Th,Fr,SaDayNamesSunday,Monday,Tuesday,Wednesday,Thursday,Friday,SaturdayAbbreviatedMonthNamesJan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec,MonthNamesJanuary,February,March,April,May,June,July,August,September,October,November,December,IsReadOnlyfalseNativeCalendarNameGregorian CalendarAbbreviatedMonthGenitiveNamesJan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec,MonthGenitiveNamesJanuary,February,March,April,May,June,July,August,September,October,November,December,</td>
+	<td>verifyValue</td>
+	<td>TextBox</td>
+	<td>Culture Name: en-US FullDateTimePattern: dddd, MMMM dd, yyyy h:mm:ss tt</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -24,9 +24,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertText</td>
-	<td>//table/</td>
-	<td>FormatTypeFormatValueCulture Name: he-ILAMDesignatorAMCalendar[object Object]DateSeparator/FirstDayOfWeek0CalendarWeekRule0FullDateTimePatterndddd dd MMMM yyyy HH:mm:ssLongDatePatterndddd dd MMMM yyyyLongTimePatternHH:mm:ssMonthDayPatterndd MMMMPMDesignatorPMRFC1123Patternddd, dd MMM yyyy HH':'mm':'ss 'GMT'ShortDatePatterndd/MM/yyyyShortTimePatternHH:mmSortableDateTimePatternyyyy'-'MM'-'dd'T'HH':'mm':'ssTimeSeparator:UniversalSortableDateTimePatternyyyy'-'MM'-'dd HH':'mm':'ss'Z'YearMonthPatternMMMM yyyyAbbreviatedDayNamesיום א,יום ב,יום ג,יום ד,יום ה,יום ו,שבתShortestDayNamesא,ב,ג,ד,ה,ו,שDayNamesיום ראשון,יום שני,יום שלישי,יום רביעי,יום חמישי,יום שישי,שבתAbbreviatedMonthNamesינו,פבר,מרץ,אפר,מאי,יונ,יול,אוג,ספט,אוק,נוב,דצמ,MonthNamesינואר,פברואר,מרץ,אפריל,מאי,יוני,יולי,אוגוסט,ספטמבר,אוקטובר,נובמבר,דצמבר,IsReadOnlyfalseNativeCalendarNameלוח שנה גרגוריאניAbbreviatedMonthGenitiveNamesינו,פבר,מרץ,אפר,מאי,יונ,יול,אוג,ספט,אוק,נוב,דצמ,MonthGenitiveNamesינואר,פברואר,מרץ,אפריל,מאי,יוני,יולי,אוגוסט,ספטמבר,אוקטובר,נובמבר,דצמבר,</td>
+	<td>waitForPageToLoad</td>
+	<td>30000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyValue</td>
+	<td>TextBox</td>
+	<td>Culture Name: he-IL FullDateTimePattern: dddd dd MMMM yyyy HH:mm:ss</td>
 </tr>
 
 </tbody></table>

+ 11 - 6
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.CultureInfo.CurrentCulture.numberFormat/Default.html

@@ -14,9 +14,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertText</td>
-	<td>//table</td>
-	<td>FormatTypeFormatValueCulture Name: en-USCurrencyDecimalDigits2CurrencyDecimalSeparator.IsReadOnlyfalseCurrencyGroupSizes3NumberGroupSizes3PercentGroupSizes3CurrencyGroupSeparator,CurrencySymbol$NaNSymbolNaNCurrencyNegativePattern0NumberNegativePattern1PercentPositivePattern0PercentNegativePattern0NegativeInfinitySymbol-InfinityNegativeSign-NumberDecimalDigits2NumberDecimalSeparator.NumberGroupSeparator,CurrencyPositivePattern0PositiveInfinitySymbolInfinityPositiveSign+PercentDecimalDigits2PercentDecimalSeparator.PercentGroupSeparator,PercentSymbol%PerMilleSymbol‰NativeDigits0,1,2,3,4,5,6,7,8,9DigitSubstitution1</td>
+	<td>verifyValue</td>
+	<td>TextBox</td>
+	<td>Culture Name: en-US CurrencySymbol: $</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -24,9 +24,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertText</td>
-	<td>//table/</td>
-	<td>FormatTypeFormatValueCulture Name: he-ILCurrencyDecimalDigits2CurrencyDecimalSeparator.IsReadOnlyfalseCurrencyGroupSizes3NumberGroupSizes3PercentGroupSizes3CurrencyGroupSeparator,CurrencySymbol₪NaNSymbolלא מספרCurrencyNegativePattern2NumberNegativePattern1PercentPositivePattern1PercentNegativePattern1NegativeInfinitySymbolאינסוף שליליNegativeSign-NumberDecimalDigits2NumberDecimalSeparator.NumberGroupSeparator,CurrencyPositivePattern2PositiveInfinitySymbolאינסוף חיוביPositiveSign+PercentDecimalDigits2PercentDecimalSeparator.PercentGroupSeparator,PercentSymbol%PerMilleSymbol‰NativeDigits0,1,2,3,4,5,6,7,8,9DigitSubstitution1</td>
+	<td>waitForPageToLoad</td>
+	<td>30000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyValue</td>
+	<td>TextBox</td>
+	<td>Culture Name: he-IL CurrencySymbol: ₪</td>
 </tr>
 
 </tbody></table>

+ 84 - 84
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Debug/Default.html

@@ -1,84 +1,84 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Default</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Default</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/SystemWebExtensionsAUT/Sys.Debug/Default.aspx</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>text1</td>
-	<td>test</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>btnTrace</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertAlert</td>
-	<td>Hello test.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>TraceConsole</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>btnDump</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertAlert</td>
-	<td>Hello test.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>TraceConsole</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>btnClear</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertAlert</td>
-	<td>Trace console cleared.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>TraceConsole</td>
-	<td></td>
-</tr>
-<tr>
-	<td>chooseCancelOnNextConfirmation</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>btnAssert</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Assertion Failed: n must be set to a positive integer.*</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Default</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Default</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/SystemWebExtensionsAUT/Sys.Debug/Default.aspx</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>text1</td>
+	<td>test</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>btnTrace</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertAlert</td>
+	<td>Hello test.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>TraceConsole</td>
+	<td>Name set to "test".</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>btnDump</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertAlert</td>
+	<td>Hello test.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>TraceConsole</td>
+	<td>*Name textbox {INPUT - text1}</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>btnClear</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertAlert</td>
+	<td>Trace console cleared.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>TraceConsole</td>
+	<td></td>
+</tr>
+<tr>
+	<td>chooseCancelOnNextConfirmation</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>btnAssert</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Assertion Failed: n must be set to a positive integer.*</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

+ 0 - 5
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.CallWebServiceMethods/CallWebServiceMethods.html

@@ -28,11 +28,6 @@
 	<td>This method does not return a value.</td>
 	<td></td>
 </tr>
-<tr>
-	<td>waitForPageToLoad</td>
-	<td>30000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>click</td>
 	<td>Button2</td>

+ 1 - 1
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.ConnectingEndPoints/ConnectingEndPoints.html

@@ -30,7 +30,7 @@
 </tr>
 <tr>
 	<td>waitForTextPresent</td>
-	<td>&lt;head&gt; &lt;title&gt;Hello Page&lt;/title&gt; &lt;/head&gt; &lt;body&gt; &lt;p&gt; Hello there. I got your GET Web request! &lt;/p&gt; &lt;/body&gt; &lt;/html&gt;</td>
+	<td>Hello there. I got your GET Web request!</td>
 	<td></td>
 </tr>
 <tr>

+ 1 - 1
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.XmlHttpExecutor/XmlHttpExecutor.html

@@ -45,7 +45,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>&lt;head&gt; &lt;title&gt;Hello Page&lt;/title&gt; &lt;/head&gt; &lt;body&gt; &lt;p&gt; ...hello there. Congratulations, you got here via a GET Web Request! &lt;/p&gt; &lt;/body&gt;</td>
+	<td>...hello there. Congratulations, you got here via a GET Web Request! </td>
 	<td></td>
 </tr>
 <tr>

+ 7 - 7
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.UI.DomEvent/default.html

@@ -35,12 +35,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>clientX = 0</td>
+	<td>clientX =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>clientY = 0</td>
+	<td>clientY =</td>
 	<td></td>
 </tr>
 <tr>
@@ -50,22 +50,22 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>offsetX = </td>
+	<td>offsetX =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>offsetY = </td>
+	<td>offsetY =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>screenX = 0</td>
+	<td>screenX =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>screenY = 0</td>
+	<td>screenY =</td>
 	<td></td>
 </tr>
 <tr>
@@ -75,7 +75,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>target = [object HTMLInputElement]</td>
+	<td>target =</td>
 	<td></td>
 </tr>
 <tr>

+ 7 - 7
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.UI.DomEvent2/default.html

@@ -30,17 +30,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>keyCode = undefined</td>
+	<td>keyCode</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>clientX = 0</td>
+	<td>clientX =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>clientY = 0</td>
+	<td>clientY =</td>
 	<td></td>
 </tr>
 <tr>
@@ -50,22 +50,22 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>offsetX = </td>
+	<td>offsetX =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>offsetY = </td>
+	<td>offsetY =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>screenX = 0</td>
+	<td>screenX =</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>screenY = 0</td>
+	<td>screenY =</td>
 	<td></td>
 </tr>
 <tr>

+ 3 - 0
mcs/class/System.Web.Extensions/Test/AUT/Sys.CultureInfo.CurrentCulture.dateTimeFormat/default.aspx

@@ -22,6 +22,7 @@
             <asp:Label ID="Label1" runat="server" Text="Label"></asp:Label>
             <asp:Label ID="Label2" runat="server" Text="Label"></asp:Label>
             <asp:Button ID="Button1" runat="server" Text="Culture Changer" OnClick="Button1_Click" />
+            <br /><input id="TextBox" />
         </div>
     </form>
 </body>
@@ -45,6 +46,7 @@
                    'MonthGenitiveNames'];
 
     var result = 'Culture Name: ' + cultureName;
+    var result2 = 'Culture Name: ' + cultureName;
     for (var i = 0, l = myArray.length; i < l; i++) {
         var arrayVal = myArray[i];
         if (typeof(arrayVal) !== 'undefined') {
@@ -53,6 +55,7 @@
     }
     var resultHeader = "<tr><td><b>FormatType</b></td><td><b>FormatValue</b></td></tr>"
     $get('Label1').innerHTML = "<table border=1>" + resultHeader + result +"</table>";
+    $get('TextBox').value=result2 + ' FullDateTimePattern: ' + dtfObject.FullDateTimePattern;
 
     var d = new Date();
     $get('Label2').innerHTML = "<p/><h3>dateTimeFormat Example: </h3>" + 

+ 3 - 0
mcs/class/System.Web.Extensions/Test/AUT/Sys.CultureInfo.CurrentCulture.numberFormat/default.aspx

@@ -20,6 +20,7 @@
             <asp:Label ID="Label1" runat="server" Text="Label"></asp:Label>
             <asp:Label ID="Label2" runat="server" Text="Label"></asp:Label>
             <asp:Button ID="Button1" runat="server" Text="Culture Changer" OnClick="Button1_Click" />
+            <br /><input id="TextBox" />
         </div>
     </form>
 </body>
@@ -43,6 +44,7 @@
                    'NativeDigits', 'DigitSubstitution'];
 
     var result = 'Culture Name: ' + cultureName;
+    var result2 = 'Culture Name: ' + cultureName;
     for (var i = 0, l = myArray.length; i < l; i++) {
         var arrayVal = myArray[i];
         if (typeof(arrayVal) !== 'undefined') {
@@ -51,6 +53,7 @@
     }
     var resultHeader = "<tr><td><b>FormatType</b></td><td><b>FormatValue</b></td></tr>"
     $get('Label1').innerHTML = "<table border=1>" + resultHeader + result + "</table>";
+    $get('TextBox').value=result2 + ' CurrencySymbol: ' + nfObject.CurrencySymbol;
  
     var n = 99.987;
     $get('Label2').innerHTML = "<p/><h3>numberFormat Example: </h3>" + 

+ 1 - 1
mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.CallWebServiceMethods/CallWebServiceMethods.aspx

@@ -44,7 +44,7 @@
                             <!-- Getting no retun value from 
                             the Web service. --> 
                             <button id="Button1"  
-                                onclick="GetNoReturn()">No Return</button>
+                                onclick="GetNoReturn(); return false;">No Return</button>
                         </td>
                     </tr>
                     

+ 1 - 2
mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.ConnectingEndPoints/getTarget.htm

@@ -5,8 +5,7 @@
 </head>
 <body>
     <p> 
-        Hello there. 
-        I got your GET Web request!
+        Hello there. I got your GET Web request!
     </p>
 </body>
 </html>

+ 3 - 2
mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.XmlHttpExecutor/XmlHttpExecutor.js

@@ -14,7 +14,7 @@ function AbortWebRequest()
     wRequest =  new Sys.Net.WebRequest();
     
     // Set the request Url.  
-    wRequest.set_url("getTarget.htm");
+    wRequest.set_url("getTarget.aspx");
     
     // Clear the results area.
     resultElementId.innerHTML = "";
@@ -149,7 +149,8 @@ function OnSucceededXml(executor, eventArgs)
     {
        
         if (document.all)
-            resultElementId.innerText += executor.get_xml().xml;
+            resultElementId.innerText += "First node: " + 
+                executor.get_xml().documentElement.nodeName;
         else
             // Firefox 
             resultElementId.textContent += "First node: " + 

+ 20 - 0
mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.XmlHttpExecutor/getTarget.aspx

@@ -0,0 +1,20 @@
+<%@ Page Language="C#" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<script runat="server">
+	protected override void OnInit (EventArgs e) {
+		base.OnInit (e);
+		System.Threading.Thread.Sleep (30000);
+	}
+</script>
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+    <title>Hello Page</title>
+</head>
+<body>
+    <p> 
+   
+        ...hello there. Congratulations, you got here via a GET Web Request!
+    
+     </p>
+</body>
+</html>

+ 2 - 1
mcs/class/System.Web.Extensions/Test/AUT/SystemWebExtensionsAUT.JavaEE.csproj

@@ -738,7 +738,8 @@
     <Content Include="Selenium\System.Web.UI\UpdatePanel\TestUpdateButtonOutside.html" />
     <Content Include="Selenium\System.Web.UI\UpdatePanel\UpdatePanelTestSuite.html" />
     <Content Include="Sys.Application\HoverButton.js" />
+    <Content Include="Sys.Net.XmlHttpExecutor\getTarget.aspx" />
     <Content Include="UpdatePanelTutorialIntro8\MasterPage.master" />
     <Content Include="UpdatePanelTutorialIntro9\MasterPage.master" />
   </ItemGroup>
-</Project>
+</Project>