1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: fix Android filedialog and completer tests

Browse Source 
* https://developer.android.com/training/data-storage/use-cases#opt-out-
in-production-app

Pick-to: 6.4 6.3 6.2
Task-number: QTQAINFRA-4748
Change-Id: If6abb48b730b9b33807f5f6648e1360defc090a6
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Assam Boudjelthia 2022-08-17 16:06:20 +03:00
parent 1b4a792071
commit 2c6e71e562
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -418,7 +418,18 @@ void tst_QFiledialog::completer_data()
QTest::newRow("goto root") << QString() << rootPath << -1; QTest::newRow("goto root") << QString() << rootPath << -1;
QTest::newRow("start at root") << rootPath << QString() << -1; QTest::newRow("start at root") << rootPath << QString() << -1;
QFileInfoList list = QDir::root().entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); QDir dir = QDir::root();
#ifdef Q_OS_ANDROID
// Android 11 and above doesn't allow accessing root filesystem as before,
// so let's opt int for the app's home.
if (QNativeInterface::QAndroidApplication::sdkVersion() >= 30) {
const auto homePaths = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
QVERIFY(!homePaths.isEmpty());
dir = QDir(homePaths.first());
}
#endif
QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
QVERIFY(!list.isEmpty()); QVERIFY(!list.isEmpty());
const QString folder = list.first().absoluteFilePath(); const QString folder = list.first().absoluteFilePath();
QTest::newRow("start at one below root r") << folder << "r" << -1; QTest::newRow("start at one below root r") << folder << "r" << -1;

11
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
View File

@ -669,6 +669,17 @@ void tst_QFileDialog2::completionOnLevelAfterRoot()
} }
if (testDir.isEmpty()) if (testDir.isEmpty())
QSKIP("This test requires to have a unique directory of at least six ascii characters under c:/"); QSKIP("This test requires to have a unique directory of at least six ascii characters under c:/");
#elif defined(Q_OS_ANDROID)
// Android 11 and above doesn't allow accessing root filesystem as before,
// so let's opt int for the app's home.
const auto homePaths = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
QVERIFY(!homePaths.isEmpty());
fd.setFilter(QDir::Hidden | QDir::AllDirs | QDir::Files | QDir::System);
fd.setDirectory(homePaths.first());
QDir(homePaths.first()).mkdir("etc");
auto cleanup = qScopeGuard([&]() {
QDir(homePaths.first()).rmdir("etc");
});
#else #else
fd.setFilter(QDir::Hidden | QDir::AllDirs | QDir::Files | QDir::System); fd.setFilter(QDir::Hidden | QDir::AllDirs | QDir::Files | QDir::System);
fd.setDirectory("/"); fd.setDirectory("/");

20
tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
View File

@ -151,6 +151,16 @@ tst_QCompleter::~tst_QCompleter()
delete completer; delete completer;
} }
#ifdef Q_OS_ANDROID
static QString androidHomePath()
{
const auto homePaths = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
QDir dir = homePaths.isEmpty() ? QDir() : homePaths.first();
dir.cdUp();
return dir.path();
}
#endif
void tst_QCompleter::setSourceModel(ModelType type) void tst_QCompleter::setSourceModel(ModelType type)
{ {
QTreeWidgetItem *parent, *child; QTreeWidgetItem *parent, *child;
@ -203,7 +213,13 @@ void tst_QCompleter::setSourceModel(ModelType type)
completer->setCsvCompletion(false); completer->setCsvCompletion(false);
{ {
auto m = new QFileSystemModel(completer); auto m = new QFileSystemModel(completer);
#ifdef Q_OS_ANDROID
// Android 11 and above doesn't allow accessing root filesystem as before,
// so let's opt int for the app's home.
m->setRootPath(androidHomePath());
#else
m->setRootPath("/"); m->setRootPath("/");
#endif
completer->setModel(m); completer->setModel(m);
} }
completer->setCompletionColumn(0); completer->setCompletionColumn(0);
@ -590,7 +606,9 @@ void tst_QCompleter::fileSystemModel_data()
// QTest::newRow("(/d)") << "/d" << "" << "Developer" << "/Developer"; // QTest::newRow("(/d)") << "/d" << "" << "Developer" << "/Developer";
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID)
QTest::newRow("()") << "" << "" << "/" << "/"; QTest::newRow("()") << "" << "" << "/" << "/";
QTest::newRow("(/et)") << "/et" << "" << "etc" << "/etc"; const QString androidDir = androidHomePath();
const QString tag = QStringLiteral("%1/fil").arg(androidDir);
QTest::newRow(tag.toUtf8().data()) << tag << "" << "files" << androidDir + "/files";
#else #else
QTest::newRow("()") << "" << "" << "/" << "/"; QTest::newRow("()") << "" << "" << "/" << "/";
#if !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) #if !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX)