diff options
author | Assam Boudjelthia <[email protected]> | 2021-05-11 12:49:40 +0300 |
---|---|---|
committer | Assam Boudjelthia <[email protected]> | 2021-06-29 14:08:24 +0300 |
commit | ae24e41ad4da78b029fd42ea317e4d2be73b015e (patch) | |
tree | 3f2d8c44dbf5a3eb666a7782bb5c1dfd62481c8e /tests/auto/qandroidfunctions | |
parent | ede82024b08842e9599b9bdbd00b7498601a921f (diff) |
The JNI utilities (i.e. QJniObject, QJniEnvironment) are already under
qtbase as public APIs.
Permission handling is now under QCoreApplication::{check,request}Permission
and QPermission namespace.
Some of the QtAndroid namespace functions are now under QNativeInterface's
QAndroidApplication, this includes:
* sdkVersion()
* hideSplashScreen()
* context() and isActivityContext()
* runOnAndroidMainThread()
The remaining APIs are now moved as private APIs under qtbase
ee05af296f65e240f64db6470cdddafbddbf2fa3. That is until we add
new cross-platform APIs to replace their functionalities like
Intents handling, starting activites and working with Services.
Task-number: QTBUG-83251
Task-number: QTBUG-84382
Pick-to: 6.2
Change-Id: Id077f8cbbe223a987916f737fad6088fb58e470d
Reviewed-by: Ville Voutilainen <[email protected]>
Diffstat (limited to 'tests/auto/qandroidfunctions')
-rw-r--r-- | tests/auto/qandroidfunctions/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp | 105 |
2 files changed, 0 insertions, 118 deletions
diff --git a/tests/auto/qandroidfunctions/CMakeLists.txt b/tests/auto/qandroidfunctions/CMakeLists.txt deleted file mode 100644 index ae983db..0000000 --- a/tests/auto/qandroidfunctions/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from qandroidfunctions.pro. - -##################################################################### -## tst_qandroidfunctions Test: -##################################################################### - -qt_internal_add_test(tst_qandroidfunctions - SOURCES - tst_qandroidfunctions.cpp - PUBLIC_LIBRARIES - Qt::AndroidExtras - Qt::Gui -) diff --git a/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp b/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp deleted file mode 100644 index f6bfc2b..0000000 --- a/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtTest/QtTest> -#include <QtAndroidExtras/QtAndroid> - -class tst_QAndroidFunctions : public QObject -{ - Q_OBJECT -private slots: - void testAndroidSdkVersion(); - void testAndroidActivity(); - void testRunOnAndroidThread(); -}; - -void tst_QAndroidFunctions::testAndroidSdkVersion() -{ - QVERIFY(QtAndroid::androidSdkVersion() > 0); -} - -void tst_QAndroidFunctions::testAndroidActivity() -{ - QAndroidJniObject activity = QtAndroid::androidActivity(); - QVERIFY(activity.isValid()); - QVERIFY(activity.callMethod<jboolean>("isTaskRoot")); -} - -void tst_QAndroidFunctions::testRunOnAndroidThread() -{ - int a = 0; - - // test async operation - QtAndroid::runOnAndroidThread([&a]{ - a = 1; - }); - QTRY_COMPARE(a, 1); // wait for async op. to finish - - // test sync operation - QtAndroid::runOnAndroidThreadSync([&a]{ - a = 2; - }); - QCOMPARE(a, 2); - - // test async/async lock - QtAndroid::runOnAndroidThread([&a]{ - QtAndroid::runOnAndroidThread([&a]{ - a = 3; - }); - }); - QTRY_COMPARE(a, 3); // wait for async op. to finish - - // test async/sync lock - QtAndroid::runOnAndroidThread([&a]{ - QtAndroid::runOnAndroidThreadSync([&a]{ - a = 5; - }); - }); - QTRY_COMPARE(a, 5); - - // test sync/sync lock - QtAndroid::runOnAndroidThreadSync([&a]{ - QtAndroid::runOnAndroidThreadSync([&a]{ - a = 4; - }); - }); - QCOMPARE(a, 4); - - - // test sync/async lock - QtAndroid::runOnAndroidThreadSync([&a]{ - QtAndroid::runOnAndroidThread([&a]{ - a = 6; - }); - }); - QCOMPARE(a, 6); -} - -QTEST_APPLESS_MAIN(tst_QAndroidFunctions) - -#include "tst_qandroidfunctions.moc" |