ax_dump_test: drop mac expectations qualifier from mac ax script tests
Change-Id: I9a31500d1e071429f791b57e5cac29598b826e03
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3227000
Commit-Queue: Alexander Surkov <asurkov@igalia.com>
Reviewed-by: Abigail Klein <abigailbklein@google.com>
Reviewed-by: Nektarios Paisios <nektar@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/main@{#932981}
diff --git a/content/browser/accessibility/dump_accessibility_scripts_browsertest.cc b/content/browser/accessibility/dump_accessibility_scripts_browsertest.cc
index 95b78f65..73d3c332 100644
--- a/content/browser/accessibility/dump_accessibility_scripts_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_scripts_browsertest.cc
@@ -40,6 +40,12 @@
// exactly match.
class DumpAccessibilityScriptTest : public DumpAccessibilityTestBase {
public:
+ DumpAccessibilityScriptTest() {
+ // Drop 'mac' expectations qualifier both from expectation file names and
+ // from scenario directives.
+ test_helper_.OverrideExpectationType("content");
+ }
+
std::vector<ui::AXPropertyFilter> DefaultFilters() const override;
void AddPropertyFilter(
std::vector<AXPropertyFilter>* property_filters,
diff --git a/content/public/test/dump_accessibility_test_helper.h b/content/public/test/dump_accessibility_test_helper.h
index 759b493..957b594 100644
--- a/content/public/test/dump_accessibility_test_helper.h
+++ b/content/public/test/dump_accessibility_test_helper.h
@@ -29,6 +29,12 @@
explicit DumpAccessibilityTestHelper(const char* expectation_type);
~DumpAccessibilityTestHelper() = default;
+ // Overrides the expectation type. Useful to tune up the expectations format
+ // after the helper object was instantiated.
+ void OverrideExpectationType(const std::string& expectation_type) {
+ expectation_type_ = expectation_type;
+ }
+
// Returns a path to an expectation file for the current platform. If no
// suitable expectation file can be found, logs an error message and returns
// an empty path.
diff --git a/content/test/data/accessibility/mac/action/ax-press-button-expected-mac.txt b/content/test/data/accessibility/mac/action/ax-press-button-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/action/ax-press-button-expected-mac.txt
rename to content/test/data/accessibility/mac/action/ax-press-button-expected.txt
diff --git a/content/test/data/accessibility/mac/action/ax-press-button.html b/content/test/data/accessibility/mac/action/ax-press-button.html
index 2fbd8b5..3bba34b 100644
--- a/content/test/data/accessibility/mac/action/ax-press-button.html
+++ b/content/test/data/accessibility/mac/action/ax-press-button.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
button.AXPerformAction(AXPress)
wait for AXFocusedUIElementChanged on AXButton
-->
diff --git a/content/test/data/accessibility/mac/attributes/ax-access-key-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-access-key-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-access-key-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-access-key-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-access-key.html b/content/test/data/accessibility/mac/attributes/ax-access-key.html
index 53a14a4..b11ac16 100644
--- a/content/test/data/accessibility/mac/attributes/ax-access-key.html
+++ b/content/test/data/accessibility/mac/attributes/ax-access-key.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
focusable.AXAccessKey
restriction.AXAccessKey
invalid.AXAccessKey
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-atomic-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-aria-atomic-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-aria-atomic-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-aria-atomic-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-atomic.html b/content/test/data/accessibility/mac/attributes/ax-aria-atomic.html
index 17deb2f..0697a13 100644
--- a/content/test/data/accessibility/mac/attributes/ax-aria-atomic.html
+++ b/content/test/data/accessibility/mac/attributes/ax-aria-atomic.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
true.AXARIAAtomic
false.AXARIAAtomic
none.AXARIAAtomic
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-busy-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-aria-busy-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-aria-busy-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-aria-busy-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-busy.html b/content/test/data/accessibility/mac/attributes/ax-aria-busy.html
index fd9e7e2..053f067 100644
--- a/content/test/data/accessibility/mac/attributes/ax-aria-busy.html
+++ b/content/test/data/accessibility/mac/attributes/ax-aria-busy.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
true.AXARIABusy
false.AXARIABusy
none.AXARIABusy
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-current-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-aria-current-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-aria-current-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-aria-current-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-current.html b/content/test/data/accessibility/mac/attributes/ax-aria-current.html
index 7a0dd10..2198e632 100644
--- a/content/test/data/accessibility/mac/attributes/ax-aria-current.html
+++ b/content/test/data/accessibility/mac/attributes/ax-aria-current.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
page.AXARIACurrent
step.AXARIACurrent
location.AXARIACurrent
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-live-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-aria-live-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-aria-live-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-aria-live-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-live.html b/content/test/data/accessibility/mac/attributes/ax-aria-live.html
index aa8e57f..cff4cb2 100644
--- a/content/test/data/accessibility/mac/attributes/ax-aria-live.html
+++ b/content/test/data/accessibility/mac/attributes/ax-aria-live.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
div.AXARIALive
-->
<!DOCTYPE html>
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-relevant-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-aria-relevant-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-aria-relevant-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-aria-relevant-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-aria-relevant.html b/content/test/data/accessibility/mac/attributes/ax-aria-relevant.html
index 91f8c65e..222af64e 100644
--- a/content/test/data/accessibility/mac/attributes/ax-aria-relevant.html
+++ b/content/test/data/accessibility/mac/attributes/ax-aria-relevant.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
div.AXARIARelevant
-->
<!DOCTYPE html>
diff --git a/content/test/data/accessibility/mac/attributes/ax-autocomplete-value-expected-mac.txt b/content/test/data/accessibility/mac/attributes/ax-autocomplete-value-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/attributes/ax-autocomplete-value-expected-mac.txt
rename to content/test/data/accessibility/mac/attributes/ax-autocomplete-value-expected.txt
diff --git a/content/test/data/accessibility/mac/attributes/ax-autocomplete-value.html b/content/test/data/accessibility/mac/attributes/ax-autocomplete-value.html
index 429bc36a..941faf84 100644
--- a/content/test/data/accessibility/mac/attributes/ax-autocomplete-value.html
+++ b/content/test/data/accessibility/mac/attributes/ax-autocomplete-value.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
autocomplete.AXAutocompleteValue
not_applicable.AXAutocompleteValue
-->
diff --git a/content/test/data/accessibility/mac/methods/placeholder-value-expected-mac.txt b/content/test/data/accessibility/mac/methods/placeholder-value-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/methods/placeholder-value-expected-mac.txt
rename to content/test/data/accessibility/mac/methods/placeholder-value-expected.txt
diff --git a/content/test/data/accessibility/mac/methods/placeholder-value.html b/content/test/data/accessibility/mac/methods/placeholder-value.html
index 3a9f0ee8..42d1514 100644
--- a/content/test/data/accessibility/mac/methods/placeholder-value.html
+++ b/content/test/data/accessibility/mac/methods/placeholder-value.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
input.accessibilityPlaceholderValue
div.accessibilityPlaceholderValue
-->
diff --git a/content/test/data/accessibility/mac/methods/title-expected-mac.txt b/content/test/data/accessibility/mac/methods/title-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/methods/title-expected-mac.txt
rename to content/test/data/accessibility/mac/methods/title-expected.txt
diff --git a/content/test/data/accessibility/mac/methods/title.html b/content/test/data/accessibility/mac/methods/title.html
index 8345d50b..0cdc382 100644
--- a/content/test/data/accessibility/mac/methods/title.html
+++ b/content/test/data/accessibility/mac/methods/title.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
button.accessibilityTitle
-->
<!DOCTYPE html>
diff --git a/content/test/data/accessibility/mac/selection/selectall-textarea-expected-mac.txt b/content/test/data/accessibility/mac/selection/selectall-textarea-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/selection/selectall-textarea-expected-mac.txt
rename to content/test/data/accessibility/mac/selection/selectall-textarea-expected.txt
diff --git a/content/test/data/accessibility/mac/selection/selectall-textarea.html b/content/test/data/accessibility/mac/selection/selectall-textarea.html
index c3ddc01..75aa812f 100644
--- a/content/test/data/accessibility/mac/selection/selectall-textarea.html
+++ b/content/test/data/accessibility/mac/selection/selectall-textarea.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
textarea_range:= textarea.AXTextMarkerRangeForUIElement(textarea)
textarea.AXSelectedTextMarkerRange = textarea_range
wait for AXSelectedTextChanged on AXTextArea
diff --git a/content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable-expected-mac.txt b/content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable-expected-mac.txt
rename to content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable-expected.txt
diff --git a/content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable.html b/content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable.html
index f7435a3..a8693d6 100644
--- a/content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable.html
+++ b/content/test/data/accessibility/mac/selection/set-selectedtextrange-contenteditable.html
@@ -1,17 +1,17 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
// select 1st word
ce.AXSelectedTextRange = {loc: 0, len: 3}
wait for AXSelectedTextChanged on AXTextArea
ce.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// select text inside span
ce.AXSelectedTextRange = {loc: 22, len: 4}
wait for AXSelectedTextChanged on AXTextArea
ce.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// select text that starts in the <span> and ends in the <em>
ce.AXSelectedTextRange = {loc: 24, len: 15}
wait for AXSelectedTextChanged on AXTextArea
diff --git a/content/test/data/accessibility/mac/selection/set-selection-contenteditable-expected-mac.txt b/content/test/data/accessibility/mac/selection/set-selection-contenteditable-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/selection/set-selection-contenteditable-expected-mac.txt
rename to content/test/data/accessibility/mac/selection/set-selection-contenteditable-expected.txt
diff --git a/content/test/data/accessibility/mac/selection/set-selection-contenteditable.html b/content/test/data/accessibility/mac/selection/set-selection-contenteditable.html
index 3e55998..1082412b 100644
--- a/content/test/data/accessibility/mac/selection/set-selection-contenteditable.html
+++ b/content/test/data/accessibility/mac/selection/set-selection-contenteditable.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
// Select the 1st word via text marker associated with container AXTextArea.
text_range:= ce1.AXTextMarkerRangeForUIElement(ce1)
marker_0:= text_range.anchor
@@ -9,7 +9,7 @@
wait for AXSelectedTextChanged on AXTextArea
ce1.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// Select the 2nd word via the marker associated with AXStaticText.
text:= ce1.AXChildren[0].AXChildren[0]
text.AXValue
@@ -23,7 +23,7 @@
wait for AXSelectedTextChanged on AXTextArea
ce1.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// Select text inside a span.
text:= ce1.AXChildren[0].AXChildren[3]
text.AXValue
@@ -36,7 +36,7 @@
wait for AXSelectedTextChanged on AXTextArea
ce1.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// Select the text inside the block with incorrect grammar.
text:= ce1.AXChildren[0].AXChildren[1].AXChildren[0]
text.AXValue
@@ -45,7 +45,7 @@
wait for AXSelectedTextChanged on AXTextArea
ce1.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// Select the text after a forced break.
text:= ce2.AXChildren[0].AXChildren[2]
text.AXValue
diff --git a/content/test/data/accessibility/mac/selection/set-selection-textarea-expected-mac.txt b/content/test/data/accessibility/mac/selection/set-selection-textarea-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/selection/set-selection-textarea-expected-mac.txt
rename to content/test/data/accessibility/mac/selection/set-selection-textarea-expected.txt
diff --git a/content/test/data/accessibility/mac/selection/set-selection-textarea.html b/content/test/data/accessibility/mac/selection/set-selection-textarea.html
index 0fb8aff..8c4ebbf 100644
--- a/content/test/data/accessibility/mac/selection/set-selection-textarea.html
+++ b/content/test/data/accessibility/mac/selection/set-selection-textarea.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
// Select the 3rd word (AXSelectedTextMarkerRange).
text_range:= textarea.AXTextMarkerRangeForUIElement(textarea)
marker_0:= text_range.anchor
@@ -12,7 +12,7 @@
wait for AXSelectedTextChanged on AXTextArea
textarea.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// Select 2nd word on the 2nd line (AXSelectedTextMarkerRange).
text_range:= textarea.AXTextMarkerRangeForUIElement(textarea)
marker_0:= text_range.anchor
@@ -25,13 +25,13 @@
wait for AXSelectedTextChanged on AXTextArea
textarea.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// Select text on the 1st line (AXSelectedTextRange).
textarea.AXSelectedTextRange = {loc: 10, len: 5}
wait for AXSelectedTextChanged on AXTextArea
textarea.AXSelectedText
-@MAC-SCRIPT:
+@SCRIPT:
// select text on the 2nd line (AXSelectedTextRange).
textarea.AXSelectedTextRange = {loc: 20, len: 5}
wait for AXSelectedTextChanged on AXTextArea
diff --git a/content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker-expected-mac.txt b/content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker-expected-mac.txt
rename to content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker-expected.txt
diff --git a/content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker.html b/content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker.html
index 736653f4..b3bdde74 100644
--- a/content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker.html
+++ b/content/test/data/accessibility/mac/textmarker/ax-next-word-end-text-marker-for-text-marker.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
textarea.AXNextWordEndTextMarkerForTextMarker({:3, 0, down})
-->
<!DOCTYPE html>
diff --git a/content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker-expected-mac.txt b/content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker-expected-mac.txt
rename to content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker-expected.txt
diff --git a/content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker.html b/content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker.html
index fd22e41..5ad4487 100644
--- a/content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker.html
+++ b/content/test/data/accessibility/mac/textmarker/ax-previous-word-start-text-marker-for-text-marker.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
textarea.AXPreviousWordStartTextMarkerForTextMarker({:3, 3, down})
-->
<!DOCTYPE html>
diff --git a/content/test/data/accessibility/mac/textmarker/ax-start-text-marker-expected-mac.txt b/content/test/data/accessibility/mac/textmarker/ax-start-text-marker-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/textmarker/ax-start-text-marker-expected-mac.txt
rename to content/test/data/accessibility/mac/textmarker/ax-start-text-marker-expected.txt
diff --git a/content/test/data/accessibility/mac/textmarker/ax-start-text-marker.html b/content/test/data/accessibility/mac/textmarker/ax-start-text-marker.html
index e97971f..f7cc058 100644
--- a/content/test/data/accessibility/mac/textmarker/ax-start-text-marker.html
+++ b/content/test/data/accessibility/mac/textmarker/ax-start-text-marker.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:p.AXStartTextMarker
+@SCRIPT:p.AXStartTextMarker
-->
<!DOCTYPE html>
<html>
diff --git a/content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element-expected-mac.txt b/content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element-expected.txt
similarity index 100%
rename from content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element-expected-mac.txt
rename to content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element-expected.txt
diff --git a/content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element.html b/content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element.html
index af69f6a..1c2cd7ba 100644
--- a/content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element.html
+++ b/content/test/data/accessibility/mac/textmarker/ax-text-marker-range-for-ui-element.html
@@ -1,5 +1,5 @@
<!--
-@MAC-SCRIPT:
+@SCRIPT:
textarea.AXTextMarkerRangeForUIElement(:3)
-->
<!DOCTYPE html>
