浏览代码

fix test suite

svn path=/trunk/mcs/; revision=93633
Igor Zelmanovich 18 年之前
父节点
当前提交
bdf7a3e4a7
共有 15 个文件被更改,包括 65 次插入10 次删除
  1. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/ExtenderControlTutorial1/Default.html
  2. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/IScriptControlTutorial1/Default.html
  3. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Application/Default.html
  4. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.EventHandlerList/Default.html
  5. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.ConnectingEndPoints/ConnectingEndPoints.html
  6. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.ServerSupport/Default.html
  7. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.UsingProxyClass/default.html
  8. 6 1
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.WebRequest/webrequest.html
  9. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.WebRequestManager/WebRequestManager.html
  10. 8 3
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.WebServiceGenerics/default.html
  11. 5 0
      mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.XmlHttpExecutor/XmlHttpExecutor.html
  12. 1 1
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Application/Default.aspx
  13. 1 1
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.ServerSupport/ServerTypes.js
  14. 1 1
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.UsingProxyClass/UsingProxyClass.js
  15. 3 3
      mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.WebServiceProxy/WebServiceProxy.js

+ 5 - 0
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/ExtenderControlTutorial1/Default.html

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/ExtenderControlTutorial1/Default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyAttribute</td>
 	<td>//input[contains(@id,'TextBox1')]/@class</td>

+ 5 - 0
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/IScriptControlTutorial1/Default.html

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/IScriptControlTutorial1/Default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyAttribute</td>
 	<td>//input[contains(@id,'TextBox1')]/@class</td>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Application/Default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.EventHandlerList/Default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.ConnectingEndPoints/ConnectingEndPoints.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.ServerSupport/default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button2</td>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.UsingProxyClass/default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button3</td>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.WebRequest/webrequest.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>
@@ -39,7 +44,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
+	<td>assertTextPresent</td>
 	<td>... Yes I hear you.</td>
 	<td></td>
 </tr>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.WebRequestManager/WebRequestManager.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>

+ 8 - 3
mcs/class/System.Web.Extensions/Test/AUT/Selenium/QuickStarts/Sys.Net.WebServiceGenerics/default.html

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.WebServiceGenerics/default.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>
@@ -34,17 +39,17 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
+	<td>assertTextPresent</td>
 	<td>FF0000: Red</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
+	<td>assertTextPresent</td>
 	<td>00FF00: Green</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
+	<td>assertTextPresent</td>
 	<td>000000: Black</td>
 	<td></td>
 </tr>

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

@@ -13,6 +13,11 @@
 	<td>/SystemWebExtensionsAUT/Sys.Net.XmlHttpExecutor/XmlHttpExecutor.aspx</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>Button1</td>

+ 1 - 1
mcs/class/System.Web.Extensions/Test/AUT/Sys.Application/Default.aspx

@@ -33,6 +33,7 @@ function applicationInitHandler() {
     $create(Demo.HighVis, null, null, null, $get('Button2'));
 }
 
+/*        
 // Attach a handler to the load event.
 Sys.Application.add_load(applicationLoadHandler);
 
@@ -43,7 +44,6 @@ function applicationLoadHandler() {
         window.location = "AfterHours.aspx";
     }
 }
-/*        
 // Attach a handler to the unLoad event.
 Sys.Application.add_unload(applicationUnloadHandler);
 

+ 1 - 1
mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.ServerSupport/ServerTypes.js

@@ -16,7 +16,7 @@ function pageLoad()
     
     // Assign default values for the generated proxy using
     // the (generated) static proxy.
-    Samples.AspNet.ServerTypes.set_timeout(200);
+    //Samples.AspNet.ServerTypes.set_timeout(200);
     Samples.AspNet.ServerTypes.set_defaultUserContext("Default context");
     Samples.AspNet.ServerTypes.set_defaultSucceededCallback(SucceededCallback);
     Samples.AspNet.ServerTypes.set_defaultFailedCallback(FailedCallback);

+ 1 - 1
mcs/class/System.Web.Extensions/Test/AUT/Sys.Net.UsingProxyClass/UsingProxyClass.js

@@ -18,7 +18,7 @@ function pageLoad()
         document.getElementById("ResultId");
     
     // Assign default values to the generated proxy.
-    Sys.Net.UsingProxyClass.UsingProxyClass.set_timeout(200);
+    //Sys.Net.UsingProxyClass.UsingProxyClass.set_timeout(200);
     Sys.Net.UsingProxyClass.UsingProxyClass.set_defaultUserContext("Default context");
     Sys.Net.UsingProxyClass.UsingProxyClass.set_defaultSucceededCallback(SucceededCallback);
     Sys.Net.UsingProxyClass.UsingProxyClass.set_defaultFailedCallback(FailedCallback);

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

@@ -10,7 +10,7 @@ function GetTime()
 {
     Sys.Net.WebServiceProxy.invoke(webServicePath, 
         webMethod, false,{}, OnSucceeded, 
-        OnFailed,"User Context",1000000);
+        OnFailed,"User Context",30000);
             
 }
 
@@ -24,7 +24,7 @@ function GetGreetings()
     Sys.Net.WebServiceProxy.invoke(webServicePath, 
         webMethod, true,
         {"greeting":"Have a nice day", "name":" to You (via GET)!"},
-        OnSucceeded,OnFailed, "User Context",100);
+        OnSucceeded,OnFailed, "User Context",30000);
 
 }
 
@@ -37,7 +37,7 @@ function PostGreetings()
     Sys.Net.WebServiceProxy.invoke(webServicePath, 
         webMethod, false,
         {"greeting":"Have a nice day", "name":" to You (via POST)!"},
-        OnSucceeded,OnFailed, "User Context",100);
+        OnSucceeded,OnFailed, "User Context",30000);
 
 }