Convert 2 Microsoft SVG-in-HTML tests to testharness.js (web-platform…

…-tests#7758) That's 014 and 015. Drive-by whitespace changes in 002 and 012.
valerioadm · Oct 13, 2017 · f81aa44 · f81aa44
1 parent d9869ef
commit f81aa44
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 80 deletions.
diff --git a/old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html b/old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html >
+<!DOCTYPE html>
 <html>
     <head>
         <title>HTML 5 Foreign Content SVG in HTML </title>
         <meta description="Test to verify SVG inside HTML I element parses correctly" />
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />        
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <script type="text/javascript">
-        
+
             function RunTest()
             {
                 try
@@ -15,7 +15,7 @@
                     {
                         var svgNamespace = "http://www.w3.org/2000/svg";
                         var textElem = document.createElementNS(svgNamespace, "text");
-                        
+
                         var textContent = document.createTextNode("FillerText");
                         textElem.appendChild(textContent);
 
@@ -25,7 +25,7 @@
                     }
                 }
                 catch(ex)
-                {                    
+                {
                 }
             }
         </script>
@@ -38,7 +38,7 @@
         </div>
         <div>
             <i>
-                <svg id="svg1" width="100px" height="100px">                    
+                <svg id="svg1" width="100px" height="100px">
                 </svg>
             </i>
         </div>

diff --git a/old-tests/submission/Microsoft/foreigncontent/foreign_content_012.html b/old-tests/submission/Microsoft/foreigncontent/foreign_content_012.html
@@ -3,8 +3,8 @@
     <head>
         <title>HTML 5 Foreign Content SVG in HTML </title>
         <meta description="Test to verify SVG elements are styled using SCRIPT and STYLE element" />
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" /> 
-        
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+
         <style>
             svg
             {
@@ -19,7 +19,7 @@
             }
         </script>
     </head>
-    
+
     <body onload="ChangeColor()">
 
         <div class="testdata">

diff --git a/old-tests/submission/Microsoft/foreigncontent/foreign_content_014.html b/old-tests/submission/Microsoft/foreigncontent/foreign_content_014.html
@@ -4,48 +4,25 @@
         <title>HTML 5 Foreign Content SVG in HTML </title>
         <meta description="Test to verify SVG elements inside SVG namespace are camelCased" />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
-
             function RunTest()
             {
-                try
-                {
-                    var bResult = "FAIL";
-                    var parentNode = document.getElementById("svg1");
-
-                    for(var i=1;i<parentNode.childNodes.length;i=i+2)
-                    {
-                        var idName = parentNode.childNodes[i].id;
-                        var tagName = parentNode.childNodes[i].localName;
-                        if(idName!=tagName)
-                        {
-                            bResult = "FAIL";
-                            break;
-                        }
-                        else
-                        {
-                            bResult = "PASS"
-                        }
-                    }
-                }
-                catch(ex)
+                var parentNode = document.getElementById("svg1");
+
+                for(var i=1;i<parentNode.childNodes.length;i=i+2)
                 {
-                    bResult = "PASS";
+                    var idName = parentNode.childNodes[i].id;
+                    var localName = parentNode.childNodes[i].localName;
+                    assert_equals(localName, idName);
                 }
-
-                document.getElementById("testresult").innerHTML = bResult;
             }
         </script>
     </head>
-
-    <body onload="RunTest()">
 
-        <div class="testdata">
-            <p id="instructions"> Test passes if the word "PASS" appears below  </p>
-            <p> Test Result : </p>
-            <p id="testresult"> RUNNING </div>
-        </div>
+    <body onload="test(RunTest)">
+
         <svg id="svg1">
 
             <altglyph id="altGlyph" />
@@ -88,11 +65,8 @@
             <radialgradient id="radialGradient" />
             <textpath id="textPath" />
 
-        </svg> 
-
+        </svg>
 
-
     </body>
 
 </html>
-
diff --git a/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html b/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html
@@ -3,51 +3,30 @@
     <head>
         <title>HTML 5 Foreign Content SVG in HTML </title>
         <meta description="Test to verify SVG Elements outside SVG namespace are camelCased" />
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />   
-
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
-
             function RunTest()
             {
-                try
-                {
-
-                    var parentNode = document.getElementById("div1");
-
-                    for(var i=0;i<parentNode.childNodes.length;i++)
-                    {
-                        var idName = parentNode.childNodes[i].id;
-                        var tagName = parentNode.childNodes[i].localName;
-                        if(idName==tagName)
-                        {
-                            document.getElementById("testresult").innerHTML = "FAIL";
-                            break;
-                        }
-                        else
-                        {
-                            document.getElementById("testresult").innerHTML = "PASS";
-                        }
-                    }
-                }
-                catch(ex)
+                var parentNode = document.getElementById("div1");
+
+                for(var i=0;i<parentNode.childNodes.length;i++)
                 {
-                    document.getElementById("testresult").innerHTML = "FAIL";   
+                    var idName = parentNode.childNodes[i].id;
+                    var localName = parentNode.childNodes[i].localName;
+                    assert_equals(localName, idName);
                 }
             }
         </script>
     </head>
-    
-    <body onload="RunTest()">
+
+    <body onload="test(RunTest)">
 
         <div id="div1">
             <AlTglYph id="altGlyph" />
-        </div> 
-        <p id="instructions"> Test passes if the word "PASS" appears below  </p>
-        <p> Test Result : </p>
-        <div id="testresult"> RUNNING </div>
-
-
+        </div>
+
     </body>
 
 </html>
-