Changeset 62111 in webkit


Ignore:
Timestamp:
Jun 29, 2010 6:27:56 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-06-29 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Xan Lopez.

[Gtk] Make DRT more coherent with other ports to allow reusing more tests
​https://bugs.webkit.org/show_bug.cgi?id=40009

Update GTK a11y tests to follow new prefixes coming from DRT

  • platform/gtk/accessibility/object-attributes-expected.txt:
  • platform/gtk/accessibility/object-attributes.html:
  • platform/gtk/accessibility/object-with-title-expected.txt:
  • platform/gtk/accessibility/object-with-title.html:
  • platform/gtk/accessibility/table-hierarchy-expected.txt:
  • platform/gtk/accessibility/table-hierarchy.html:
  • platform/gtk/accessibility/title-and-alt-expected.txt:
  • platform/gtk/accessibility/title-and-alt.html:

2010-06-29 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Xan Lopez.

[Gtk] Make DRT more coherent with other ports to allow reusing more tests
​https://bugs.webkit.org/show_bug.cgi?id=40009

Make sure "AXRole: ", "AXTitle: " and "AXDescription: " prefixes
are used when returning those values, for coherency with other ports.

  • DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp: (AccessibilityUIElement::role): (AccessibilityUIElement::title): (AccessibilityUIElement::description):
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r62107 r62111  
     12010-06-29  Mario Sanchez Prada  <msanchez@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [Gtk] Make DRT more coherent with other ports to allow reusing more tests
     6        https://bugs.webkit.org/show_bug.cgi?id=40009
     7
     8        Update GTK a11y tests to follow new prefixes coming from DRT
     9
     10        * platform/gtk/accessibility/object-attributes-expected.txt:
     11        * platform/gtk/accessibility/object-attributes.html:
     12        * platform/gtk/accessibility/object-with-title-expected.txt:
     13        * platform/gtk/accessibility/object-with-title.html:
     14        * platform/gtk/accessibility/table-hierarchy-expected.txt:
     15        * platform/gtk/accessibility/table-hierarchy.html:
     16        * platform/gtk/accessibility/title-and-alt-expected.txt:
     17        * platform/gtk/accessibility/title-and-alt.html:
     18
    1192010-06-29  Mikhail Naganov  <mnaganov@chromium.org>
    220

  • trunk/LayoutTests/platform/gtk/accessibility/object-attributes-expected.txt

    r59532 r62111  
    2727
    2828
    29 PASS child.role is 'heading'
     29PASS child.role is 'AXRole: heading'
    3030PASS child.allAttributes() is 'level:1, toolkit:WebKitGtk'
    31 PASS child.role is 'heading'
     31PASS child.role is 'AXRole: heading'
    3232PASS child.allAttributes() is 'level:2, toolkit:WebKitGtk'
    33 PASS child.role is 'heading'
     33PASS child.role is 'AXRole: heading'
    3434PASS child.allAttributes() is 'level:3, toolkit:WebKitGtk'
    35 PASS child.role is 'heading'
     35PASS child.role is 'AXRole: heading'
    3636PASS child.allAttributes() is 'level:4, toolkit:WebKitGtk'
    37 PASS child.role is 'heading'
     37PASS child.role is 'AXRole: heading'
    3838PASS child.allAttributes() is 'level:5, toolkit:WebKitGtk'
    39 PASS child.role is 'heading'
     39PASS child.role is 'AXRole: heading'
    4040PASS child.allAttributes() is 'level:6, toolkit:WebKitGtk'
    41 PASS child.role is 'link'
     41PASS child.role is 'AXRole: link'
    4242PASS child.allAttributes() is 'toolkit:WebKitGtk'
    43 PASS child.role is 'table'
     43PASS child.role is 'AXRole: table'
    4444PASS child.allAttributes() is 'toolkit:WebKitGtk'
    45 PASS child.role is 'table'
     45PASS child.role is 'AXRole: table'
    4646PASS child.allAttributes() is 'toolkit:WebKitGtk'
    4747PASS successfullyParsed is true

  • trunk/LayoutTests/platform/gtk/accessibility/object-attributes.html

    r59532 r62111  
    3434        var webArea = accessibilityController.focusedElement;
    3535        var child = webArea.childAtIndex(0);
    36         shouldBe("child.role", "'heading'");
     36        shouldBe("child.role", "'AXRole: heading'");
    3737        shouldBe("child.allAttributes()", "'level:1, toolkit:WebKitGtk'");
    3838        child = webArea.childAtIndex(1);
    39         shouldBe("child.role", "'heading'");
     39        shouldBe("child.role", "'AXRole: heading'");
    4040        shouldBe("child.allAttributes()", "'level:2, toolkit:WebKitGtk'");
    4141        child = webArea.childAtIndex(2);
    42         shouldBe("child.role", "'heading'");
     42        shouldBe("child.role", "'AXRole: heading'");
    4343        shouldBe("child.allAttributes()", "'level:3, toolkit:WebKitGtk'");
    4444        child = webArea.childAtIndex(3);
    45         shouldBe("child.role", "'heading'");
     45        shouldBe("child.role", "'AXRole: heading'");
    4646        shouldBe("child.allAttributes()", "'level:4, toolkit:WebKitGtk'");
    4747        child = webArea.childAtIndex(4);
    48         shouldBe("child.role", "'heading'");
     48        shouldBe("child.role", "'AXRole: heading'");
    4949        shouldBe("child.allAttributes()", "'level:5, toolkit:WebKitGtk'");
    5050        child = webArea.childAtIndex(5);
    51         shouldBe("child.role", "'heading'");
     51        shouldBe("child.role", "'AXRole: heading'");
    5252        shouldBe("child.allAttributes()", "'level:6, toolkit:WebKitGtk'");
    5353        child = webArea.childAtIndex(6);
    54         shouldBe("child.role", "'link'");
     54        shouldBe("child.role", "'AXRole: link'");
    5555        shouldBe("child.allAttributes()", "'toolkit:WebKitGtk'");
    5656        child = webArea.childAtIndex(7);
    57         shouldBe("child.role", "'table'");
     57        shouldBe("child.role", "'AXRole: table'");
    5858        shouldBe("child.allAttributes()", "'toolkit:WebKitGtk'");
    5959        child = webArea.childAtIndex(8);
    60         shouldBe("child.role", "'table'");
     60        shouldBe("child.role", "'AXRole: table'");
    6161        shouldBe("child.allAttributes()", "'toolkit:WebKitGtk'");
    6262    }

  • trunk/LayoutTests/platform/gtk/accessibility/object-with-title-expected.txt

    r56530 r62111  
    88
    99
    10 PASS child.role is 'list'
    11 PASS child.role is 'section'
    12 PASS child.role is 'list'
     10PASS child.role is 'AXRole: list'
     11PASS child.role is 'AXRole: section'
     12PASS child.role is 'AXRole: list'
    1313PASS successfullyParsed is true
    1414

  • trunk/LayoutTests/platform/gtk/accessibility/object-with-title.html

    r56530 r62111  
    2525
    2626        var child = webArea.childAtIndex(0);
    27         shouldBe("child.role", "'list'");
     27        shouldBe("child.role", "'AXRole: list'");
    2828
    2929        child = webArea.childAtIndex(1);
    30         shouldBe("child.role", "'section'");
     30        shouldBe("child.role", "'AXRole: section'");
    3131
    3232        child = child.childAtIndex(0);
    33         shouldBe("child.role", "'list'");
     33        shouldBe("child.role", "'AXRole: list'");
    3434    }
    3535    successfullyParsed = true;

  • trunk/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt

    r56073 r62111  
    1818
    1919
    20 PASS table1.role is 'table'
     20PASS table1.role is 'AXRole: table'
    2121PASS table1.rowCount is 1
    2222PASS table1.columnCount is 2
    23 PASS table2.role is 'table'
     23PASS table2.role is 'AXRole: table'
    2424PASS table2.rowCount is 3
    2525PASS table2.columnCount is 2
    26 PASS table3.role is 'table'
     26PASS table3.role is 'AXRole: table'
    2727PASS table3.rowCount is 1
    2828PASS table3.columnCount is 2
    29 PASS table4.role is 'table'
     29PASS table4.role is 'AXRole: table'
    3030PASS table4.rowCount is 3
    3131PASS table4.columnCount is 2
    3232PASS children is 2
    33 PASS table1.childAtIndex(i).role is 'table cell'
    34 PASS table1.childAtIndex(i).role is 'table cell'
     33PASS table1.childAtIndex(i).role is 'AXRole: table cell'
     34PASS table1.childAtIndex(i).role is 'AXRole: table cell'
    3535PASS children is 6
    36 PASS table2.childAtIndex(i).role is 'table cell'
    37 PASS table2.childAtIndex(i).role is 'table cell'
    38 PASS table2.childAtIndex(i).role is 'table cell'
    39 PASS table2.childAtIndex(i).role is 'table cell'
    40 PASS table2.childAtIndex(i).role is 'table cell'
    41 PASS table2.childAtIndex(i).role is 'table cell'
     36PASS table2.childAtIndex(i).role is 'AXRole: table cell'
     37PASS table2.childAtIndex(i).role is 'AXRole: table cell'
     38PASS table2.childAtIndex(i).role is 'AXRole: table cell'
     39PASS table2.childAtIndex(i).role is 'AXRole: table cell'
     40PASS table2.childAtIndex(i).role is 'AXRole: table cell'
     41PASS table2.childAtIndex(i).role is 'AXRole: table cell'
    4242PASS children is 2
    43 PASS table3.childAtIndex(i).role is 'table cell'
    44 PASS table3.childAtIndex(i).role is 'table cell'
     43PASS table3.childAtIndex(i).role is 'AXRole: table cell'
     44PASS table3.childAtIndex(i).role is 'AXRole: table cell'
    4545PASS children is 6
    46 PASS table4.childAtIndex(i).role is 'table cell'
    47 PASS table4.childAtIndex(i).role is 'table cell'
    48 PASS table4.childAtIndex(i).role is 'table cell'
    49 PASS table4.childAtIndex(i).role is 'table cell'
    50 PASS table4.childAtIndex(i).role is 'table cell'
    51 PASS table4.childAtIndex(i).role is 'table cell'
     46PASS table4.childAtIndex(i).role is 'AXRole: table cell'
     47PASS table4.childAtIndex(i).role is 'AXRole: table cell'
     48PASS table4.childAtIndex(i).role is 'AXRole: table cell'
     49PASS table4.childAtIndex(i).role is 'AXRole: table cell'
     50PASS table4.childAtIndex(i).role is 'AXRole: table cell'
     51PASS table4.childAtIndex(i).role is 'AXRole: table cell'
    5252PASS successfullyParsed is true
    5353

  • trunk/LayoutTests/platform/gtk/accessibility/table-hierarchy.html

    r56073 r62111  
    3737
    3838        var table1 = webArea.childAtIndex(0);
    39         shouldBe("table1.role", "'table'");
     39        shouldBe("table1.role", "'AXRole: table'");
    4040        shouldBe("table1.rowCount", "1");
    4141        shouldBe("table1.columnCount", "2");
    4242        var table2 = webArea.childAtIndex(1);
    43         shouldBe("table2.role", "'table'");
     43        shouldBe("table2.role", "'AXRole: table'");
    4444        shouldBe("table2.rowCount", "3");
    4545        shouldBe("table2.columnCount", "2");
    4646        var table3 = webArea.childAtIndex(2);
    47         shouldBe("table3.role", "'table'");
     47        shouldBe("table3.role", "'AXRole: table'");
    4848        shouldBe("table3.rowCount", "1");
    4949        shouldBe("table3.columnCount", "2");
    5050        var table4 = webArea.childAtIndex(3);
    51         shouldBe("table4.role", "'table'");
     51        shouldBe("table4.role", "'AXRole: table'");
    5252        shouldBe("table4.rowCount", "3");
    5353        shouldBe("table4.columnCount", "2");
    … …  
    5656        shouldBe("children", "2");
    5757        for (i = 0; i < children; ++i) {
    58             shouldBe("table1.childAtIndex(i).role", "'table cell'");
     58            shouldBe("table1.childAtIndex(i).role", "'AXRole: table cell'");
    5959        }
    6060        children = table2.childrenCount;
    6161        shouldBe("children", "6");
    6262        for (i = 0; i < children; ++i) {
    63             shouldBe("table2.childAtIndex(i).role", "'table cell'");
     63            shouldBe("table2.childAtIndex(i).role", "'AXRole: table cell'");
    6464        }
    6565        children = table3.childrenCount;
    6666        shouldBe("children", "2");
    6767        for (i = 0; i < children; ++i) {
    68             shouldBe("table3.childAtIndex(i).role", "'table cell'");
     68            shouldBe("table3.childAtIndex(i).role", "'AXRole: table cell'");
    6969        }
    7070        children = table4.childrenCount;
    7171        shouldBe("children", "6");
    7272        for (i = 0; i < children; ++i) {
    73             shouldBe("table4.childAtIndex(i).role", "'table cell'");
     73            shouldBe("table4.childAtIndex(i).role", "'AXRole: table cell'");
    7474        }
    7575    }

  • trunk/LayoutTests/platform/gtk/accessibility/title-and-alt-expected.txt

    r51762 r62111  
    66
    77
    8 PASS image.title is 'Image alt attr'
    9 PASS image.description is 'Image title attr'
    10 PASS link.title is ''
    11 PASS link.description is 'Link title attr'
    12 PASS entry.title is ''
    13 PASS entry.description is 'Entry title attr'
    14 PASS button.title is 'Submit'
    15 PASS button.description is 'Submit button title attr'
     8PASS image.title is 'AXTitle: Image alt attr'
     9PASS image.description is 'AXDescription: Image title attr'
     10PASS link.title is 'AXTitle: '
     11PASS link.description is 'AXDescription: Link title attr'
     12PASS entry.title is 'AXTitle: '
     13PASS entry.description is 'AXDescription: Entry title attr'
     14PASS button.title is 'AXTitle: Submit'
     15PASS button.description is 'AXDescription: Submit button title attr'
    1616PASS successfullyParsed is true
    1717

  • trunk/LayoutTests/platform/gtk/accessibility/title-and-alt.html

    r51762 r62111  
    2323
    2424        var image = webArea.childAtIndex(0);
    25         shouldBe("image.title", "'Image alt attr'");
    26         shouldBe("image.description", "'Image title attr'");
     25        shouldBe("image.title", "'AXTitle: Image alt attr'");
     26        shouldBe("image.description", "'AXDescription: Image title attr'");
    2727
    2828        var link = webArea.childAtIndex(1);
    29         shouldBe("link.title", "''");
    30         shouldBe("link.description", "'Link title attr'");
     29        shouldBe("link.title", "'AXTitle: '");
     30        shouldBe("link.description", "'AXDescription: Link title attr'");
    3131
    3232        var entry = webArea.childAtIndex(2);
    33         shouldBe("entry.title", "''");
    34         shouldBe("entry.description", "'Entry title attr'");
     33        shouldBe("entry.title", "'AXTitle: '");
     34        shouldBe("entry.description", "'AXDescription: Entry title attr'");
    3535
    3636        var button = webArea.childAtIndex(4);
    37         shouldBe("button.title", "'Submit'");
    38         shouldBe("button.description", "'Submit button title attr'");
     37        shouldBe("button.title", "'AXTitle: Submit'");
     38        shouldBe("button.description", "'AXDescription: Submit button title attr'");
    3939        }
    4040    successfullyParsed = true;

  • trunk/WebKitTools/ChangeLog

    r62110 r62111  
     12010-06-29  Mario Sanchez Prada  <msanchez@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [Gtk] Make DRT more coherent with other ports to allow reusing more tests
     6        https://bugs.webkit.org/show_bug.cgi?id=40009
     7
     8        Make sure "AXRole: ", "AXTitle: " and "AXDescription: " prefixes
     9        are used when returning those values, for coherency with other ports.
     10
     11        * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
     12        (AccessibilityUIElement::role):
     13        (AccessibilityUIElement::title):
     14        (AccessibilityUIElement::description):
     15
    1162010-06-29  Sheriff Bot  <webkit.review.bot@gmail.com>
    217

  • trunk/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp

    r61103 r62111  
    2727#include "config.h"
    2828#include "AccessibilityUIElement.h"
     29#include "GOwnPtr.h"
    2930#include "GRefPtr.h"
    3031
    … …  
    199200        return JSStringCreateWithCharacters(0, 0);
    200201
    201     return JSStringCreateWithUTF8CString(atk_role_get_name(role));
     202    const gchar* roleName = atk_role_get_name(role);
     203    GOwnPtr<gchar> axRole(g_strdup_printf("AXRole: %s", roleName));
     204
     205    return JSStringCreateWithUTF8CString(axRole.get());
    202206}
    203207
    … …  
    219223        return JSStringCreateWithCharacters(0, 0);
    220224
    221     return JSStringCreateWithUTF8CString(name);
     225    GOwnPtr<gchar> axTitle(g_strdup_printf("AXTitle: %s", name));
     226
     227    return JSStringCreateWithUTF8CString(axTitle.get());
    222228}
    223229
    … …  
    229235        return JSStringCreateWithCharacters(0, 0);
    230236
    231     return JSStringCreateWithUTF8CString(description);
     237    GOwnPtr<gchar> axDesc(g_strdup_printf("AXDescription: %s", description));
     238
     239    return JSStringCreateWithUTF8CString(axDesc.get());
    232240}
    233241
Note: See TracChangeset for help on using the changeset viewer.