platform/mac/accessibility/selected-rows-table.html failing on Lion Intel Debug WebKi...

https://bugs.webkit.org/show_bug.cgi?id=81530

Reviewed by Jessie Berlin.

Tools:

Add rowAtIndex to WebKitTestRunner.

* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::rowAtIndex):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
(AccessibilityUIElement):
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR):
(WTR::AccessibilityUIElement::rowAtIndex):

LayoutTests:

* platform/mac-wk2/platform/mac/accessibility/selected-rows-table-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111233 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 565a4e1..fa8ba51 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-19  Chris Fleizach  <cfleizach@apple.com>
+
+        platform/mac/accessibility/selected-rows-table.html failing on Lion Intel Debug WebKit2 testers
+        https://bugs.webkit.org/show_bug.cgi?id=81530
+
+        Reviewed by Jessie Berlin.
+
+        * platform/mac-wk2/platform/mac/accessibility/selected-rows-table-expected.txt: Removed.
+
 2012-03-19  Jessie Berlin  <jberlin@apple.com>
 
         editing/input/reveal-edit-on-input-vertically.html and

diff --git a/LayoutTests/platform/mac-wk2/platform/mac/accessibility/selected-rows-table-expected.txt b/LayoutTests/platform/mac-wk2/platform/mac/accessibility/selected-rows-table-expected.txt
deleted file mode 100644 (file)
index 15f76ed..0000000
--- a/LayoutTests/platform/mac-wk2/platform/mac/accessibility/selected-rows-table-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-a
-
-
-b
-
-
-c
-This tests that the selected rows of a table are exposed correctly and that when they change, a notification is sent.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS addedNotification is true
-FAIL axTree.selectedRowAtIndex(0).isEqual(axTree.rowAtIndex(0)) should be true. Threw exception TypeError: 'undefined' is not a function (evaluating 'axTree.rowAtIndex(0)')
-FAIL axTree.selectedRowAtIndex(1).isEqual(axTree.rowAtIndex(2)) should be true. Threw exception TypeError: 'undefined' is not a function (evaluating 'axTree.rowAtIndex(2)')
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Notification: AXSelectedRowsChanged
-

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e084f82..8af939e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2012-03-19  Chris Fleizach  <cfleizach@apple.com>
+
+        platform/mac/accessibility/selected-rows-table.html failing on Lion Intel Debug WebKit2 testers
+        https://bugs.webkit.org/show_bug.cgi?id=81530
+
+        Reviewed by Jessie Berlin.
+
+        Add rowAtIndex to WebKitTestRunner.
+
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+        (WTR::AccessibilityUIElement::rowAtIndex):
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+        (AccessibilityUIElement):
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+        (WTR):
+        (WTR::AccessibilityUIElement::rowAtIndex):
+
 2012-03-19  Ojan Vafai  <ojan@chromium.org>
 
         Change garden-o-matic All Failures tab to Expected Failures

diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
index b38bc65..4be157f 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
@@ -144,6 +144,7 @@ int AccessibilityUIElement::columnCount() { return 0; }
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedRowAtIndex(unsigned) { return 0; }
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedByRow() { return 0; }
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedRowAtIndex(unsigned) { return 0; }
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::rowAtIndex(unsigned) { return 0; }
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaOwnsElementAtIndex(unsigned) { return 0; }
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaFlowToElementAtIndex(unsigned) { return 0; }
 bool AccessibilityUIElement::ariaIsGrabbed() const { return false; }

diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
index b726a82..9654ff8 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
@@ -180,6 +180,7 @@ public:
     PassRefPtr<AccessibilityUIElement> selectedRowAtIndex(unsigned);
     PassRefPtr<AccessibilityUIElement> disclosedByRow();
     PassRefPtr<AccessibilityUIElement> disclosedRowAtIndex(unsigned);
+    PassRefPtr<AccessibilityUIElement> rowAtIndex(unsigned);
 
     // ARIA specific
     PassRefPtr<AccessibilityUIElement> ariaOwnsElementAtIndex(unsigned);

diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl
index f3b5bee..4d39fca 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl
+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl
@@ -118,6 +118,7 @@ module WTR {
         AccessibilityUIElement selectedRowAtIndex(in unsigned long index);
         AccessibilityUIElement disclosedByRow();
         AccessibilityUIElement disclosedRowAtIndex(in unsigned long index);
+        AccessibilityUIElement rowAtIndex(in unsigned long index);
         int indexInTable();
         DOMString rowIndexRange();
         DOMString columnIndexRange();

diff --git a/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm b/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
index 40bacfc..95a99a7 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
+++ b/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
@@ -326,6 +326,17 @@ PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedRowAtIndex(u
 
     return 0;
 }
+    
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::rowAtIndex(unsigned index)
+{
+    BEGIN_AX_OBJC_EXCEPTIONS
+    NSArray* rows = [m_element accessibilityAttributeValue:NSAccessibilityRowsAttribute];
+    if (index < [rows count])
+        return AccessibilityUIElement::create([rows objectAtIndex:index]);
+    END_AX_OBJC_EXCEPTIONS
+    
+    return 0;
+}
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedChildAtIndex(unsigned index) const
 {