fixing a bunch of invalid rowheader/columnheader tests
authorJames Craig <jcraig@apple.com>
Mon, 06 May 2013 15:44:43 -0700
changeset 232 d7b787c9dc75
parent 231 60a8dc6e55c3
child 233 b40ad7045511
fixing a bunch of invalid rowheader/columnheader tests
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-undefined.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-readonly-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-readonly-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-required-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-required-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-selected-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-selected-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-undefined.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-readonly-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-readonly-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-required-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-required-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-false.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-true.html
ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-undefined.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html
ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-expanded="false">Placeholder content</div>
-          <div id="obj1">obj1</div>
-          <div id="obj2">obj2</div>
+          <span id="test" role="columnheader" aria-expanded="false">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-true.html	Mon May 06 15:44:43 2013 -0700
@@ -11,19 +11,25 @@
       <div role="grid">
         <div role="row">
           <span id="test" role="columnheader" aria-expanded="true">Placeholder content</span>
-          <span id="obj1" role="columnheader">columnheader2</span>
-          <span id="obj2" role="columnheader">columnheader3</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
         </div>
         <div role="row">
-          <span role="gridcell">cell1</span>
-          <span role="gridcell">cell2</span>
-          <span role="gridcell">cell3</span>
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
         <div role="row">
-          <span role="gridcell">cell4</span>
-          <span role="gridcell">cell5</span>
-          <span role="gridcell">cell6</span>
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+      </div>
       </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-undefined.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-expanded-undefined.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-expanded="undefined">Placeholder content</div>
-          <div id="obj1">obj1</div>
-          <div id="obj2">obj2</div>
+          <span id="test" role="columnheader" aria-expanded="undefined">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-readonly-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-readonly-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,7 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-readonly="false">Placeholder content</div>
+          <span id="test" role="columnheader" aria-readonly="false">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-readonly-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-readonly-true.html	Mon May 06 15:44:43 2013 -0700
@@ -10,7 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-readonly="true">Placeholder content</div>
+          <span id="test" role="columnheader" aria-readonly="true">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-required-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-required-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-required="false">Placeholder content</div>
-          <div id="obj1">obj1</div>
-          <div id="obj2">obj2</div>
+          <span id="test" role="columnheader" aria-required="false">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-required-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-required-true.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-required="true">Placeholder content</div>
-          <div id="obj1">obj1</div>
-          <div id="obj2">obj2</div>
+          <span id="test" role="columnheader" aria-required="true">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-selected-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-selected-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-selected="false">Placeholder content</div>
-          <div id="obj1">obj1</div>
-          <div id="obj2">obj2</div>
+          <span id="test" role="columnheader" aria-selected="false">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-selected-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-columnheader-aria-selected-true.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,24 @@
    <body>
       <div role="grid">
         <div role="row">
-          <div id="test" role="columnheader" aria-selected="true">Placeholder content</div>
-          <div id="obj1">obj1</div>
-          <div id="obj2">obj2</div>
+          <span id="test" role="columnheader" aria-selected="true">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-false.html	Mon May 06 15:44:43 2013 -0700
@@ -8,8 +8,17 @@
       </title>
    </head>
    <body>
-      <div id="test" role="rowheader" aria-expanded="false">Placeholder content</div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-expanded="false">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-true.html	Mon May 06 15:44:43 2013 -0700
@@ -8,8 +8,17 @@
       </title>
    </head>
    <body>
-      <div id="test" role="rowheader" aria-expanded="true">Placeholder content</div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-expanded="true">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-undefined.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-expanded-undefined.html	Mon May 06 15:44:43 2013 -0700
@@ -8,8 +8,17 @@
       </title>
    </head>
    <body>
-      <div id="test" role="rowheader" aria-expanded="undefined">Placeholder content</div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-expanded="undefined">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-readonly-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-readonly-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-readonly="false">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-readonly="false">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-readonly-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-readonly-true.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-readonly="true">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-readonly="true">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-required-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-required-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-required="false">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-required="false">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-required-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-required-true.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-required="true">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-required="true">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-false.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-false.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-selected="false">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-selected="false">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-true.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-true.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-selected="true">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-selected="true">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-undefined.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported-inherited/roles-properties-supported-inherited-rowheader-aria-selected-undefined.html	Mon May 06 15:44:43 2013 -0700
@@ -10,9 +10,14 @@
    <body>
       <div role="grid">
         <div role="row">
