aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qandroidjnienvironment
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-05-11 12:49:40 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-06-29 14:08:24 +0300
commitae24e41ad4da78b029fd42ea317e4d2be73b015e (patch)
tree3f2d8c44dbf5a3eb666a7782bb5c1dfd62481c8e /tests/auto/qandroidjnienvironment
parentede82024b08842e9599b9bdbd00b7498601a921f (diff)
Remove QtAndroidExtras module and add note about its state in Qt 6HEADdev
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 <ville.voutilainen@qt.io>
Diffstat (limited to 'tests/auto/qandroidjnienvironment')
-rw-r--r--tests/auto/qandroidjnienvironment/CMakeLists.txt14
-rw-r--r--tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp90
2 files changed, 0 insertions, 104 deletions
diff --git a/tests/auto/qandroidjnienvironment/CMakeLists.txt b/tests/auto/qandroidjnienvironment/CMakeLists.txt
deleted file mode 100644
index 56dd64f..0000000
--- a/tests/auto/qandroidjnienvironment/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated from qandroidjnienvironment.pro.
-
-#####################################################################
-## tst_qandroidjnienvironment Test:
-#####################################################################
-
-qt_internal_add_test(tst_qandroidjnienvironment
- SOURCES
- tst_qandroidjnienvironment.cpp
- PUBLIC_LIBRARIES
- Qt::AndroidExtras
- Qt::CorePrivate
- Qt::Gui
-)
diff --git a/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
deleted file mode 100644
index 3aa2033..0000000
--- a/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
+++ /dev/null
@@ -1,90 +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/QAndroidJniEnvironment>
-#include <QtCore/private/qjnihelpers_p.h>
-
-class tst_QAndroidJniEnvironment : public QObject
-{
- Q_OBJECT
-
-private slots:
- void jniEnv();
- void javaVM();
-};
-
-void tst_QAndroidJniEnvironment::jniEnv()
-{
- JavaVM *javaVM = QtAndroidPrivate::javaVM();
- QVERIFY(javaVM);
-
- {
- QAndroidJniEnvironment env;
-
- // JNI environment should now be attached to the current thread
- JNIEnv *jni = 0;
- QCOMPARE(javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_OK);
-
- JNIEnv *e = env;
- QVERIFY(e);
-
- QCOMPARE(env->GetVersion(), JNI_VERSION_1_6);
-
- // try to find an existing class
- QVERIFY(env->FindClass("java/lang/Object"));
- QVERIFY(!env->ExceptionCheck());
-
- // try to find a nonexistent class
- QVERIFY(!env->FindClass("this/doesnt/Exist"));
- QVERIFY(env->ExceptionCheck());
- env->ExceptionClear();
- }
-
- // The env does not detach automatically, even if it goes out of scope. The only way it can
- // be detached is if it's done explicitly, or if the thread we attached to gets killed (TLS clean-up).
- JNIEnv *jni = nullptr;
- QCOMPARE(javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_OK);
-}
-
-void tst_QAndroidJniEnvironment::javaVM()
-{
- JavaVM *javaVM = QtAndroidPrivate::javaVM();
- QVERIFY(javaVM);
-
- QAndroidJniEnvironment env;
- QCOMPARE(env.javaVM(), javaVM);
-
- JavaVM *vm = 0;
- QCOMPARE(env->GetJavaVM(&vm), JNI_OK);
- QCOMPARE(env.javaVM(), vm);
-}
-
-QTEST_APPLESS_MAIN(tst_QAndroidJniEnvironment)
-
-#include "tst_qandroidjnienvironment.moc"