From d5fc34a6c2977994356a5c0bee4678e957339069 Mon Sep 17 00:00:00 2001 From: joanmarie Date: Wed, 29 Nov 2017 08:26:32 -0800 Subject: [PATCH] Fix issues in wai-aria and core-aam tests for UIA and IAccessible2 (#8503) * wai-aria: Update assertions for UIA * core-aam: Update assertions for UIA; fix a couple of typos for IA2 --- core-aam/aria-checked_value_changes-manual.html | 4 ++-- core-aam/aria-expanded_value_changes-manual.html | 4 ++-- core-aam/aria-flowto-manual.html | 4 ++-- ...owns_may_need_manual_verification-manual.html | 10 ++-------- ...mpty_or_whitespace_characters_new-manual.html | 2 +- core-aam/aria-valuenow_value_changes-manual.html | 2 +- core-aam/progressbar-manual.html | 2 +- ...on_without_an_accessible_name_new-manual.html | 2 +- core-aam/scrollbar-manual.html | 2 +- core-aam/slider-manual.html | 2 +- core-aam/spinbutton-manual.html | 2 +- wai-aria/alertdialog_modal_false-manual.html | 2 +- wai-aria/alertdialog_modal_true-manual.html | 2 +- .../application_activedescendant-manual.html | 4 ++-- ...on_activedescendant_value_changes-manual.html | 6 +++--- wai-aria/aria-current_not_declared-manual.html | 4 ++-- .../aria-current_with_value_changes-manual.html | 6 +++--- .../aria-current_with_value_date-manual.html | 4 ++-- .../aria-current_with_value_location-manual.html | 2 +- .../aria-current_with_value_page-manual.html | 2 +- .../aria-current_with_value_step-manual.html | 2 +- .../aria-current_with_value_time-manual.html | 4 ++-- .../aria-current_with_value_true-manual.html | 2 +- ...ia-current_with_value_unspecified-manual.html | 4 ++-- ...icle_in_feed_posinset_and_setsize-manual.html | 4 ++-- wai-aria/article_in_feed_setsize_-1-manual.html | 4 ++-- ..._not_in_feed_posinset_and_setsize-manual.html | 4 ++-- wai-aria/button_haspopup_unspecified-manual.html | 8 ++++---- .../button_roledescription_empty-manual.html | 4 ++-- .../button_roledescription_valid-manual.html | 4 ++-- ...n_roledescription_whitespace_only-manual.html | 4 ++-- wai-aria/cell-manual.html | 4 ++-- wai-aria/cell_aria-colspan_2_on_div-manual.html | 4 ++-- ...ia-colspan_2_on_td_html_colspan_3-manual.html | 4 ++-- ...colspan_3_with_headers_and_border-manual.html | 4 ++-- ...lspan_3_with_three_actual_columns-manual.html | 4 ++-- ...d_with_html_colspan_not_specified-manual.html | 4 ++-- wai-aria/cell_aria-rowspan_2_on_div-manual.html | 4 ++-- ...ia-rowspan_2_on_td_html_rowspan_3-manual.html | 4 ++-- ..._rowspan_3_with_three_actual_rows-manual.html | 4 ++-- ...d_with_html_rowspan_not_specified-manual.html | 4 ++-- wai-aria/cell_colindex_4-manual.html | 4 ++-- wai-aria/cell_rowindex_4-manual.html | 4 ++-- wai-aria/checkbox_readonly_false-manual.html | 2 +- wai-aria/checkbox_readonly_true-manual.html | 2 +- .../checkbox_readonly_unspecified-manual.html | 2 +- ...olumnheader_aria-colspan_2_on_div-manual.html | 2 +- ...ia-colspan_2_on_th_html_colspan_3-manual.html | 2 +- ...lspan_3_with_three_actual_columns-manual.html | 2 +- ...h_with_html_colspan_not_specified-manual.html | 2 +- ...olumnheader_aria-rowspan_2_on_div-manual.html | 2 +- ...ia-rowspan_2_on_th_html_rowspan_3-manual.html | 2 +- ..._rowspan_3_with_three_actual_rows-manual.html | 2 +- ...h_with_html_rowspan_not_specified-manual.html | 2 +- wai-aria/columnheader_colindex_4-manual.html | 2 +- wai-aria/columnheader_rowindex_4-manual.html | 4 ++-- ...alse_not_automatically_propagated-manual.html | 2 +- ...true_not_automatically_propagated-manual.html | 2 +- wai-aria/combobox_haspopup_dialog-manual.html | 2 +- wai-aria/combobox_haspopup_false-manual.html | 2 +- wai-aria/combobox_haspopup_grid-manual.html | 2 +- wai-aria/combobox_haspopup_listbox-manual.html | 2 +- wai-aria/combobox_haspopup_menu-manual.html | 2 +- wai-aria/combobox_haspopup_tree-manual.html | 2 +- wai-aria/combobox_haspopup_true-manual.html | 2 +- .../combobox_haspopup_unspecified-manual.html | 2 +- .../combobox_orientation_horizontal-manual.html | 2 +- .../combobox_orientation_unspecified-manual.html | 12 +++++++++--- .../combobox_orientation_vertical-manual.html | 2 +- wai-aria/combobox_readonly_false-manual.html | 2 +- wai-aria/combobox_readonly_true-manual.html | 2 +- .../combobox_readonly_unspecified-manual.html | 2 +- wai-aria/dialog_modal_false-manual.html | 2 +- wai-aria/dialog_modal_true-manual.html | 2 +- wai-aria/dialog_modal_unspecified-manual.html | 2 +- ...ithout_role_roledescription_valid-manual.html | 2 +- ...rrormessage_object_in_valid_state-manual.html | 6 +++--- wai-aria/feed-manual.html | 4 ++-- wai-aria/figure-manual.html | 4 ++-- ...ly_false_automatically_propagated-manual.html | 6 +++--- ...nly_true_automatically_propagated-manual.html | 8 ++++---- wai-aria/grid_busy_false-manual.html | 2 +- wai-aria/grid_busy_true-manual.html | 2 +- wai-aria/grid_busy_value_changes-manual.html | 2 +- wai-aria/grid_colcount_8-manual.html | 2 +- .../grid_columnheader_readonly_false-manual.html | 2 +- .../grid_columnheader_readonly_true-manual.html | 2 +- ...columnheader_readonly_unspecified-manual.html | 2 +- .../grid_columnheader_required_false-manual.html | 2 +- .../grid_columnheader_required_true-manual.html | 2 +- ...columnheader_required_unspecified-manual.html | 2 +- wai-aria/grid_rowcount_3-manual.html | 2 +- .../grid_rowheader_readonly_false-manual.html | 2 +- .../grid_rowheader_readonly_true-manual.html | 2 +- ...id_rowheader_readonly_unspecified-manual.html | 2 +- .../grid_rowheader_required_false-manual.html | 2 +- .../grid_rowheader_required_true-manual.html | 2 +- ...id_rowheader_required_unspecified-manual.html | 2 +- .../gridcell_aria-colspan_2_on_div-manual.html | 2 +- .../gridcell_aria-rowspan_2_on_div-manual.html | 2 +- wai-aria/gridcell_colindex_4-manual.html | 2 +- wai-aria/gridcell_rowindex_4-manual.html | 2 +- ...en_undefined_element_not_rendered-manual.html | 10 +++++----- ...hidden_undefined_element_rendered-manual.html | 2 +- wai-aria/heading_level_unspecified-manual.html | 6 +++--- .../keyshortcuts_multiple_shortcuts-manual.html | 2 +- wai-aria/keyshortcuts_one_shortcut-manual.html | 2 +- wai-aria/listbox_busy_false-manual.html | 2 +- wai-aria/listbox_busy_true-manual.html | 2 +- .../listbox_orientation_horizontal-manual.html | 2 +- .../listbox_orientation_unspecified-manual.html | 2 +- .../listbox_orientation_vertical-manual.html | 2 +- wai-aria/listbox_readonly_false-manual.html | 2 +- wai-aria/listbox_readonly_true-manual.html | 2 +- .../listbox_readonly_unspecified-manual.html | 2 +- wai-aria/listitem_setsize_-1-manual.html | 4 ++-- wai-aria/menu_orientation_horizontal-manual.html | 2 +- .../menu_orientation_unspecified-manual.html | 2 +- wai-aria/menu_orientation_vertical-manual.html | 2 +- wai-aria/menubar_busy_false-manual.html | 2 +- wai-aria/menubar_busy_true-manual.html | 2 +- .../menubar_orientation_horizontal-manual.html | 2 +- .../menubar_orientation_unspecified-manual.html | 2 +- .../menubar_orientation_vertical-manual.html | 2 +- .../menuitem_posinset_and_setsize-manual.html | 4 ++-- ...itemcheckbox_posinset_and_setsize-manual.html | 4 ++-- .../menuitemcheckbox_readonly_false-manual.html | 2 +- .../menuitemcheckbox_readonly_true-manual.html | 2 +- ...itemcheckbox_readonly_unspecified-manual.html | 2 +- ...enuitemradio_posinset_and_setsize-manual.html | 4 ++-- .../menuitemradio_readonly_false-manual.html | 4 ++-- wai-aria/menuitemradio_readonly_true-manual.html | 4 ++-- ...enuitemradio_readonly_unspecified-manual.html | 4 ++-- wai-aria/none-manual.html | 10 +++++----- wai-aria/option_selected_false-manual.html | 2 +- wai-aria/option_selected_true-manual.html | 2 +- wai-aria/option_selected_undefined-manual.html | 2 +- ...radiogroup_orientation_horizontal-manual.html | 2 +- ...adiogroup_orientation_unspecified-manual.html | 2 +- .../radiogroup_orientation_vertical-manual.html | 2 +- wai-aria/radiogroup_readonly_false-manual.html | 2 +- wai-aria/radiogroup_readonly_true-manual.html | 2 +- .../radiogroup_readonly_unspecified-manual.html | 2 +- wai-aria/row_colindex_4-manual.html | 16 +++++++++++++++- wai-aria/row_rowindex_4-manual.html | 16 +++++++++++++++- .../rowheader_aria-colspan_2_on_div-manual.html | 2 +- .../rowheader_aria-rowspan_2_on_div-manual.html | 2 +- wai-aria/rowheader_colindex_4-manual.html | 2 +- wai-aria/rowheader_rowindex_4-manual.html | 4 ++-- ...alse_not_automatically_propagated-manual.html | 2 +- ...true_not_automatically_propagated-manual.html | 2 +- .../scrollbar_all_values_unspecified-manual.html | 2 +- ...rollbar_only_valuenow_unspecified-manual.html | 2 +- ...scrollbar_orientation_unspecified-manual.html | 4 ++-- wai-aria/searchbox-manual.html | 4 ++-- wai-aria/searchbox_activedescendant-manual.html | 4 ++-- ...ox_activedescendant_value_changes-manual.html | 6 +++--- ...earchbox_autocomplete_unspecified-manual.html | 2 +- wai-aria/searchbox_multiline_false-manual.html | 4 ++-- wai-aria/searchbox_multiline_true-manual.html | 10 +++++----- .../searchbox_multiline_unspecified-manual.html | 4 ++-- wai-aria/searchbox_placeholder-manual.html | 4 ++-- wai-aria/searchbox_readonly_false-manual.html | 4 ++-- wai-aria/searchbox_readonly_true-manual.html | 4 ++-- .../searchbox_readonly_unspecified-manual.html | 4 ++-- wai-aria/searchbox_required_false-manual.html | 4 ++-- wai-aria/searchbox_required_true-manual.html | 4 ++-- .../searchbox_required_unspecified-manual.html | 4 ++-- ..._focusable_all_values_unspecified-manual.html | 2 +- ...cusable_only_valuenow_unspecified-manual.html | 2 +- .../separator_focusable_valuetext-manual.html | 8 +------- ...separator_orientation_unspecified-manual.html | 2 +- ...nfocusable_all_values_unspecified-manual.html | 2 +- .../separator_unfocusable_valuetext-manual.html | 4 ++-- .../slider_all_values_unspecified-manual.html | 2 +- .../slider_only_valuenow_unspecified-manual.html | 2 +- .../slider_orientation_unspecified-manual.html | 4 ++-- wai-aria/slider_readonly_false-manual.html | 2 +- wai-aria/slider_readonly_true-manual.html | 2 +- wai-aria/slider_readonly_unspecified-manual.html | 2 +- ...spinbutton_all_values_unspecified-manual.html | 2 +- ...on_only_aria-valuenow_unspecified-manual.html | 2 +- wai-aria/spinbutton_readonly_false-manual.html | 2 +- wai-aria/spinbutton_readonly_true-manual.html | 2 +- .../spinbutton_readonly_unspecified-manual.html | 2 +- wai-aria/switch_checked_false-manual.html | 4 ++-- wai-aria/switch_checked_mixed-manual.html | 4 ++-- wai-aria/switch_checked_true-manual.html | 4 ++-- wai-aria/switch_checked_undefined-manual.html | 4 ++-- .../switch_checked_value_changes-manual.html | 6 +++--- wai-aria/switch_readonly_false-manual.html | 4 ++-- wai-aria/switch_readonly_true-manual.html | 4 ++-- wai-aria/switch_readonly_unspecified-manual.html | 4 ++-- wai-aria/tab_posinset_and_setsize-manual.html | 4 ++-- wai-aria/table_colcount_-1-manual.html | 2 +- wai-aria/table_colcount_8-manual.html | 2 +- wai-aria/table_rowcount_-1-manual.html | 2 +- wai-aria/table_rowcount_3-manual.html | 2 +- .../tablist_orientation_horizontal-manual.html | 2 +- .../tablist_orientation_unspecified-manual.html | 2 +- .../tablist_orientation_vertical-manual.html | 2 +- wai-aria/term_role-manual.html | 4 ++-- wai-aria/textbox_placeholder-manual.html | 2 +- .../toolbar_orientation_horizontal-manual.html | 2 +- .../toolbar_orientation_unspecified-manual.html | 2 +- .../toolbar_orientation_vertical-manual.html | 2 +- wai-aria/tree_orientation_horizontal-manual.html | 2 +- .../tree_orientation_unspecified-manual.html | 2 +- wai-aria/tree_orientation_vertical-manual.html | 2 +- wai-aria/treegrid_colcount_8-manual.html | 2 +- .../treegrid_orientation_horizontal-manual.html | 2 +- .../treegrid_orientation_unspecified-manual.html | 2 +- .../treegrid_orientation_vertical-manual.html | 2 +- wai-aria/treegrid_rowcount_3-manual.html | 2 +- wai-aria/treeitem_selected_false-manual.html | 2 +- wai-aria/treeitem_selected_true-manual.html | 2 +- wai-aria/treeitem_selected_undefined-manual.html | 2 +- 217 files changed, 346 insertions(+), 324 deletions(-) diff --git a/core-aam/aria-checked_value_changes-manual.html b/core-aam/aria-checked_value_changes-manual.html index e3fb333573917d..5de5e8a11117b6 100644 --- a/core-aam/aria-checked_value_changes-manual.html +++ b/core-aam/aria-checked_value_changes-manual.html @@ -59,7 +59,7 @@ "event", "type", "is", - "TBD" + "TogglePattern.ToggleStateProperty" ] ] }, @@ -111,7 +111,7 @@ "event", "type", "is", - "TBD" + "TogglePattern.ToggleStateProperty" ] ] }, diff --git a/core-aam/aria-expanded_value_changes-manual.html b/core-aam/aria-expanded_value_changes-manual.html index 873094b47add30..e8f58d2dec0812 100644 --- a/core-aam/aria-expanded_value_changes-manual.html +++ b/core-aam/aria-expanded_value_changes-manual.html @@ -65,7 +65,7 @@ "event", "type", "is", - "TBD" + "ExpandCollapsePattern.ExpandCollapseStateProperty" ] ] }, @@ -123,7 +123,7 @@ "event", "type", "is", - "TBD" + "ExpandCollapsePattern.ExpandCollapseStateProperty" ] ] }, diff --git a/core-aam/aria-flowto-manual.html b/core-aam/aria-flowto-manual.html index f8e55a4b05f581..23816319bc61ed 100644 --- a/core-aam/aria-flowto-manual.html +++ b/core-aam/aria-flowto-manual.html @@ -36,7 +36,7 @@ "IAccessible2" : [ [ "relation", - "IA2_RELATION_FLOW_TO", + "IA2_RELATION_FLOWS_TO", "is", "[next]" ] @@ -67,7 +67,7 @@ "IAccessible2" : [ [ "relation", - "IA2_RELATION_FLOW_FROM", + "IA2_RELATION_FLOWS_FROM", "is", "[test]" ] diff --git a/core-aam/aria-owns_may_need_manual_verification-manual.html b/core-aam/aria-owns_may_need_manual_verification-manual.html index 9510432fa546a3..b7752c3d6e4d95 100644 --- a/core-aam/aria-owns_may_need_manual_verification-manual.html +++ b/core-aam/aria-owns_may_need_manual_verification-manual.html @@ -44,15 +44,9 @@ "UIA" : [ [ "property", - "TBD", + "Children", "is", - "owned1" - ], - [ - "property", - "TBD", - "is", - "owned2" + "[owned1, owned2]" ] ] }, diff --git a/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html b/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html index 0703399e4d0de6..88fb7a8ea80a72 100644 --- a/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html +++ b/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html @@ -28,7 +28,7 @@ "UIA" : [ [ "property", - "Localized Control Type", + "Localized ControlType", "is", "Group" ] diff --git a/core-aam/aria-valuenow_value_changes-manual.html b/core-aam/aria-valuenow_value_changes-manual.html index ad3d18693e8579..6ef4f522e9aac1 100644 --- a/core-aam/aria-valuenow_value_changes-manual.html +++ b/core-aam/aria-valuenow_value_changes-manual.html @@ -53,7 +53,7 @@ "event", "type", "is", - "TBD" + "ValuePattern.ValueProperty" ] ] }, diff --git a/core-aam/progressbar-manual.html b/core-aam/progressbar-manual.html index a336fa08607133..3d3639254ab0ba 100644 --- a/core-aam/progressbar-manual.html +++ b/core-aam/progressbar-manual.html @@ -62,7 +62,7 @@ "property", "interfaces", "contains", - "IAcesssibleValue" + "IAccessibleValue" ] ], "MSAA" : [ diff --git a/core-aam/region_without_an_accessible_name_new-manual.html b/core-aam/region_without_an_accessible_name_new-manual.html index 05ca5e7b080302..f3b41f0ab582d8 100644 --- a/core-aam/region_without_an_accessible_name_new-manual.html +++ b/core-aam/region_without_an_accessible_name_new-manual.html @@ -56,7 +56,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Group" ] diff --git a/core-aam/scrollbar-manual.html b/core-aam/scrollbar-manual.html index 3b4b5ff172547b..2d1e400b179501 100644 --- a/core-aam/scrollbar-manual.html +++ b/core-aam/scrollbar-manual.html @@ -56,7 +56,7 @@ "property", "interfaces", "contains", - "IAcesssibleValue" + "IAccessibleValue" ] ], "MSAA" : [ diff --git a/core-aam/slider-manual.html b/core-aam/slider-manual.html index d0613e65a840eb..687ae799e3ca94 100644 --- a/core-aam/slider-manual.html +++ b/core-aam/slider-manual.html @@ -56,7 +56,7 @@ "property", "interfaces", "contains", - "IAcesssibleValue" + "IAccessibleValue" ] ], "MSAA" : [ diff --git a/core-aam/spinbutton-manual.html b/core-aam/spinbutton-manual.html index 80f3f24dece839..568faf3135d295 100644 --- a/core-aam/spinbutton-manual.html +++ b/core-aam/spinbutton-manual.html @@ -56,7 +56,7 @@ "property", "interfaces", "contains", - "IAcesssibleValue" + "IAccessibleValue" ] ], "MSAA" : [ diff --git a/wai-aria/alertdialog_modal_false-manual.html b/wai-aria/alertdialog_modal_false-manual.html index 6dd2cee71c013e..5a5829e924e73d 100644 --- a/wai-aria/alertdialog_modal_false-manual.html +++ b/wai-aria/alertdialog_modal_false-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], diff --git a/wai-aria/alertdialog_modal_true-manual.html b/wai-aria/alertdialog_modal_true-manual.html index 5ff5660f0517b8..b86bcae6c9ff81 100644 --- a/wai-aria/alertdialog_modal_true-manual.html +++ b/wai-aria/alertdialog_modal_true-manual.html @@ -56,7 +56,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], diff --git a/wai-aria/application_activedescendant-manual.html b/wai-aria/application_activedescendant-manual.html index 5a103d92939f5e..4e256bd51e6f48 100644 --- a/wai-aria/application_activedescendant-manual.html +++ b/wai-aria/application_activedescendant-manual.html @@ -92,13 +92,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "application" ], diff --git a/wai-aria/application_activedescendant_value_changes-manual.html b/wai-aria/application_activedescendant_value_changes-manual.html index 04260aab7a8517..b852323603022d 100644 --- a/wai-aria/application_activedescendant_value_changes-manual.html +++ b/wai-aria/application_activedescendant_value_changes-manual.html @@ -87,7 +87,7 @@ "event", "type", "is", - "IA2_EVENT_ACTIVE_DESCENDANT_CHANGED" + "EVENT_OBJECT_FOCUS" ] ], "MSAA" : [ @@ -113,13 +113,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "application" ], diff --git a/wai-aria/aria-current_not_declared-manual.html b/wai-aria/aria-current_not_declared-manual.html index 25cf95c9417e66..471e718c2ecc50 100644 --- a/wai-aria/aria-current_not_declared-manual.html +++ b/wai-aria/aria-current_not_declared-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "role", + "ControlType", "is", "ListItem" ], @@ -90,7 +90,7 @@ "property", "current", "is", - "false" + "" ] ] }, diff --git a/wai-aria/aria-current_with_value_changes-manual.html b/wai-aria/aria-current_with_value_changes-manual.html index f4297f1fb67bc8..84e0b60f60d077 100644 --- a/wai-aria/aria-current_with_value_changes-manual.html +++ b/wai-aria/aria-current_with_value_changes-manual.html @@ -75,9 +75,9 @@ "UIA" : [ [ "property", - "objectAttributes", - "contains", - "current:false" + "current", + "is", + "false" ], [ "event", diff --git a/wai-aria/aria-current_with_value_date-manual.html b/wai-aria/aria-current_with_value_date-manual.html index 8f4cb42ac73091..0438ef5d280287 100644 --- a/wai-aria/aria-current_with_value_date-manual.html +++ b/wai-aria/aria-current_with_value_date-manual.html @@ -82,8 +82,8 @@ "UIA" : [ [ "property", - "role", - "is", + "controlPatterns", + "contains", "TableItem" ], [ diff --git a/wai-aria/aria-current_with_value_location-manual.html b/wai-aria/aria-current_with_value_location-manual.html index 4e4444319e7036..aac8e63f7872da 100644 --- a/wai-aria/aria-current_with_value_location-manual.html +++ b/wai-aria/aria-current_with_value_location-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "role", + "ControlType", "is", "Image" ], diff --git a/wai-aria/aria-current_with_value_page-manual.html b/wai-aria/aria-current_with_value_page-manual.html index d8fe5a41d644fa..4ff50ac1b405b4 100644 --- a/wai-aria/aria-current_with_value_page-manual.html +++ b/wai-aria/aria-current_with_value_page-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "role", + "ControlType", "is", "HyperLink" ], diff --git a/wai-aria/aria-current_with_value_step-manual.html b/wai-aria/aria-current_with_value_step-manual.html index 4b730e7fd4b8b7..812ec03685495d 100644 --- a/wai-aria/aria-current_with_value_step-manual.html +++ b/wai-aria/aria-current_with_value_step-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "role", + "ControlType", "is", "HyperLink" ], diff --git a/wai-aria/aria-current_with_value_time-manual.html b/wai-aria/aria-current_with_value_time-manual.html index ae78d8348ecc96..3362af00dd645e 100644 --- a/wai-aria/aria-current_with_value_time-manual.html +++ b/wai-aria/aria-current_with_value_time-manual.html @@ -82,8 +82,8 @@ "UIA" : [ [ "property", - "role", - "is", + "controlPatterns", + "contains", "TableItem" ], [ diff --git a/wai-aria/aria-current_with_value_true-manual.html b/wai-aria/aria-current_with_value_true-manual.html index 57dcf29c6d7b7e..bf7377705d7c1b 100644 --- a/wai-aria/aria-current_with_value_true-manual.html +++ b/wai-aria/aria-current_with_value_true-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "role", + "ControlType", "is", "ListItem" ], diff --git a/wai-aria/aria-current_with_value_unspecified-manual.html b/wai-aria/aria-current_with_value_unspecified-manual.html index 74486b8d180235..271c085eb353bd 100644 --- a/wai-aria/aria-current_with_value_unspecified-manual.html +++ b/wai-aria/aria-current_with_value_unspecified-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "role", + "ControlType", "is", "ListItem" ], @@ -84,7 +84,7 @@ "property", "current", "is", - "false" + "" ] ] }, diff --git a/wai-aria/article_in_feed_posinset_and_setsize-manual.html b/wai-aria/article_in_feed_posinset_and_setsize-manual.html index d7145bda6e736e..ff960795b40e26 100644 --- a/wai-aria/article_in_feed_posinset_and_setsize-manual.html +++ b/wai-aria/article_in_feed_posinset_and_setsize-manual.html @@ -124,13 +124,13 @@ "UIA" : [ [ "property", - "control type", + "ControlType", "is", "Group" ], [ "property", - "localize control type", + "LocalizedControlType", "is", "article" ], diff --git a/wai-aria/article_in_feed_setsize_-1-manual.html b/wai-aria/article_in_feed_setsize_-1-manual.html index 0c270171373135..dd87dc5d87408b 100644 --- a/wai-aria/article_in_feed_setsize_-1-manual.html +++ b/wai-aria/article_in_feed_setsize_-1-manual.html @@ -100,13 +100,13 @@ "UIA" : [ [ "property", - "control type", + "ControlType", "is", "Group" ], [ "property", - "localize control type", + "LocalizedControlType", "is", "article" ], diff --git a/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html b/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html index ab45edccd4e7c1..57e92c1ebcf3c4 100644 --- a/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html +++ b/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html @@ -130,13 +130,13 @@ "UIA" : [ [ "property", - "control type", + "ControlType", "is", "Group" ], [ "property", - "localize control type", + "LocalizedControlType", "is", "article" ], diff --git a/wai-aria/button_haspopup_unspecified-manual.html b/wai-aria/button_haspopup_unspecified-manual.html index b03efadce13b48..5dd9371203ca6f 100644 --- a/wai-aria/button_haspopup_unspecified-manual.html +++ b/wai-aria/button_haspopup_unspecified-manual.html @@ -99,10 +99,10 @@ "Button" ], [ - "Control Pattern", - "ExpandCollapse", - "exists", - "false" + "property", + "controlPatterns", + "doesNotContain", + "ExpandCollapse" ] ] }, diff --git a/wai-aria/button_roledescription_empty-manual.html b/wai-aria/button_roledescription_empty-manual.html index 0de1df2566c9e8..5695dff804eb1a 100644 --- a/wai-aria/button_roledescription_empty-manual.html +++ b/wai-aria/button_roledescription_empty-manual.html @@ -70,13 +70,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "Button" ] diff --git a/wai-aria/button_roledescription_valid-manual.html b/wai-aria/button_roledescription_valid-manual.html index a3ffbc08f92e2a..34cbc9ed8ae5ec 100644 --- a/wai-aria/button_roledescription_valid-manual.html +++ b/wai-aria/button_roledescription_valid-manual.html @@ -70,13 +70,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "SassyButton" ] diff --git a/wai-aria/button_roledescription_whitespace_only-manual.html b/wai-aria/button_roledescription_whitespace_only-manual.html index 8edd5b99acd473..a213ed3b403d2e 100644 --- a/wai-aria/button_roledescription_whitespace_only-manual.html +++ b/wai-aria/button_roledescription_whitespace_only-manual.html @@ -70,13 +70,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "Button" ] diff --git a/wai-aria/cell-manual.html b/wai-aria/cell-manual.html index f7ea0688562cb4..fad0e8804ceaf4 100644 --- a/wai-aria/cell-manual.html +++ b/wai-aria/cell-manual.html @@ -161,9 +161,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-colspan_2_on_div-manual.html b/wai-aria/cell_aria-colspan_2_on_div-manual.html index 88168fc8651188..a9b83ff49f4648 100644 --- a/wai-aria/cell_aria-colspan_2_on_div-manual.html +++ b/wai-aria/cell_aria-colspan_2_on_div-manual.html @@ -82,9 +82,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html index 38b7c4c5869e43..c225ab3936952c 100644 --- a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html +++ b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html @@ -76,9 +76,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html index b859a1d2010df1..5730d157f525a6 100644 --- a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html +++ b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html @@ -76,9 +76,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html index 76a7f2967e4ebd..b2a1901da851c7 100644 --- a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html +++ b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html @@ -70,9 +70,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html b/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html index 182eefb0df352f..980f5008bb12db 100644 --- a/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html +++ b/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html @@ -82,9 +82,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-rowspan_2_on_div-manual.html b/wai-aria/cell_aria-rowspan_2_on_div-manual.html index d32621b74c000e..4abd0de0b29757 100644 --- a/wai-aria/cell_aria-rowspan_2_on_div-manual.html +++ b/wai-aria/cell_aria-rowspan_2_on_div-manual.html @@ -82,9 +82,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html index 949af2787f6b03..356911e720945f 100644 --- a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html +++ b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html @@ -76,9 +76,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html index a34f7a1bb3a67e..0fed9aedeedb89 100644 --- a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html +++ b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html @@ -70,9 +70,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html b/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html index c257e787b67cf3..e9c5bd712c8e34 100644 --- a/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html +++ b/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html @@ -82,9 +82,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_colindex_4-manual.html b/wai-aria/cell_colindex_4-manual.html index 78769af1b54ee3..0c3895af164645 100644 --- a/wai-aria/cell_colindex_4-manual.html +++ b/wai-aria/cell_colindex_4-manual.html @@ -82,9 +82,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/cell_rowindex_4-manual.html b/wai-aria/cell_rowindex_4-manual.html index b4ff29775a6410..14a9247ff66049 100644 --- a/wai-aria/cell_rowindex_4-manual.html +++ b/wai-aria/cell_rowindex_4-manual.html @@ -76,9 +76,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "TableItem" + "DataItem" ], [ "property", diff --git a/wai-aria/checkbox_readonly_false-manual.html b/wai-aria/checkbox_readonly_false-manual.html index 59e25a6136cad0..dcb1a8b1f6cbb1 100644 --- a/wai-aria/checkbox_readonly_false-manual.html +++ b/wai-aria/checkbox_readonly_false-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Checkbox" ], diff --git a/wai-aria/checkbox_readonly_true-manual.html b/wai-aria/checkbox_readonly_true-manual.html index e73f898f202285..6718fada7a5a47 100644 --- a/wai-aria/checkbox_readonly_true-manual.html +++ b/wai-aria/checkbox_readonly_true-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Checkbox" ], diff --git a/wai-aria/checkbox_readonly_unspecified-manual.html b/wai-aria/checkbox_readonly_unspecified-manual.html index 73a3b93fc24f24..f8de2099e3f680 100644 --- a/wai-aria/checkbox_readonly_unspecified-manual.html +++ b/wai-aria/checkbox_readonly_unspecified-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Checkbox" ], diff --git a/wai-aria/columnheader_aria-colspan_2_on_div-manual.html b/wai-aria/columnheader_aria-colspan_2_on_div-manual.html index 7b151c522097d4..1797d47a91c6dc 100644 --- a/wai-aria/columnheader_aria-colspan_2_on_div-manual.html +++ b/wai-aria/columnheader_aria-colspan_2_on_div-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html index 51824ee40d6a07..586ff2982d49c5 100644 --- a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html +++ b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html index a26daed405e5a2..fa7bf0bed719a9 100644 --- a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html +++ b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html b/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html index 44d11c1d7e686b..453ff96664156e 100644 --- a/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html +++ b/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html index cae113bace440a..e3431e42b88f5a 100644 --- a/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html +++ b/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html index efff45ff7668db..e7dee718673604 100644 --- a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html +++ b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html index 3d964edb0363db..25d827e85d4573 100644 --- a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html +++ b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html index f2298d0cc04eb5..a029e6b600df71 100644 --- a/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html +++ b/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_colindex_4-manual.html b/wai-aria/columnheader_colindex_4-manual.html index c48e5f168f49a7..d8d0587845fd06 100644 --- a/wai-aria/columnheader_colindex_4-manual.html +++ b/wai-aria/columnheader_colindex_4-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/columnheader_rowindex_4-manual.html b/wai-aria/columnheader_rowindex_4-manual.html index 1e45ca31e3dc83..665d344dc3811f 100644 --- a/wai-aria/columnheader_rowindex_4-manual.html +++ b/wai-aria/columnheader_rowindex_4-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], @@ -102,7 +102,7 @@

This test examines the ARIA properties for columnheader rowindex 4.

-
test cell
+
test cell
diff --git a/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html b/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html index 4a905976a9a117..92cfc2e753c237 100644 --- a/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html +++ b/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html b/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html index 8d000b17e0d5b2..32ce45ca7a2644 100644 --- a/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html +++ b/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/combobox_haspopup_dialog-manual.html b/wai-aria/combobox_haspopup_dialog-manual.html index 4a52872e950c76..4d985a34e44272 100644 --- a/wai-aria/combobox_haspopup_dialog-manual.html +++ b/wai-aria/combobox_haspopup_dialog-manual.html @@ -118,7 +118,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_false-manual.html b/wai-aria/combobox_haspopup_false-manual.html index 5a6036ad7ecf6c..5bfcb9fbecf383 100644 --- a/wai-aria/combobox_haspopup_false-manual.html +++ b/wai-aria/combobox_haspopup_false-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_grid-manual.html b/wai-aria/combobox_haspopup_grid-manual.html index a68ce448308c77..76ad36ee87a3c1 100644 --- a/wai-aria/combobox_haspopup_grid-manual.html +++ b/wai-aria/combobox_haspopup_grid-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_listbox-manual.html b/wai-aria/combobox_haspopup_listbox-manual.html index 4d97620623d2ae..135459591fb3dd 100644 --- a/wai-aria/combobox_haspopup_listbox-manual.html +++ b/wai-aria/combobox_haspopup_listbox-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_menu-manual.html b/wai-aria/combobox_haspopup_menu-manual.html index 8be6b44892d1db..85faaf317b154a 100644 --- a/wai-aria/combobox_haspopup_menu-manual.html +++ b/wai-aria/combobox_haspopup_menu-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_tree-manual.html b/wai-aria/combobox_haspopup_tree-manual.html index 546e42658c89e5..ea2d91680b5e94 100644 --- a/wai-aria/combobox_haspopup_tree-manual.html +++ b/wai-aria/combobox_haspopup_tree-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_true-manual.html b/wai-aria/combobox_haspopup_true-manual.html index 5f3240412224cb..f087508a5c3904 100644 --- a/wai-aria/combobox_haspopup_true-manual.html +++ b/wai-aria/combobox_haspopup_true-manual.html @@ -118,7 +118,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_haspopup_unspecified-manual.html b/wai-aria/combobox_haspopup_unspecified-manual.html index f2d3599d02d7fe..a60e9a1ef02640 100644 --- a/wai-aria/combobox_haspopup_unspecified-manual.html +++ b/wai-aria/combobox_haspopup_unspecified-manual.html @@ -118,7 +118,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_orientation_horizontal-manual.html b/wai-aria/combobox_orientation_horizontal-manual.html index 1d173cde0b0a2d..3831f41d9d0867 100644 --- a/wai-aria/combobox_orientation_horizontal-manual.html +++ b/wai-aria/combobox_orientation_horizontal-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_orientation_unspecified-manual.html b/wai-aria/combobox_orientation_unspecified-manual.html index a31cce50961adf..b37568df299b26 100644 --- a/wai-aria/combobox_orientation_unspecified-manual.html +++ b/wai-aria/combobox_orientation_unspecified-manual.html @@ -88,15 +88,21 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], [ "property", "IUIAutomationElement.Orientation", - "is", - "null" + "isNot", + "vertical" + ], + [ + "property", + "IUIAutomationElement.Orientation", + "isNot", + "horizontal" ] ] }, diff --git a/wai-aria/combobox_orientation_vertical-manual.html b/wai-aria/combobox_orientation_vertical-manual.html index 40e131e7326ebc..a1a0b83e26894b 100644 --- a/wai-aria/combobox_orientation_vertical-manual.html +++ b/wai-aria/combobox_orientation_vertical-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_readonly_false-manual.html b/wai-aria/combobox_readonly_false-manual.html index 476bf2f0e84a1c..4a87a4cb896400 100644 --- a/wai-aria/combobox_readonly_false-manual.html +++ b/wai-aria/combobox_readonly_false-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_readonly_true-manual.html b/wai-aria/combobox_readonly_true-manual.html index a7484763f36860..6f2872adfa8575 100644 --- a/wai-aria/combobox_readonly_true-manual.html +++ b/wai-aria/combobox_readonly_true-manual.html @@ -118,7 +118,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/combobox_readonly_unspecified-manual.html b/wai-aria/combobox_readonly_unspecified-manual.html index 1ee51e58460a36..86926586cdb9d1 100644 --- a/wai-aria/combobox_readonly_unspecified-manual.html +++ b/wai-aria/combobox_readonly_unspecified-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Combobox" ], diff --git a/wai-aria/dialog_modal_false-manual.html b/wai-aria/dialog_modal_false-manual.html index 254dbe56c4b146..d78f21f5db379a 100644 --- a/wai-aria/dialog_modal_false-manual.html +++ b/wai-aria/dialog_modal_false-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], diff --git a/wai-aria/dialog_modal_true-manual.html b/wai-aria/dialog_modal_true-manual.html index 2ce3fe6cd14a9e..a58a88f243060f 100644 --- a/wai-aria/dialog_modal_true-manual.html +++ b/wai-aria/dialog_modal_true-manual.html @@ -56,7 +56,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], diff --git a/wai-aria/dialog_modal_unspecified-manual.html b/wai-aria/dialog_modal_unspecified-manual.html index 80366a6914b162..117969b16ee91d 100644 --- a/wai-aria/dialog_modal_unspecified-manual.html +++ b/wai-aria/dialog_modal_unspecified-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Pane" ], diff --git a/wai-aria/div_element_without_role_roledescription_valid-manual.html b/wai-aria/div_element_without_role_roledescription_valid-manual.html index 091c034897816a..7e9b9fc7515dfd 100644 --- a/wai-aria/div_element_without_role_roledescription_valid-manual.html +++ b/wai-aria/div_element_without_role_roledescription_valid-manual.html @@ -100,7 +100,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Group" ] diff --git a/wai-aria/errormessage_object_in_valid_state-manual.html b/wai-aria/errormessage_object_in_valid_state-manual.html index ccad458b4c6046..5845479e556910 100644 --- a/wai-aria/errormessage_object_in_valid_state-manual.html +++ b/wai-aria/errormessage_object_in_valid_state-manual.html @@ -38,15 +38,15 @@ "property", "relations", "doesNotContain", - "IA2_RELATION_ERROR_MESSAGE" + "IA2_RELATION_ERROR" ] ], "UIA" : [ [ "property", "IUIAutomationElement.ControllerFor", - "exists", - "false" + "is", + "" ] ] }, diff --git a/wai-aria/feed-manual.html b/wai-aria/feed-manual.html index ad9f1da823ce03..ddb684f4767b35 100644 --- a/wai-aria/feed-manual.html +++ b/wai-aria/feed-manual.html @@ -70,13 +70,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Group" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "feed" ] diff --git a/wai-aria/figure-manual.html b/wai-aria/figure-manual.html index 511168685d5f9b..619978ffad7520 100644 --- a/wai-aria/figure-manual.html +++ b/wai-aria/figure-manual.html @@ -70,13 +70,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Group" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "figure" ] diff --git a/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html b/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html index 3676a10c0927ee..21663a7f010b5f 100644 --- a/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html +++ b/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], @@ -145,7 +145,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], @@ -208,7 +208,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html b/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html index 0be4cb43175fbe..722d367d994a54 100644 --- a/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html +++ b/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], @@ -84,7 +84,7 @@ "property", "controlPatterns", "contains", - "selectionitem" + "SelectionItem" ], [ "property", @@ -145,7 +145,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], @@ -208,7 +208,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_busy_false-manual.html b/wai-aria/grid_busy_false-manual.html index 1a9572ce8003ad..68376ef95ed899 100644 --- a/wai-aria/grid_busy_false-manual.html +++ b/wai-aria/grid_busy_false-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/grid_busy_true-manual.html b/wai-aria/grid_busy_true-manual.html index 37c79ad19d3670..873f5730905452 100644 --- a/wai-aria/grid_busy_true-manual.html +++ b/wai-aria/grid_busy_true-manual.html @@ -106,7 +106,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/grid_busy_value_changes-manual.html b/wai-aria/grid_busy_value_changes-manual.html index 37529516f6d810..ad65db939e7107 100644 --- a/wai-aria/grid_busy_value_changes-manual.html +++ b/wai-aria/grid_busy_value_changes-manual.html @@ -149,7 +149,7 @@ ], [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/grid_colcount_8-manual.html b/wai-aria/grid_colcount_8-manual.html index 506417259091d1..624c1d21a79c7e 100644 --- a/wai-aria/grid_colcount_8-manual.html +++ b/wai-aria/grid_colcount_8-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/grid_columnheader_readonly_false-manual.html b/wai-aria/grid_columnheader_readonly_false-manual.html index 6ff7fe3ab20d64..79f4c82e39fd21 100644 --- a/wai-aria/grid_columnheader_readonly_false-manual.html +++ b/wai-aria/grid_columnheader_readonly_false-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_columnheader_readonly_true-manual.html b/wai-aria/grid_columnheader_readonly_true-manual.html index d90852a8bff2f5..4ef4e7d45a9eb7 100644 --- a/wai-aria/grid_columnheader_readonly_true-manual.html +++ b/wai-aria/grid_columnheader_readonly_true-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_columnheader_readonly_unspecified-manual.html b/wai-aria/grid_columnheader_readonly_unspecified-manual.html index 35910c361ff91f..bf9c24ba362545 100644 --- a/wai-aria/grid_columnheader_readonly_unspecified-manual.html +++ b/wai-aria/grid_columnheader_readonly_unspecified-manual.html @@ -62,7 +62,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_columnheader_required_false-manual.html b/wai-aria/grid_columnheader_required_false-manual.html index 45a5002d2377bd..f6736756c193fb 100644 --- a/wai-aria/grid_columnheader_required_false-manual.html +++ b/wai-aria/grid_columnheader_required_false-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_columnheader_required_true-manual.html b/wai-aria/grid_columnheader_required_true-manual.html index 41c936f443c1e7..c810369cf667dc 100644 --- a/wai-aria/grid_columnheader_required_true-manual.html +++ b/wai-aria/grid_columnheader_required_true-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_columnheader_required_unspecified-manual.html b/wai-aria/grid_columnheader_required_unspecified-manual.html index feeef96e38ab57..c9d83d2358b61a 100644 --- a/wai-aria/grid_columnheader_required_unspecified-manual.html +++ b/wai-aria/grid_columnheader_required_unspecified-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_rowcount_3-manual.html b/wai-aria/grid_rowcount_3-manual.html index 6a4b1408df31e4..ed92788e57d161 100644 --- a/wai-aria/grid_rowcount_3-manual.html +++ b/wai-aria/grid_rowcount_3-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/grid_rowheader_readonly_false-manual.html b/wai-aria/grid_rowheader_readonly_false-manual.html index d7e923f7cc0919..a099315b40495d 100644 --- a/wai-aria/grid_rowheader_readonly_false-manual.html +++ b/wai-aria/grid_rowheader_readonly_false-manual.html @@ -62,7 +62,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_rowheader_readonly_true-manual.html b/wai-aria/grid_rowheader_readonly_true-manual.html index 62351e008bc6c4..67b1004b1681ac 100644 --- a/wai-aria/grid_rowheader_readonly_true-manual.html +++ b/wai-aria/grid_rowheader_readonly_true-manual.html @@ -62,7 +62,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_rowheader_readonly_unspecified-manual.html b/wai-aria/grid_rowheader_readonly_unspecified-manual.html index 18152526b05ed7..694e65699e9bb5 100644 --- a/wai-aria/grid_rowheader_readonly_unspecified-manual.html +++ b/wai-aria/grid_rowheader_readonly_unspecified-manual.html @@ -62,7 +62,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_rowheader_required_false-manual.html b/wai-aria/grid_rowheader_required_false-manual.html index 92aab07bbb4e14..ffd30ccdd708b6 100644 --- a/wai-aria/grid_rowheader_required_false-manual.html +++ b/wai-aria/grid_rowheader_required_false-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_rowheader_required_true-manual.html b/wai-aria/grid_rowheader_required_true-manual.html index 69df488c8ec578..e9b732485e042d 100644 --- a/wai-aria/grid_rowheader_required_true-manual.html +++ b/wai-aria/grid_rowheader_required_true-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/grid_rowheader_required_unspecified-manual.html b/wai-aria/grid_rowheader_required_unspecified-manual.html index e70bd6ac3d1268..52d92a6b66797a 100644 --- a/wai-aria/grid_rowheader_required_unspecified-manual.html +++ b/wai-aria/grid_rowheader_required_unspecified-manual.html @@ -70,7 +70,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/gridcell_aria-colspan_2_on_div-manual.html b/wai-aria/gridcell_aria-colspan_2_on_div-manual.html index 9ef3f2856ed8f8..47b13a5c142c87 100644 --- a/wai-aria/gridcell_aria-colspan_2_on_div-manual.html +++ b/wai-aria/gridcell_aria-colspan_2_on_div-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html b/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html index ffb187df2c283f..2fc132331ac57b 100644 --- a/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html +++ b/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/gridcell_colindex_4-manual.html b/wai-aria/gridcell_colindex_4-manual.html index d90bee37e6d5d1..a3662ed8cdc5a2 100644 --- a/wai-aria/gridcell_colindex_4-manual.html +++ b/wai-aria/gridcell_colindex_4-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/gridcell_rowindex_4-manual.html b/wai-aria/gridcell_rowindex_4-manual.html index 478fc14111eb6f..5fcae9a5fd169b 100644 --- a/wai-aria/gridcell_rowindex_4-manual.html +++ b/wai-aria/gridcell_rowindex_4-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/group_hidden_undefined_element_not_rendered-manual.html b/wai-aria/group_hidden_undefined_element_not_rendered-manual.html index 0f3ea8a42d008f..8f2404b20af29b 100644 --- a/wai-aria/group_hidden_undefined_element_not_rendered-manual.html +++ b/wai-aria/group_hidden_undefined_element_not_rendered-manual.html @@ -21,7 +21,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -29,7 +29,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -37,7 +37,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -45,7 +45,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -53,7 +53,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ] diff --git a/wai-aria/group_hidden_undefined_element_rendered-manual.html b/wai-aria/group_hidden_undefined_element_rendered-manual.html index 8f8baf849d701a..0097832a3b71e0 100644 --- a/wai-aria/group_hidden_undefined_element_rendered-manual.html +++ b/wai-aria/group_hidden_undefined_element_rendered-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Group" ], diff --git a/wai-aria/heading_level_unspecified-manual.html b/wai-aria/heading_level_unspecified-manual.html index 69962b702eb0d6..2bf64185191e3c 100644 --- a/wai-aria/heading_level_unspecified-manual.html +++ b/wai-aria/heading_level_unspecified-manual.html @@ -80,15 +80,15 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Text" ], [ "property", - "StyleId_Heading2", + "StyleId_Heading", "is", - "present" + "2" ], [ "property", diff --git a/wai-aria/keyshortcuts_multiple_shortcuts-manual.html b/wai-aria/keyshortcuts_multiple_shortcuts-manual.html index f28e9d32f17afd..67e04b07e91de9 100644 --- a/wai-aria/keyshortcuts_multiple_shortcuts-manual.html +++ b/wai-aria/keyshortcuts_multiple_shortcuts-manual.html @@ -48,7 +48,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], diff --git a/wai-aria/keyshortcuts_one_shortcut-manual.html b/wai-aria/keyshortcuts_one_shortcut-manual.html index aecb17e820d683..6cf5c71250df3a 100644 --- a/wai-aria/keyshortcuts_one_shortcut-manual.html +++ b/wai-aria/keyshortcuts_one_shortcut-manual.html @@ -48,7 +48,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], diff --git a/wai-aria/listbox_busy_false-manual.html b/wai-aria/listbox_busy_false-manual.html index 59e3ad6ca7513b..06258ae405593a 100644 --- a/wai-aria/listbox_busy_false-manual.html +++ b/wai-aria/listbox_busy_false-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_busy_true-manual.html b/wai-aria/listbox_busy_true-manual.html index 5a618aa1fd982b..b8604dc99608ea 100644 --- a/wai-aria/listbox_busy_true-manual.html +++ b/wai-aria/listbox_busy_true-manual.html @@ -74,7 +74,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_orientation_horizontal-manual.html b/wai-aria/listbox_orientation_horizontal-manual.html index 8d75c69ba53673..e496a357cc6bd3 100644 --- a/wai-aria/listbox_orientation_horizontal-manual.html +++ b/wai-aria/listbox_orientation_horizontal-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_orientation_unspecified-manual.html b/wai-aria/listbox_orientation_unspecified-manual.html index 36276271c4517a..d39db919b94058 100644 --- a/wai-aria/listbox_orientation_unspecified-manual.html +++ b/wai-aria/listbox_orientation_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_orientation_vertical-manual.html b/wai-aria/listbox_orientation_vertical-manual.html index ba8b77bbe8c765..5f6431ff306666 100644 --- a/wai-aria/listbox_orientation_vertical-manual.html +++ b/wai-aria/listbox_orientation_vertical-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_readonly_false-manual.html b/wai-aria/listbox_readonly_false-manual.html index 4733d641a4e8d1..0f7e2b678ce42c 100644 --- a/wai-aria/listbox_readonly_false-manual.html +++ b/wai-aria/listbox_readonly_false-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_readonly_true-manual.html b/wai-aria/listbox_readonly_true-manual.html index 3a9f7940ed986c..39771bf3a1250c 100644 --- a/wai-aria/listbox_readonly_true-manual.html +++ b/wai-aria/listbox_readonly_true-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listbox_readonly_unspecified-manual.html b/wai-aria/listbox_readonly_unspecified-manual.html index 15ed93fe827b07..c1bb93d8bcaf93 100644 --- a/wai-aria/listbox_readonly_unspecified-manual.html +++ b/wai-aria/listbox_readonly_unspecified-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/listitem_setsize_-1-manual.html b/wai-aria/listitem_setsize_-1-manual.html index 48cd2d08dffadc..376692eeb8ba03 100644 --- a/wai-aria/listitem_setsize_-1-manual.html +++ b/wai-aria/listitem_setsize_-1-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "control type", + "ControlType", "is", "ListItem" ], @@ -108,7 +108,7 @@ "property", "controlPatterns", "contains", - "selectionitem" + "SelectionItem" ] ] }, diff --git a/wai-aria/menu_orientation_horizontal-manual.html b/wai-aria/menu_orientation_horizontal-manual.html index d7a00c9173c850..df2f22e3af478c 100644 --- a/wai-aria/menu_orientation_horizontal-manual.html +++ b/wai-aria/menu_orientation_horizontal-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Menu" ], diff --git a/wai-aria/menu_orientation_unspecified-manual.html b/wai-aria/menu_orientation_unspecified-manual.html index f0a0266a9a9781..b47451bab39a7e 100644 --- a/wai-aria/menu_orientation_unspecified-manual.html +++ b/wai-aria/menu_orientation_unspecified-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Menu" ], diff --git a/wai-aria/menu_orientation_vertical-manual.html b/wai-aria/menu_orientation_vertical-manual.html index 530918a7c835b3..c1958d4a6bea02 100644 --- a/wai-aria/menu_orientation_vertical-manual.html +++ b/wai-aria/menu_orientation_vertical-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Menu" ], diff --git a/wai-aria/menubar_busy_false-manual.html b/wai-aria/menubar_busy_false-manual.html index e86c24ab99e474..62060a2fa9636b 100644 --- a/wai-aria/menubar_busy_false-manual.html +++ b/wai-aria/menubar_busy_false-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuBar" ], diff --git a/wai-aria/menubar_busy_true-manual.html b/wai-aria/menubar_busy_true-manual.html index 6665c95ffac55d..e8c6b649f42487 100644 --- a/wai-aria/menubar_busy_true-manual.html +++ b/wai-aria/menubar_busy_true-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuBar" ], diff --git a/wai-aria/menubar_orientation_horizontal-manual.html b/wai-aria/menubar_orientation_horizontal-manual.html index e480aa33224fba..66207b91afbc61 100644 --- a/wai-aria/menubar_orientation_horizontal-manual.html +++ b/wai-aria/menubar_orientation_horizontal-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuBar" ], diff --git a/wai-aria/menubar_orientation_unspecified-manual.html b/wai-aria/menubar_orientation_unspecified-manual.html index dbb162317c8cb2..e94dd0c0948c95 100644 --- a/wai-aria/menubar_orientation_unspecified-manual.html +++ b/wai-aria/menubar_orientation_unspecified-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuBar" ], diff --git a/wai-aria/menubar_orientation_vertical-manual.html b/wai-aria/menubar_orientation_vertical-manual.html index a258dd8392f2a0..dd7434e5949acd 100644 --- a/wai-aria/menubar_orientation_vertical-manual.html +++ b/wai-aria/menubar_orientation_vertical-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuBar" ], diff --git a/wai-aria/menuitem_posinset_and_setsize-manual.html b/wai-aria/menuitem_posinset_and_setsize-manual.html index a8bfb63e383f2a..411086b7f34a09 100644 --- a/wai-aria/menuitem_posinset_and_setsize-manual.html +++ b/wai-aria/menuitem_posinset_and_setsize-manual.html @@ -106,8 +106,8 @@ "UIA" : [ [ "property", - "Control Type", - "isNot", + "ControlType", + "is", "MenuItem" ], [ diff --git a/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html b/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html index ec0c7a3969e4a2..9368e984879481 100644 --- a/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html +++ b/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html @@ -136,8 +136,8 @@ "UIA" : [ [ "property", - "Control Type", - "isNot", + "ControlType", + "is", "MenuItem" ], [ diff --git a/wai-aria/menuitemcheckbox_readonly_false-manual.html b/wai-aria/menuitemcheckbox_readonly_false-manual.html index bee4e4f6b657d9..767d01e7944631 100644 --- a/wai-aria/menuitemcheckbox_readonly_false-manual.html +++ b/wai-aria/menuitemcheckbox_readonly_false-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuItem" ], diff --git a/wai-aria/menuitemcheckbox_readonly_true-manual.html b/wai-aria/menuitemcheckbox_readonly_true-manual.html index e30b1bda6e916d..40fc07899a5f40 100644 --- a/wai-aria/menuitemcheckbox_readonly_true-manual.html +++ b/wai-aria/menuitemcheckbox_readonly_true-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuItem" ], diff --git a/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html b/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html index b9997ab8e4e6aa..388d89ea404be6 100644 --- a/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html +++ b/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuItem" ], diff --git a/wai-aria/menuitemradio_posinset_and_setsize-manual.html b/wai-aria/menuitemradio_posinset_and_setsize-manual.html index 2d32a57e209898..9f6489ebf089fb 100644 --- a/wai-aria/menuitemradio_posinset_and_setsize-manual.html +++ b/wai-aria/menuitemradio_posinset_and_setsize-manual.html @@ -136,8 +136,8 @@ "UIA" : [ [ "property", - "Control Type", - "isNot", + "ControlType", + "is", "MenuItem" ], [ diff --git a/wai-aria/menuitemradio_readonly_false-manual.html b/wai-aria/menuitemradio_readonly_false-manual.html index d7077250843a2e..3771b5d62879ef 100644 --- a/wai-aria/menuitemradio_readonly_false-manual.html +++ b/wai-aria/menuitemradio_readonly_false-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuItem" ], @@ -96,7 +96,7 @@ "property", "controlPatterns", "contains", - "SelectItem" + "SelectionItem" ], [ "property", diff --git a/wai-aria/menuitemradio_readonly_true-manual.html b/wai-aria/menuitemradio_readonly_true-manual.html index 990b4fa5d55e03..fd92109744d949 100644 --- a/wai-aria/menuitemradio_readonly_true-manual.html +++ b/wai-aria/menuitemradio_readonly_true-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuItem" ], @@ -108,7 +108,7 @@ "property", "controlPatterns", "contains", - "SelectItem" + "SelectionItem" ], [ "property", diff --git a/wai-aria/menuitemradio_readonly_unspecified-manual.html b/wai-aria/menuitemradio_readonly_unspecified-manual.html index ccad591be8c2c5..e39165367cb786 100644 --- a/wai-aria/menuitemradio_readonly_unspecified-manual.html +++ b/wai-aria/menuitemradio_readonly_unspecified-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "MenuItem" ], @@ -96,7 +96,7 @@ "property", "controlPatterns", "contains", - "SelectItem" + "SelectionItem" ], [ "property", diff --git a/wai-aria/none-manual.html b/wai-aria/none-manual.html index a286a592a515a5..f8c38af34582c0 100644 --- a/wai-aria/none-manual.html +++ b/wai-aria/none-manual.html @@ -21,7 +21,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -29,7 +29,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -37,7 +37,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -45,7 +45,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ], @@ -53,7 +53,7 @@ [ "property", "accessible", - "exists", + "is", "false" ] ] diff --git a/wai-aria/option_selected_false-manual.html b/wai-aria/option_selected_false-manual.html index e77d50c3cf3c1e..c7091203dcc168 100644 --- a/wai-aria/option_selected_false-manual.html +++ b/wai-aria/option_selected_false-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ListItem" ], diff --git a/wai-aria/option_selected_true-manual.html b/wai-aria/option_selected_true-manual.html index b9839f87207ba5..3769bcce22d092 100644 --- a/wai-aria/option_selected_true-manual.html +++ b/wai-aria/option_selected_true-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ListItem" ], diff --git a/wai-aria/option_selected_undefined-manual.html b/wai-aria/option_selected_undefined-manual.html index f13ccfa3871ab1..536ac9b7c18028 100644 --- a/wai-aria/option_selected_undefined-manual.html +++ b/wai-aria/option_selected_undefined-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ListItem" ], diff --git a/wai-aria/radiogroup_orientation_horizontal-manual.html b/wai-aria/radiogroup_orientation_horizontal-manual.html index 82b91ec6bde21c..695f1c60d753e9 100644 --- a/wai-aria/radiogroup_orientation_horizontal-manual.html +++ b/wai-aria/radiogroup_orientation_horizontal-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/radiogroup_orientation_unspecified-manual.html b/wai-aria/radiogroup_orientation_unspecified-manual.html index 97e5e5a5eb64a2..6cc09ea816abb5 100644 --- a/wai-aria/radiogroup_orientation_unspecified-manual.html +++ b/wai-aria/radiogroup_orientation_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/radiogroup_orientation_vertical-manual.html b/wai-aria/radiogroup_orientation_vertical-manual.html index 4442f25364a688..ef3090bba06d5b 100644 --- a/wai-aria/radiogroup_orientation_vertical-manual.html +++ b/wai-aria/radiogroup_orientation_vertical-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/radiogroup_readonly_false-manual.html b/wai-aria/radiogroup_readonly_false-manual.html index e99875afa51189..cb829c4b0272c3 100644 --- a/wai-aria/radiogroup_readonly_false-manual.html +++ b/wai-aria/radiogroup_readonly_false-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/radiogroup_readonly_true-manual.html b/wai-aria/radiogroup_readonly_true-manual.html index 9955b9d3902ce4..279da4edb1a244 100644 --- a/wai-aria/radiogroup_readonly_true-manual.html +++ b/wai-aria/radiogroup_readonly_true-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/radiogroup_readonly_unspecified-manual.html b/wai-aria/radiogroup_readonly_unspecified-manual.html index d822301bdb0c48..6b3596bcf98a86 100644 --- a/wai-aria/radiogroup_readonly_unspecified-manual.html +++ b/wai-aria/radiogroup_readonly_unspecified-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "List" ], diff --git a/wai-aria/row_colindex_4-manual.html b/wai-aria/row_colindex_4-manual.html index 060217f7559bf0..1e483bf6c5144c 100644 --- a/wai-aria/row_colindex_4-manual.html +++ b/wai-aria/row_colindex_4-manual.html @@ -64,7 +64,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], @@ -109,6 +109,20 @@ "is", "4" ] + ], + "UIA" : [ + [ + "property", + "ControlType", + "is", + "DataItem" + ], + [ + "property", + "Column", + "is", + "3" + ] ] }, "title" : "step 2", diff --git a/wai-aria/row_rowindex_4-manual.html b/wai-aria/row_rowindex_4-manual.html index e391dffa7c7088..98c9e15ece1c1a 100644 --- a/wai-aria/row_rowindex_4-manual.html +++ b/wai-aria/row_rowindex_4-manual.html @@ -64,7 +64,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], @@ -109,6 +109,20 @@ "is", "4" ] + ], + "UIA" : [ + [ + "property", + "ControlType", + "is", + "DataItem" + ], + [ + "property", + "Row", + "is", + "3" + ] ] }, "title" : "step 2", diff --git a/wai-aria/rowheader_aria-colspan_2_on_div-manual.html b/wai-aria/rowheader_aria-colspan_2_on_div-manual.html index 883ebe02ee8752..294e5052c4b5b6 100644 --- a/wai-aria/rowheader_aria-colspan_2_on_div-manual.html +++ b/wai-aria/rowheader_aria-colspan_2_on_div-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html b/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html index e5c331fd819414..361526fad480ac 100644 --- a/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html +++ b/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/rowheader_colindex_4-manual.html b/wai-aria/rowheader_colindex_4-manual.html index a48cd2f45b2bde..e3fa1156a8f147 100644 --- a/wai-aria/rowheader_colindex_4-manual.html +++ b/wai-aria/rowheader_colindex_4-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], diff --git a/wai-aria/rowheader_rowindex_4-manual.html b/wai-aria/rowheader_rowindex_4-manual.html index a146fc9bed6764..8591196c812835 100644 --- a/wai-aria/rowheader_rowindex_4-manual.html +++ b/wai-aria/rowheader_rowindex_4-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "HeaderItem" ], @@ -102,7 +102,7 @@

