more links and xpaths

gentamura · May 24, 2013 · 97f602e · 97f602e
1 parent 563ff3b
commit 97f602e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/XMLHttpRequest/support/form.php → XMLHttpRequest/resources/form.php b/XMLHttpRequest/support/form.php → XMLHttpRequest/resources/form.php
diff --git a/XMLHttpRequest/send-data-arraybuffer.htm b/XMLHttpRequest/send-data-arraybuffer.htm
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method"  data-tested-assertations="following::ol[1]/li[4]"/>
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method"  data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[1]"/>
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
     <script src="/resources/testharness.js"></script>
     <title>XMLHttpRequest: The send() method: ArrayBuffer data</title>
 </head>

diff --git a/XMLHttpRequest/send-data-blob.htm b/XMLHttpRequest/send-data-blob.htm
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method"  data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[2]"/>
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute"  data-tested-assertations="following::ol[1]/li[4]"/>
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::a[contains(@href,'#blob-response-entity-body')]/.."/>
+
     <script src="/resources/testharness.js"></script>
-    <title>XMLHttpRequest L2: The send() method: Blob data</title>
+    <title>XMLHttpRequest: The send() method: Blob data</title>
 </head>
 
 <body>
@@ -38,7 +41,7 @@
 
             xhr2.onreadystatechange = function()
             {
-                if (xhr2.readyState == 4) 
+                if (xhr2.readyState == 4)
                 {
                     test.step(function()
                     {

diff --git a/XMLHttpRequest/send-data-formdata.htm b/XMLHttpRequest/send-data-formdata.htm
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[5]" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#interface-formdata" data-tested-assertations="following::id('dom-formdata')/following::ol[1]/li[1] following::id('dom-formdata')/following::ol[1]/li[3] following::id('dom-formdata-append')/following::ul[1]/li[1] following::id('dom-formdata-append')/following::ul[1]/li[2]" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
     <script src="/resources/testharness.js"></script>
-    <title>XmlHttpRequest L2: The send() method: FormData data</title>
+    <title>XmlHttpRequest: The send() method: FormData data</title>
 </head>
 
 <body>
@@ -32,7 +34,7 @@
                 });
             };
 
-            xhr.open("POST", "./support/form.php", true);
+            xhr.open("POST", "./resources/form.php", true);
             xhr.send(form);
         });
     </script>

diff --git a/XMLHttpRequest/send-network-error-async-events.htm b/XMLHttpRequest/send-network-error-async-events.htm
@@ -1,9 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[9]/ol/li[2] following::ol[1]/li[9]/ol/li[3] " />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dd[4]/p" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7] following::ol[1]/li[7]/ol/li[3] following::ol[1]/li[7]/ol/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
     <script src="/resources/testharness.js"></script>
-    <title>XmlHttpRequest L2: The send() method: Fire a progress event named error when Network error happens (synchronous flag is unset)</title>
+    <title>XmlHttpRequest: The send() method: Fire a progress event named error when Network error happens (synchronous flag is unset)</title>
 </head>
 
 <body>
@@ -14,23 +17,25 @@
 
         test.step(function(){
             var xhr = new XMLHttpRequest();
-            var expect =  [4, "upload.error", "upload.loadend", "error", "loadend"];
+            var expect =  ["loadstart", "upload.loadstart", 4, "upload.error", "upload.loadend", "error", "loadend"];
             var actual = [];
 
             xhr.onreadystatechange = function()
             {
                 test.step(function()
                 {
-                    if (xhr.readyState == 4) 
+                    if (xhr.readyState == 4)
                     {
                         actual.push(xhr.readyState);
                     }
                 });
             };
 
+            xhr.onloadstart          = function(e){ actual.push(e.type); };
             xhr.onloadend          = function(e){ actual.push(e.type); VerifyResult()};
             xhr.onerror            = function(e){ actual.push(e.type); };
 
+            xhr.upload.onloadstart   = function(e){ actual.push("upload." + e.type);};
             xhr.upload.onloadend   = function(e){ actual.push("upload." + e.type);};
             xhr.upload.onerror     = function(e){ actual.push("upload." + e.type); };
 

diff --git a/XMLHttpRequest/send-network-error-sync-events.htm b/XMLHttpRequest/send-network-error-sync-events.htm
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dd[4]/p" />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
+    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]" />
     <script src="/resources/testharness.js"></script>
-    <title>XmlHttpRequest L2: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set)</title>
+    <title>XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set)</title>
 </head>
 
 <body>
@@ -14,12 +16,13 @@
         {
             var xhr = new XMLHttpRequest();
 
-            xhr.open("POST", "http://nonexistent-origin.w3c-test.org", false);  
+            xhr.open("POST", "http://nonexistent-origin.w3c-test.org", false);
 
             assert_throws("NETWORK_ERR", function()
             {
                 xhr.send("Test Message");
             });
+            assert_equals(xhr.readyState, 4)
         });
     </script>
 </body>