From 2893bc8f0b6432b9b1c686a93cdca94a36418308 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 4 Mar 2020 17:47:21 +0100 Subject: Adaptations for Chromium 80 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icaf68648cbc2c13a61fc3b208ff1e64ca36c90b6 Reviewed-by: Jüri Valdmann --- tests/auto/quick/publicapi/tst_publicapi.cpp | 1 + .../widgets/accessibility/tst_accessibility.cpp | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index aaca7997b..dad962576 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -126,6 +126,7 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineCertificateError.CertificateContainsErrors --> Error" << "QQuickWebEngineCertificateError.CertificateDateInvalid --> Error" << "QQuickWebEngineCertificateError.CertificateInvalid --> Error" + << "QQuickWebEngineCertificateError.CertificateKnownInterceptionBlocked --> Error" << "QQuickWebEngineCertificateError.CertificateNameConstraintViolation --> Error" << "QQuickWebEngineCertificateError.CertificateNoRevocationMechanism --> Error" << "QQuickWebEngineCertificateError.CertificateNonUniqueName --> Error" diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp index 9ec9e6a5b..748837c7f 100644 --- a/tests/auto/widgets/accessibility/tst_accessibility.cpp +++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp @@ -337,17 +337,9 @@ void tst_Accessibility::roles_data() QTest::addColumn("role"); QTest::newRow("ax::mojom::Role::kAbbr") << QString("a") << 1 << QAccessible::StaticText; - QTest::newRow("ax::mojom::Role::KAlert") << QString("
alert
") << 0 << QAccessible::AlertMessage; + QTest::newRow("ax::mojom::Role::kAlert") << QString("
alert
") << 0 << QAccessible::AlertMessage; QTest::newRow("ax::mojom::Role::kAlertDialog") << QString("
alert
") << 0 << QAccessible::AlertMessage; QTest::newRow("ax::mojom::Role::kAnchor") << QString("Chapter a") << 1 << QAccessible::Link; - - // REMINDER: annotation roles are removed from Chromium 80: https://chromium-review.googlesource.com/c/chromium/src/+/1907074 - //QTest::newRow("ax::mojom::Role::kAnnotationAttribution") << QString("
") << 0 << QAccessible::Section; // FIXME: Aria role 'annotation-attribution' should work - //QTest::newRow("ax::mojom::Role::kAnnotationCommentary") << QString("
") << 0 << QAccessible::Section; // FIXME: Aria role 'annotation-commentary' should work - //QTest::newRow("ax::mojom::Role::kAnnotationPresence") << QString("
") << 0 << QAccessible::Section; // FIXME: Aria role 'annotation-presence' should work - //QTest::newRow("ax::mojom::Role::kAnnotationRevision") << QString("
") << 0 << QAccessible::Section; // FIXME: Aria role 'annotation-revision' should work - //QTest::newRow("ax::mojom::Role::kAnnotationSuggestion") << QString("
") << 0 << QAccessible::Section; // FIXME: Aria role 'annotation-suggestion' should work - QTest::newRow("ax::mojom::Role::kApplication") << QString("
landmark
") << 0 << QAccessible::Document; QTest::newRow("ax::mojom::Role::kArticle") << QString("
a
") << 0 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kAudio") << QString("") << 1 << QAccessible::Sound; @@ -360,6 +352,7 @@ void tst_Accessibility::roles_data() QTest::newRow("ax::mojom::Role::kCell") << QString("
a
") << 2 << QAccessible::Cell; QTest::newRow("ax::mojom::Role::kCheckBox") << QString("a") << 1 << QAccessible::CheckBox; QTest::newRow("ax::mojom::Role::kClient") << QString("") << 0 << QAccessible::Client; + QTest::newRow("ax::mojom::Role::kCode") << QString("a") << 1 << QAccessible::StaticText; QTest::newRow("ax::mojom::Role::kColorWell") << QString("a") << 1 << QAccessible::ColorChooser; //QTest::newRow("ax::mojom::Role::kColumn") << QString("
a
") << 0 << QAccessible::Column; // FIXME: The test case might be wrong (see AXTableColumn.h) QTest::newRow("ax::mojom::Role::kColumnHeader") << QString("
a
a
") << 2 << QAccessible::ColumnHeader; @@ -367,6 +360,8 @@ void tst_Accessibility::roles_data() QTest::newRow("ax::mojom::Role::kComboBoxMenuButton") << QString("
Select
") << 0 << QAccessible::ComboBox; QTest::newRow("ax::mojom::Role::kTextFieldWithComboBox") << QString("") << 1 << QAccessible::ComboBox; QTest::newRow("ax::mojom::Role::kComplementary") << QString("") << 0 << QAccessible::ComplementaryContent; + QTest::newRow("ax::mojom::Role::kComment") << QString("
") << 0 << QAccessible::Section; + QTest::newRow("ax::mojom::Role::kCommenSection") << QString("
") << 0 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kContentDeletion") << QString("
") << 0 << QAccessible::Grouping; QTest::newRow("ax::mojom::Role::kContentInsertion") << QString("
") << 0 << QAccessible::Grouping; QTest::newRow("ax::mojom::Role::kContentInfo") << QString("
") << 0 << QAccessible::Section; @@ -423,6 +418,7 @@ void tst_Accessibility::roles_data() QTest::newRow("ax::mojom::Role::kDocToc") << QString("
") << 0 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kDocument") << QString("
a
") << 0 << QAccessible::Document; QTest::newRow("ax::mojom::Role::kEmbeddedObject") << QString("") << 1 << QAccessible::Grouping; + QTest::newRow("ax::mojom::Role::kEmphasis") << QString("a") << 1 << QAccessible::StaticText; QTest::newRow("ax::mojom::Role::kFeed") << QString("
a
") << 0 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kFigcaption") << QString("
a
") << 0 << QAccessible::Heading; QTest::newRow("ax::mojom::Role::kFigure") << QString("
a
") << 0 << QAccessible::Section; @@ -484,7 +480,9 @@ void tst_Accessibility::roles_data() QTest::newRow("ax::mojom::Role::kRadioButton") << QString("") << 1 << QAccessible::RadioButton; QTest::newRow("ax::mojom::Role::kRadioGroup") << QString("
") << 0 << QAccessible::Grouping; QTest::newRow("ax::mojom::Role::kRegion") << QString("
a
") << 0 << QAccessible::Section; + QTest::newRow("ax::mojom::Role::kRevision") << QString("
") << 0 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kRow") << QString("
a
") << 1 << QAccessible::Row; + QTest::newRow("ax::mojom::Role::kRowGroup") << QString("
a
") << 1 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kRowHeader") << QString("
ab
") << 2 << QAccessible::RowHeader; QTest::newRow("ax::mojom::Role::kRuby") << QString("a") << 1 << QAccessible::StaticText; QTest::newRow("ax::mojom::Role::kRubyAnnotation") << QString("a") << 2 << QAccessible::StaticText; @@ -499,6 +497,8 @@ void tst_Accessibility::roles_data() QTest::newRow("ax::mojom::Role::kSplitter") << QString("
") << 0 << QAccessible::Splitter; QTest::newRow("ax::mojom::Role::kStaticText") << QString("a") << 1 << QAccessible::StaticText; QTest::newRow("ax::mojom::Role::kStatus") << QString("a") << 1 << QAccessible::Indicator; + QTest::newRow("ax::mojom::Role::kStrong") << QString("a") << 1 << QAccessible::StaticText; + QTest::newRow("ax::mojom::Role::kSuggestion") << QString("
") << 0 << QAccessible::Section; QTest::newRow("ax::mojom::Role::kSvgRoot") << QString("") << 1 << QAccessible::Graphic; QTest::newRow("ax::mojom::Role::kSwitch") << QString("") << 1 << QAccessible::Button; QTest::newRow("ax::mojom::Role::kTable") << QString("
a
") << 0 << QAccessible::Table; @@ -554,7 +554,8 @@ void tst_Accessibility::roles() } static QByteArrayList params = QByteArrayList() - << "--force-renderer-accessibility"; + << "--force-renderer-accessibility" + << "--enable-features=AccessibilityExposeARIAAnnotations"; W_QTEST_MAIN(tst_Accessibility, params) #include "tst_accessibility.moc" -- cgit v1.2.3