-           <div id="test" role="rowheader" aria-selected="undefined">Placeholder content</div>
-           <div id="obj1" role="gridcell">obj1</div>
-           <div id="obj2" rolw="gridcell">obj2</div>
+          <div id="test" role="rowheader" aria-selected="undefined">Placeholder content</div>
+          <div role="gridcell" id="obj1">obj1</div>
+          <div role="gridcell" id="obj2">obj2</div>
+        </div>
+        <div role="row">
+          <div role="rowheader">header cell 2</div>
+          <div role="gridcell">obj1</div>
+          <div role="gridcell">obj2</div>
         </div>
       </div>
    </body>
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,27 @@
       <title>&lt;div&gt; with role columnheader; supported state or property "aria-sort" value of "ascending"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="columnheader" aria-sort="ascending">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+        <div role="row">
+          <span id="test" role="columnheader" aria-sort="ascending">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,27 @@
       <title>&lt;div&gt; with role columnheader; supported state or property "aria-sort" value of "descending"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="columnheader" aria-sort="descending">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+        <div role="row">
+          <span id="test" role="columnheader" aria-sort="descending">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,27 @@
       <title>&lt;div&gt; with role columnheader; supported state or property "aria-sort" value of "none"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="columnheader" aria-sort="none">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+        <div role="row">
+          <span id="test" role="columnheader" aria-sort="none">Placeholder content</span>
+          <span role="columnheader">header 2</span>
+          <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell" id="obj1">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+          <span role="gridcell">obj1</span>
+          <span role="gridcell">obj2</span>
+          <span role="gridcell">obj3</span>
+        </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html	Mon May 06 15:44:43 2013 -0700
@@ -1,13 +1,32 @@
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>&lt;div&gt; with role columnheader; supported state or property "aria-sort" value of "other"</title>
-   </head>
-   <body>
-      <div role="grid"><div role="row"><div id="test" role="columnheader" aria-sort="other">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>&lt;div&gt; with role columnheader; supported state or property "aria-sort" value of "other"</title>
+</head>
+<body>
+    <div role="grid">
+        <div role="row">
+            <span id="test" role="columnheader" aria-sort="other">Placeholder content</span>
+            <span role="columnheader">header 2</span>
+            <span role="columnheader">header 3</span>
+        </div>
+        <div role="row">
+            <span role="gridcell" id="obj1">obj1</span>
+            <span role="gridcell">obj2</span>
+            <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+            <span role="gridcell">obj1</span>
+            <span role="gridcell">obj2</span>
+            <span role="gridcell">obj3</span>
+        </div>
+        <div role="row">
+            <span role="gridcell">obj1</span>
+            <span role="gridcell">obj2</span>
+            <span role="gridcell">obj3</span>
+        </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,17 @@
       <title>&lt;div&gt; with role rowheader; supported state or property "aria-sort" value of "ascending"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="rowheader" aria-sort="ascending">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-sort="ascending">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,17 @@
       <title>&lt;div&gt; with role rowheader; supported state or property "aria-sort" value of "descending"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="rowheader" aria-sort="descending">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-sort="descending">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,17 @@
       <title>&lt;div&gt; with role rowheader; supported state or property "aria-sort" value of "none"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="rowheader" aria-sort="none">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-sort="none">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file
--- a/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html	Mon May 06 15:19:19 2013 -0700
+++ b/ARIA/1.0/tests/test-files/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html	Mon May 06 15:44:43 2013 -0700
@@ -6,8 +6,17 @@
       <title>&lt;div&gt; with role rowheader; supported state or property "aria-sort" value of "other"</title>
    </head>
    <body>
-      <div role="grid"><div role="row"><div id="test" role="rowheader" aria-sort="other">Placeholder content</div></div></div>
-      <div id="obj1">obj1</div>
-      <div id="obj2">obj2</div>
+      <div role="grid">
+         <div role="row">
+            <div id="test" role="rowheader" aria-sort="other">Placeholder content</div>
+            <div role="gridcell" id="obj1">obj1</div>
+            <div role="gridcell" id="obj2">obj2</div>
+         </div>
+         <div role="row">
+            <div role="rowheader">header cell 2</div>
+            <div role="gridcell">obj1</div>
+            <div role="gridcell">obj2</div>
+         </div>
+      </div>
    </body>
 </html>
\ No newline at end of file