diff options
Diffstat (limited to 'tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp')
-rw-r--r-- | tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp index 307e6b7..3115ae3 100644 --- a/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp +++ b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp @@ -41,6 +41,7 @@ #include <QtTest/QtTest> #include <QtAndroidExtras/QAndroidJniEnvironment> +#include <QtCore/private/qjnihelpers_p.h> class tst_QAndroidJniEnvironment : public QObject { @@ -49,23 +50,19 @@ class tst_QAndroidJniEnvironment : public QObject private slots: void jniEnv(); void javaVM(); - -public: - static JavaVM *m_javaVM; }; -JavaVM *tst_QAndroidJniEnvironment::m_javaVM = 0; - void tst_QAndroidJniEnvironment::jniEnv() { - QVERIFY(m_javaVM); + JavaVM *javaVM = QtAndroidPrivate::javaVM(); + QVERIFY(javaVM); { QAndroidJniEnvironment env; // JNI environment should now be attached to the current thread JNIEnv *jni = 0; - QCOMPARE(m_javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_OK); + QCOMPARE(javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_OK); JNIEnv *e = env; QVERIFY(e); @@ -84,28 +81,22 @@ void tst_QAndroidJniEnvironment::jniEnv() // The environment should automatically be detached when QAndroidJniEnvironment goes out of scope JNIEnv *jni = 0; - QCOMPARE(m_javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_EDETACHED); + QCOMPARE(javaVM->GetEnv((void**)&jni, JNI_VERSION_1_6), JNI_EDETACHED); } void tst_QAndroidJniEnvironment::javaVM() { - QVERIFY(m_javaVM); + JavaVM *javaVM = QtAndroidPrivate::javaVM(); + QVERIFY(javaVM); QAndroidJniEnvironment env; - QCOMPARE(env.javaVM(), m_javaVM); + QCOMPARE(env.javaVM(), javaVM); JavaVM *vm = 0; QCOMPARE(env->GetJavaVM(&vm), JNI_OK); QCOMPARE(env.javaVM(), vm); } -Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) -{ - Q_UNUSED(reserved) - tst_QAndroidJniEnvironment::m_javaVM = vm; - return JNI_VERSION_1_6; -} - QTEST_APPLESS_MAIN(tst_QAndroidJniEnvironment) #include "tst_qandroidjnienvironment.moc" |