aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/accessibility')
-rw-r--r--tests/auto/accessibility/CMakeLists.txt5
-rw-r--r--tests/auto/accessibility/data/defaults/dayofweekrow-2.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/dayofweekrow.qml6
-rw-r--r--tests/auto/accessibility/data/defaults/monthgrid-2.qml6
-rw-r--r--tests/auto/accessibility/data/defaults/monthgrid.qml7
-rw-r--r--tests/auto/accessibility/data/defaults/weeknumbercolumn-2.qml4
-rw-r--r--tests/auto/accessibility/data/defaults/weeknumbercolumn.qml6
-rw-r--r--tests/auto/accessibility/data/override/dayofweekrow-2.qml6
-rw-r--r--tests/auto/accessibility/data/override/dayofweekrow.qml6
-rw-r--r--tests/auto/accessibility/data/override/monthgrid-2.qml7
-rw-r--r--tests/auto/accessibility/data/override/monthgrid.qml7
-rw-r--r--tests/auto/accessibility/data/override/weeknumbercolumn-2.qml4
-rw-r--r--tests/auto/accessibility/data/override/weeknumbercolumn.qml6
-rw-r--r--tests/auto/accessibility/tst_accessibility.cpp52
14 files changed, 23 insertions, 103 deletions
diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt
index a1f67d17..9a8fa784 100644
--- a/tests/auto/accessibility/CMakeLists.txt
+++ b/tests/auto/accessibility/CMakeLists.txt
@@ -1,5 +1,9 @@
# Generated from accessibility.pro.
+if(NOT QT_FEATURE_accessibility)
+ return()
+endif()
+
#####################################################################
## tst_accessibility Test:
#####################################################################
@@ -32,6 +36,7 @@ qt_add_test(tst_accessibility
#### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>:
# OTHER_FILES = "data/*.qml"
+# _REQUIREMENTS = "qtConfig(accessibility)"
## Scopes:
#####################################################################
diff --git a/tests/auto/accessibility/data/defaults/dayofweekrow-2.qml b/tests/auto/accessibility/data/defaults/dayofweekrow-2.qml
deleted file mode 100644
index 96c750cb..00000000
--- a/tests/auto/accessibility/data/defaults/dayofweekrow-2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-DayOfWeekRow { }
diff --git a/tests/auto/accessibility/data/defaults/dayofweekrow.qml b/tests/auto/accessibility/data/defaults/dayofweekrow.qml
deleted file mode 100644
index a2aa44ec..00000000
--- a/tests/auto/accessibility/data/defaults/dayofweekrow.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-DayOfWeekRow {
- Accessible.name: "DayOfWeekRow"
-}
diff --git a/tests/auto/accessibility/data/defaults/monthgrid-2.qml b/tests/auto/accessibility/data/defaults/monthgrid-2.qml
deleted file mode 100644
index 6368d090..00000000
--- a/tests/auto/accessibility/data/defaults/monthgrid-2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-MonthGrid {
- title: "MonthGrid"
-}
diff --git a/tests/auto/accessibility/data/defaults/monthgrid.qml b/tests/auto/accessibility/data/defaults/monthgrid.qml
deleted file mode 100644
index 03de2499..00000000
--- a/tests/auto/accessibility/data/defaults/monthgrid.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-MonthGrid {
- title: "MonthGrid"
- Accessible.name: title
-}
diff --git a/tests/auto/accessibility/data/defaults/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/defaults/weeknumbercolumn-2.qml
deleted file mode 100644
index 2c5b836b..00000000
--- a/tests/auto/accessibility/data/defaults/weeknumbercolumn-2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-WeekNumberColumn { }
diff --git a/tests/auto/accessibility/data/defaults/weeknumbercolumn.qml b/tests/auto/accessibility/data/defaults/weeknumbercolumn.qml
deleted file mode 100644
index 71d533ef..00000000
--- a/tests/auto/accessibility/data/defaults/weeknumbercolumn.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-WeekNumberColumn {
- Accessible.name: "WeekNumberColumn"
-}
diff --git a/tests/auto/accessibility/data/override/dayofweekrow-2.qml b/tests/auto/accessibility/data/override/dayofweekrow-2.qml
deleted file mode 100644
index 344bd94c..00000000
--- a/tests/auto/accessibility/data/override/dayofweekrow-2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-DayOfWeekRow {
- Accessible.name: "Override"
-}
diff --git a/tests/auto/accessibility/data/override/dayofweekrow.qml b/tests/auto/accessibility/data/override/dayofweekrow.qml
deleted file mode 100644
index e1e682c5..00000000
--- a/tests/auto/accessibility/data/override/dayofweekrow.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-DayOfWeekRow {
- Accessible.name: "DayOfWeekRowOverride"
-}
diff --git a/tests/auto/accessibility/data/override/monthgrid-2.qml b/tests/auto/accessibility/data/override/monthgrid-2.qml
deleted file mode 100644
index f56f7788..00000000
--- a/tests/auto/accessibility/data/override/monthgrid-2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-MonthGrid {
- title: "MonthGrid"
- Accessible.name: title + "Override"
-}
diff --git a/tests/auto/accessibility/data/override/monthgrid.qml b/tests/auto/accessibility/data/override/monthgrid.qml
deleted file mode 100644
index f56f7788..00000000
--- a/tests/auto/accessibility/data/override/monthgrid.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-MonthGrid {
- title: "MonthGrid"
- Accessible.name: title + "Override"
-}
diff --git a/tests/auto/accessibility/data/override/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/override/weeknumbercolumn-2.qml
deleted file mode 100644
index 2c5b836b..00000000
--- a/tests/auto/accessibility/data/override/weeknumbercolumn-2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-WeekNumberColumn { }
diff --git a/tests/auto/accessibility/data/override/weeknumbercolumn.qml b/tests/auto/accessibility/data/override/weeknumbercolumn.qml
deleted file mode 100644
index 7e182917..00000000
--- a/tests/auto/accessibility/data/override/weeknumbercolumn.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.12
-import Qt.labs.calendar 1.0
-
-WeekNumberColumn {
- Accessible.name: "WeekNumberColumnOverride"
-}
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp
index 6e5a37df..220facb3 100644
--- a/tests/auto/accessibility/tst_accessibility.cpp
+++ b/tests/auto/accessibility/tst_accessibility.cpp
@@ -144,10 +144,6 @@ void tst_accessibility::a11y_data()
QTest::newRow("ToolButton") << "toolbutton" << QAccessible::Button << "ToolButton";
QTest::newRow("ToolTip") << "tooltip" << QAccessible::ToolTip << "ToolTip";
QTest::newRow("Tumbler") << "tumbler" << QAccessible::NoRole << ""; // TODO
-
- QTest::newRow("DayOfWeekRow") << "dayofweekrow" << QAccessible::NoRole << "DayOfWeekRow";
- QTest::newRow("MonthGrid") << "monthgrid" << QAccessible::NoRole << "MonthGrid";
- QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << QAccessible::NoRole << "WeekNumberColumn";
}
void tst_accessibility::a11y()
@@ -167,19 +163,15 @@ void tst_accessibility::a11y()
#if QT_CONFIG(accessibility)
QQuickAccessibleAttached *attached = QQuickAccessibleAttached::attachedProperties(item);
- if (fileBaseName != QLatin1String("dayofweekrow")
- && fileBaseName != QLatin1String("monthgrid")
- && fileBaseName != QLatin1String("weeknumbercolumn")) {
- if (QAccessible::isActive()) {
- QVERIFY(attached);
- } else {
- QVERIFY(!attached);
- QPlatformAccessibility *accessibility = platformAccessibility();
- if (!accessibility)
- QSKIP("No QPlatformAccessibility available.");
- accessibility->setActive(true);
- attached = QQuickAccessibleAttached::attachedProperties(item);
- }
+ if (QAccessible::isActive()) {
+ QVERIFY(attached);
+ } else {
+ QVERIFY(!attached);
+ QPlatformAccessibility *accessibility = platformAccessibility();
+ if (!accessibility)
+ QSKIP("No QPlatformAccessibility available.");
+ accessibility->setActive(true);
+ attached = QQuickAccessibleAttached::attachedProperties(item);
}
QVERIFY(attached);
QCOMPARE(attached->role(), role);
@@ -237,10 +229,6 @@ void tst_accessibility::override_data()
QTest::newRow("ToolButton") << QAccessible::Button;
QTest::newRow("ToolTip") << QAccessible::ToolTip;
QTest::newRow("Tumbler") << QAccessible::NoRole;
-
- QTest::newRow("DayOfWeekRow") << QAccessible::NoRole;
- QTest::newRow("MonthGrid") << QAccessible::NoRole;
- QTest::newRow("WeekNumberColumn") << QAccessible::NoRole;
}
void tst_accessibility::override()
@@ -261,19 +249,15 @@ void tst_accessibility::override()
#if QT_CONFIG(accessibility)
QQuickAccessibleAttached *attached = QQuickAccessibleAttached::attachedProperties(item);
- if (fileBaseName != QLatin1String("dayofweekrow")
- && fileBaseName != QLatin1String("monthgrid")
- && fileBaseName != QLatin1String("weeknumbercolumn")) {
- if (QAccessible::isActive()) {
- QVERIFY(attached);
- } else {
- QPlatformAccessibility *accessibility = platformAccessibility();
- if (!accessibility)
- QSKIP("No QPlatformAccessibility available.");
- accessibility->setActive(true);
- if (!attached)
- attached = QQuickAccessibleAttached::attachedProperties(item);
- }
+ if (QAccessible::isActive()) {
+ QVERIFY(attached);
+ } else {
+ QPlatformAccessibility *accessibility = platformAccessibility();
+ if (!accessibility)
+ QSKIP("No QPlatformAccessibility available.");
+ accessibility->setActive(true);
+ if (!attached)
+ attached = QQuickAccessibleAttached::attachedProperties(item);
}
QVERIFY(attached);