This test examines the ARIA properties for rowheader rowindex 4.

-
test cell
+
test cell
diff --git a/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html b/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html index 948b11e2c04050..cc6eb5df2aa9dc 100644 --- a/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html +++ b/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html b/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html index 26aab4e600431c..fe34db97d40fd5 100644 --- a/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html +++ b/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataItem" ], diff --git a/wai-aria/scrollbar_all_values_unspecified-manual.html b/wai-aria/scrollbar_all_values_unspecified-manual.html index 00d93148ee34ca..c5849c574250be 100644 --- a/wai-aria/scrollbar_all_values_unspecified-manual.html +++ b/wai-aria/scrollbar_all_values_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "scrollbar" ], diff --git a/wai-aria/scrollbar_only_valuenow_unspecified-manual.html b/wai-aria/scrollbar_only_valuenow_unspecified-manual.html index 8efb7edbf8de2e..34c59cedd47f42 100644 --- a/wai-aria/scrollbar_only_valuenow_unspecified-manual.html +++ b/wai-aria/scrollbar_only_valuenow_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ScrollBar" ], diff --git a/wai-aria/scrollbar_orientation_unspecified-manual.html b/wai-aria/scrollbar_orientation_unspecified-manual.html index 890a46498c8157..0fb9ae8c7c583d 100644 --- a/wai-aria/scrollbar_orientation_unspecified-manual.html +++ b/wai-aria/scrollbar_orientation_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ScrollBar" ], @@ -108,7 +108,7 @@ "property", "interfaces", "contains", - "Range control pattern" + "RangeValue" ] ] }, diff --git a/wai-aria/searchbox-manual.html b/wai-aria/searchbox-manual.html index 016f77a4d02987..f3e154836a0f87 100644 --- a/wai-aria/searchbox-manual.html +++ b/wai-aria/searchbox-manual.html @@ -88,13 +88,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ] diff --git a/wai-aria/searchbox_activedescendant-manual.html b/wai-aria/searchbox_activedescendant-manual.html index 3976c265d42a32..1e2ad175228c55 100644 --- a/wai-aria/searchbox_activedescendant-manual.html +++ b/wai-aria/searchbox_activedescendant-manual.html @@ -112,13 +112,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_activedescendant_value_changes-manual.html b/wai-aria/searchbox_activedescendant_value_changes-manual.html index 9f2507cd8be8e2..a1ceab6417937d 100644 --- a/wai-aria/searchbox_activedescendant_value_changes-manual.html +++ b/wai-aria/searchbox_activedescendant_value_changes-manual.html @@ -105,7 +105,7 @@ "event", "type", "is", - "IA2_EVENT_ACTIVE_DESCENDANT_CHANGED" + "EVENT_OBJECT_FOCUS" ] ], "MSAA" : [ @@ -131,13 +131,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_autocomplete_unspecified-manual.html b/wai-aria/searchbox_autocomplete_unspecified-manual.html index 8b137490ce9f7e..3513eeb0fe4018 100644 --- a/wai-aria/searchbox_autocomplete_unspecified-manual.html +++ b/wai-aria/searchbox_autocomplete_unspecified-manual.html @@ -102,7 +102,7 @@ "property", "autocomplete", "is", - "none" + "" ] ] }, diff --git a/wai-aria/searchbox_multiline_false-manual.html b/wai-aria/searchbox_multiline_false-manual.html index 6c0053a0eed7d4..2413dd44051019 100644 --- a/wai-aria/searchbox_multiline_false-manual.html +++ b/wai-aria/searchbox_multiline_false-manual.html @@ -94,13 +94,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ] diff --git a/wai-aria/searchbox_multiline_true-manual.html b/wai-aria/searchbox_multiline_true-manual.html index 311cbf5589cf8a..4a3d65793f2987 100644 --- a/wai-aria/searchbox_multiline_true-manual.html +++ b/wai-aria/searchbox_multiline_true-manual.html @@ -100,21 +100,21 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], [ "property", - "AriaProperties", - "contains", - "multiline:true" + "AriaProperties.multiline", + "is", + "true" ] ] }, diff --git a/wai-aria/searchbox_multiline_unspecified-manual.html b/wai-aria/searchbox_multiline_unspecified-manual.html index 240698ff59cc7a..8768b5bc34d7d1 100644 --- a/wai-aria/searchbox_multiline_unspecified-manual.html +++ b/wai-aria/searchbox_multiline_unspecified-manual.html @@ -76,13 +76,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ] diff --git a/wai-aria/searchbox_placeholder-manual.html b/wai-aria/searchbox_placeholder-manual.html index 086508f1651de6..4e9ddbae3bcc6b 100644 --- a/wai-aria/searchbox_placeholder-manual.html +++ b/wai-aria/searchbox_placeholder-manual.html @@ -100,13 +100,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_readonly_false-manual.html b/wai-aria/searchbox_readonly_false-manual.html index 2c8d4aec546956..a587eb5dfbd144 100644 --- a/wai-aria/searchbox_readonly_false-manual.html +++ b/wai-aria/searchbox_readonly_false-manual.html @@ -100,13 +100,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_readonly_true-manual.html b/wai-aria/searchbox_readonly_true-manual.html index ba0f3886fce653..83ff4ec535c3b7 100644 --- a/wai-aria/searchbox_readonly_true-manual.html +++ b/wai-aria/searchbox_readonly_true-manual.html @@ -100,13 +100,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_readonly_unspecified-manual.html b/wai-aria/searchbox_readonly_unspecified-manual.html index c3f49a2505b803..615785f2c16bda 100644 --- a/wai-aria/searchbox_readonly_unspecified-manual.html +++ b/wai-aria/searchbox_readonly_unspecified-manual.html @@ -100,13 +100,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_required_false-manual.html b/wai-aria/searchbox_required_false-manual.html index 6d576771fc7473..dc544dd26831e7 100644 --- a/wai-aria/searchbox_required_false-manual.html +++ b/wai-aria/searchbox_required_false-manual.html @@ -88,13 +88,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_required_true-manual.html b/wai-aria/searchbox_required_true-manual.html index 764fe33729da91..a1dcb29a8c92ee 100644 --- a/wai-aria/searchbox_required_true-manual.html +++ b/wai-aria/searchbox_required_true-manual.html @@ -88,13 +88,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/searchbox_required_unspecified-manual.html b/wai-aria/searchbox_required_unspecified-manual.html index 592e0e4898b73c..fb7c657bdacfa8 100644 --- a/wai-aria/searchbox_required_unspecified-manual.html +++ b/wai-aria/searchbox_required_unspecified-manual.html @@ -88,13 +88,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "search box" ], diff --git a/wai-aria/separator_focusable_all_values_unspecified-manual.html b/wai-aria/separator_focusable_all_values_unspecified-manual.html index 971f4548ca7e67..5f2d8bae89324c 100644 --- a/wai-aria/separator_focusable_all_values_unspecified-manual.html +++ b/wai-aria/separator_focusable_all_values_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Thumb" ], diff --git a/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html b/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html index abc35fe81a6dbf..8c4c809ce8e3a3 100644 --- a/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html +++ b/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Thumb" ], diff --git a/wai-aria/separator_focusable_valuetext-manual.html b/wai-aria/separator_focusable_valuetext-manual.html index edbb7bd5a4bc90..ebfd2119a9c29e 100644 --- a/wai-aria/separator_focusable_valuetext-manual.html +++ b/wai-aria/separator_focusable_valuetext-manual.html @@ -148,7 +148,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Thumb" ], @@ -176,12 +176,6 @@ "is", "100" ], - [ - "property", - "controlPatterns", - "contains", - "Value" - ], [ "property", "Value.Value", diff --git a/wai-aria/separator_orientation_unspecified-manual.html b/wai-aria/separator_orientation_unspecified-manual.html index 3b496a87ce9c4c..43dfe6dbe200b8 100644 --- a/wai-aria/separator_orientation_unspecified-manual.html +++ b/wai-aria/separator_orientation_unspecified-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Separator" ], diff --git a/wai-aria/separator_unfocusable_all_values_unspecified-manual.html b/wai-aria/separator_unfocusable_all_values_unspecified-manual.html index 8ab8e96b02754c..5dbe67d8df36ea 100644 --- a/wai-aria/separator_unfocusable_all_values_unspecified-manual.html +++ b/wai-aria/separator_unfocusable_all_values_unspecified-manual.html @@ -62,7 +62,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Separator" ] diff --git a/wai-aria/separator_unfocusable_valuetext-manual.html b/wai-aria/separator_unfocusable_valuetext-manual.html index 71527bf79968fd..4e8fd405634194 100644 --- a/wai-aria/separator_unfocusable_valuetext-manual.html +++ b/wai-aria/separator_unfocusable_valuetext-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Separator" ], @@ -90,7 +90,7 @@ "property", "controlPatterns", "doesNotContain", - "Value" + "RangeValue" ] ] }, diff --git a/wai-aria/slider_all_values_unspecified-manual.html b/wai-aria/slider_all_values_unspecified-manual.html index 2b3e4405c542f4..2a72d5db58265d 100644 --- a/wai-aria/slider_all_values_unspecified-manual.html +++ b/wai-aria/slider_all_values_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Slider" ], diff --git a/wai-aria/slider_only_valuenow_unspecified-manual.html b/wai-aria/slider_only_valuenow_unspecified-manual.html index 9421dfcc90c694..4f80a39fe80e22 100644 --- a/wai-aria/slider_only_valuenow_unspecified-manual.html +++ b/wai-aria/slider_only_valuenow_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Slider" ], diff --git a/wai-aria/slider_orientation_unspecified-manual.html b/wai-aria/slider_orientation_unspecified-manual.html index d882fc42889b54..50e87c8b3f19a8 100644 --- a/wai-aria/slider_orientation_unspecified-manual.html +++ b/wai-aria/slider_orientation_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Slider" ], @@ -108,7 +108,7 @@ "property", "interfaces", "contains", - "Range control pattern" + "RangeValue" ] ] }, diff --git a/wai-aria/slider_readonly_false-manual.html b/wai-aria/slider_readonly_false-manual.html index 666cb12e979e27..13c36efeec8d22 100644 --- a/wai-aria/slider_readonly_false-manual.html +++ b/wai-aria/slider_readonly_false-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Slider" ], diff --git a/wai-aria/slider_readonly_true-manual.html b/wai-aria/slider_readonly_true-manual.html index f33e07e60452a3..5793bf20d887c7 100644 --- a/wai-aria/slider_readonly_true-manual.html +++ b/wai-aria/slider_readonly_true-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Slider" ], diff --git a/wai-aria/slider_readonly_unspecified-manual.html b/wai-aria/slider_readonly_unspecified-manual.html index 86f7500ed9594d..dc5ce40c9d1fbf 100644 --- a/wai-aria/slider_readonly_unspecified-manual.html +++ b/wai-aria/slider_readonly_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Slider" ], diff --git a/wai-aria/spinbutton_all_values_unspecified-manual.html b/wai-aria/spinbutton_all_values_unspecified-manual.html index eb7e2880f27d07..446f4534152b67 100644 --- a/wai-aria/spinbutton_all_values_unspecified-manual.html +++ b/wai-aria/spinbutton_all_values_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Spinner" ], diff --git a/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html b/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html index 8a9dc74090c01c..ae6948b7826a3b 100644 --- a/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html +++ b/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html @@ -130,7 +130,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Spinner" ], diff --git a/wai-aria/spinbutton_readonly_false-manual.html b/wai-aria/spinbutton_readonly_false-manual.html index bda4b583e46572..94a9d44eec129d 100644 --- a/wai-aria/spinbutton_readonly_false-manual.html +++ b/wai-aria/spinbutton_readonly_false-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Spinner" ], diff --git a/wai-aria/spinbutton_readonly_true-manual.html b/wai-aria/spinbutton_readonly_true-manual.html index 6234e50d1f4326..7652a5695d6e9d 100644 --- a/wai-aria/spinbutton_readonly_true-manual.html +++ b/wai-aria/spinbutton_readonly_true-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Spinner" ], diff --git a/wai-aria/spinbutton_readonly_unspecified-manual.html b/wai-aria/spinbutton_readonly_unspecified-manual.html index c96f2e00d38bfc..8a3f2d76033d7d 100644 --- a/wai-aria/spinbutton_readonly_unspecified-manual.html +++ b/wai-aria/spinbutton_readonly_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Spinner" ], diff --git a/wai-aria/switch_checked_false-manual.html b/wai-aria/switch_checked_false-manual.html index f499550bdcd307..b5cf84fa9f1319 100644 --- a/wai-aria/switch_checked_false-manual.html +++ b/wai-aria/switch_checked_false-manual.html @@ -86,13 +86,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/switch_checked_mixed-manual.html b/wai-aria/switch_checked_mixed-manual.html index e6320e0cad8913..f9e45cf4246b1b 100644 --- a/wai-aria/switch_checked_mixed-manual.html +++ b/wai-aria/switch_checked_mixed-manual.html @@ -92,13 +92,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/switch_checked_true-manual.html b/wai-aria/switch_checked_true-manual.html index 8ae8579a3bf53b..fbe80aebfceba1 100644 --- a/wai-aria/switch_checked_true-manual.html +++ b/wai-aria/switch_checked_true-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], @@ -106,7 +106,7 @@ ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/switch_checked_undefined-manual.html b/wai-aria/switch_checked_undefined-manual.html index 7ae70c6765a9fe..94297a47f65539 100644 --- a/wai-aria/switch_checked_undefined-manual.html +++ b/wai-aria/switch_checked_undefined-manual.html @@ -86,13 +86,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/switch_checked_value_changes-manual.html b/wai-aria/switch_checked_value_changes-manual.html index 699f332a8583b2..11ebcb3951eb86 100644 --- a/wai-aria/switch_checked_value_changes-manual.html +++ b/wai-aria/switch_checked_value_changes-manual.html @@ -119,13 +119,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], @@ -139,7 +139,7 @@ "event", "type", "is", - "Toggle.ToggleStateProperty" + "TogglePattern.ToggleStateProperty" ] ] }, diff --git a/wai-aria/switch_readonly_false-manual.html b/wai-aria/switch_readonly_false-manual.html index 4afbff1808f3ce..fdb095d1bb4ea6 100644 --- a/wai-aria/switch_readonly_false-manual.html +++ b/wai-aria/switch_readonly_false-manual.html @@ -80,13 +80,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/switch_readonly_true-manual.html b/wai-aria/switch_readonly_true-manual.html index eab0bf59ff9573..2a6f6fbc86c060 100644 --- a/wai-aria/switch_readonly_true-manual.html +++ b/wai-aria/switch_readonly_true-manual.html @@ -80,13 +80,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/switch_readonly_unspecified-manual.html b/wai-aria/switch_readonly_unspecified-manual.html index f3e1f6b97ae648..7a253657377a6d 100644 --- a/wai-aria/switch_readonly_unspecified-manual.html +++ b/wai-aria/switch_readonly_unspecified-manual.html @@ -80,13 +80,13 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Button" ], [ "property", - "Localized Control Type", + "LocalizedControlType", "is", "toggleswitch" ], diff --git a/wai-aria/tab_posinset_and_setsize-manual.html b/wai-aria/tab_posinset_and_setsize-manual.html index 6f3d796ab1ba22..f00d5985652779 100644 --- a/wai-aria/tab_posinset_and_setsize-manual.html +++ b/wai-aria/tab_posinset_and_setsize-manual.html @@ -142,8 +142,8 @@ "UIA" : [ [ "property", - "Control Type", - "isNot", + "ControlType", + "is", "TabItem" ], [ diff --git a/wai-aria/table_colcount_-1-manual.html b/wai-aria/table_colcount_-1-manual.html index 751642659dbde9..8a6e46f028b9d5 100644 --- a/wai-aria/table_colcount_-1-manual.html +++ b/wai-aria/table_colcount_-1-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Table" ], diff --git a/wai-aria/table_colcount_8-manual.html b/wai-aria/table_colcount_8-manual.html index daaa03f4334a5b..0c25f18c1e9cd2 100644 --- a/wai-aria/table_colcount_8-manual.html +++ b/wai-aria/table_colcount_8-manual.html @@ -76,7 +76,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Table" ], diff --git a/wai-aria/table_rowcount_-1-manual.html b/wai-aria/table_rowcount_-1-manual.html index 8ca671742758e8..fbc809be09f830 100644 --- a/wai-aria/table_rowcount_-1-manual.html +++ b/wai-aria/table_rowcount_-1-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Table" ], diff --git a/wai-aria/table_rowcount_3-manual.html b/wai-aria/table_rowcount_3-manual.html index bb685bdbd0a85c..81a3a3c16b18d2 100644 --- a/wai-aria/table_rowcount_3-manual.html +++ b/wai-aria/table_rowcount_3-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Table" ], diff --git a/wai-aria/tablist_orientation_horizontal-manual.html b/wai-aria/tablist_orientation_horizontal-manual.html index a01acf1810868f..2d7062aade04e4 100644 --- a/wai-aria/tablist_orientation_horizontal-manual.html +++ b/wai-aria/tablist_orientation_horizontal-manual.html @@ -100,7 +100,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Tab" ], diff --git a/wai-aria/tablist_orientation_unspecified-manual.html b/wai-aria/tablist_orientation_unspecified-manual.html index f4524c291b5463..497751d7d01d5c 100644 --- a/wai-aria/tablist_orientation_unspecified-manual.html +++ b/wai-aria/tablist_orientation_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Tab" ], diff --git a/wai-aria/tablist_orientation_vertical-manual.html b/wai-aria/tablist_orientation_vertical-manual.html index 9cf69cafa242fa..18c196b5638b94 100644 --- a/wai-aria/tablist_orientation_vertical-manual.html +++ b/wai-aria/tablist_orientation_vertical-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Tab" ], diff --git a/wai-aria/term_role-manual.html b/wai-aria/term_role-manual.html index d583765095eef9..76941b51ab4d50 100644 --- a/wai-aria/term_role-manual.html +++ b/wai-aria/term_role-manual.html @@ -74,9 +74,9 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", - "ListItem" + "Text" ] ] }, diff --git a/wai-aria/textbox_placeholder-manual.html b/wai-aria/textbox_placeholder-manual.html index 6c234a13947a63..5c40558325dfc1 100644 --- a/wai-aria/textbox_placeholder-manual.html +++ b/wai-aria/textbox_placeholder-manual.html @@ -100,7 +100,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Edit" ], diff --git a/wai-aria/toolbar_orientation_horizontal-manual.html b/wai-aria/toolbar_orientation_horizontal-manual.html index e2327e7e127d70..356c9833b0d3be 100644 --- a/wai-aria/toolbar_orientation_horizontal-manual.html +++ b/wai-aria/toolbar_orientation_horizontal-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ToolBar" ], diff --git a/wai-aria/toolbar_orientation_unspecified-manual.html b/wai-aria/toolbar_orientation_unspecified-manual.html index a08e45a42610eb..bd2c399bbc954d 100644 --- a/wai-aria/toolbar_orientation_unspecified-manual.html +++ b/wai-aria/toolbar_orientation_unspecified-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ToolBar" ], diff --git a/wai-aria/toolbar_orientation_vertical-manual.html b/wai-aria/toolbar_orientation_vertical-manual.html index 92a39cd353b4b5..b0d85f9f8c7a65 100644 --- a/wai-aria/toolbar_orientation_vertical-manual.html +++ b/wai-aria/toolbar_orientation_vertical-manual.html @@ -88,7 +88,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "ToolBar" ], diff --git a/wai-aria/tree_orientation_horizontal-manual.html b/wai-aria/tree_orientation_horizontal-manual.html index 74788212475988..88ba1e705e4e60 100644 --- a/wai-aria/tree_orientation_horizontal-manual.html +++ b/wai-aria/tree_orientation_horizontal-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Tree" ], diff --git a/wai-aria/tree_orientation_unspecified-manual.html b/wai-aria/tree_orientation_unspecified-manual.html index ada952dadd02d8..b8c25667144672 100644 --- a/wai-aria/tree_orientation_unspecified-manual.html +++ b/wai-aria/tree_orientation_unspecified-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Tree" ], diff --git a/wai-aria/tree_orientation_vertical-manual.html b/wai-aria/tree_orientation_vertical-manual.html index 799413b20cecfa..b9e88b034df2d6 100644 --- a/wai-aria/tree_orientation_vertical-manual.html +++ b/wai-aria/tree_orientation_vertical-manual.html @@ -94,7 +94,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "Tree" ], diff --git a/wai-aria/treegrid_colcount_8-manual.html b/wai-aria/treegrid_colcount_8-manual.html index b44672ca724cb1..381f39c2f44f9a 100644 --- a/wai-aria/treegrid_colcount_8-manual.html +++ b/wai-aria/treegrid_colcount_8-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/treegrid_orientation_horizontal-manual.html b/wai-aria/treegrid_orientation_horizontal-manual.html index 180aebd26bc84d..41b49e7a2f5d0c 100644 --- a/wai-aria/treegrid_orientation_horizontal-manual.html +++ b/wai-aria/treegrid_orientation_horizontal-manual.html @@ -100,7 +100,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/treegrid_orientation_unspecified-manual.html b/wai-aria/treegrid_orientation_unspecified-manual.html index 4bc2a05f76ecff..1eabb26aabf75f 100644 --- a/wai-aria/treegrid_orientation_unspecified-manual.html +++ b/wai-aria/treegrid_orientation_unspecified-manual.html @@ -112,7 +112,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/treegrid_orientation_vertical-manual.html b/wai-aria/treegrid_orientation_vertical-manual.html index 3bed156a7f3005..92c0e2897d61ba 100644 --- a/wai-aria/treegrid_orientation_vertical-manual.html +++ b/wai-aria/treegrid_orientation_vertical-manual.html @@ -100,7 +100,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/treegrid_rowcount_3-manual.html b/wai-aria/treegrid_rowcount_3-manual.html index 15b63f309d29c7..86942708dcfd39 100644 --- a/wai-aria/treegrid_rowcount_3-manual.html +++ b/wai-aria/treegrid_rowcount_3-manual.html @@ -82,7 +82,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "DataGrid" ], diff --git a/wai-aria/treeitem_selected_false-manual.html b/wai-aria/treeitem_selected_false-manual.html index f401a522504c12..0e2c1f95de8083 100644 --- a/wai-aria/treeitem_selected_false-manual.html +++ b/wai-aria/treeitem_selected_false-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "TreeItem" ], diff --git a/wai-aria/treeitem_selected_true-manual.html b/wai-aria/treeitem_selected_true-manual.html index 80cf62783aa590..21775643e76164 100644 --- a/wai-aria/treeitem_selected_true-manual.html +++ b/wai-aria/treeitem_selected_true-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "TreeItem" ], diff --git a/wai-aria/treeitem_selected_undefined-manual.html b/wai-aria/treeitem_selected_undefined-manual.html index a7ca892b6f44c7..f9880872214f4a 100644 --- a/wai-aria/treeitem_selected_undefined-manual.html +++ b/wai-aria/treeitem_selected_undefined-manual.html @@ -86,7 +86,7 @@ "UIA" : [ [ "property", - "Control Type", + "ControlType", "is", "TreeItem" ],