Rename QJNIXxx classes to QAndroidJniXxx.

The old classes where not following the usual convention for acronyms
in class names.

Change-Id: I2fad72483c51ca95a2703d914d6a678c5f7cde98
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

8 files changed, 169 insertions, 169 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index edcc5f0..94b6dd8 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS += \
         cmake \
-        qjnienvironment \
-        qjniobject
+        qandroidjnienvironment \
+        qandroidjniobject
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 7a81196..a786745 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -10,5 +10,5 @@ find_package(Qt5Core REQUIRED)
 include("${_Qt5CTestMacros}")
 
 test_module_includes(
-  AndroidExtras QJNIObject
+  AndroidExtras QAndroidJniObject
 )
diff --git a/tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro b/tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro
new file mode 100644
index 0000000..3c4fcf7
--- /dev/null
+++ b/tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qandroidjnienvironment
+QT += testlib androidextras
+SOURCES += tst_qandroidjnienvironment.cpp
diff --git a/tests/auto/qjnienvironment/tst_qjnienvironment.cpp b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
index 7d5de58..307e6b7 100644
--- a/tests/auto/qjnienvironment/tst_qjnienvironment.cpp
+++ b/tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtAndroidExtras/QJNIEnvironment>
+#include <QtAndroidExtras/QAndroidJniEnvironment>
 
-class tst_QJNIEnvironment : public QObject
+class tst_QAndroidJniEnvironment : public QObject
 {
     Q_OBJECT
 
@@ -54,14 +54,14 @@ public:
     static JavaVM *m_javaVM;
 };
 
-JavaVM *tst_QJNIEnvironment::m_javaVM = 0;
+JavaVM *tst_QAndroidJniEnvironment::m_javaVM = 0;
 
-void tst_QJNIEnvironment::jniEnv()
+void tst_QAndroidJniEnvironment::jniEnv()
 {
     QVERIFY(m_javaVM);
 
     {
-        QJNIEnvironment env;
+        QAndroidJniEnvironment env;
 
         // JNI environment should now be attached to the current thread
         JNIEnv *jni = 0;
@@ -82,16 +82,16 @@ void tst_QJNIEnvironment::jniEnv()
         env->ExceptionClear();
     }
 
-    // The environment should automatically be detached when QJNIEnvironment goes out of scope
+    // 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);
 }
 
-void tst_QJNIEnvironment::javaVM()
+void tst_QAndroidJniEnvironment::javaVM()
 {
     QVERIFY(m_javaVM);
 
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     QCOMPARE(env.javaVM(), m_javaVM);
 
     JavaVM *vm = 0;
@@ -102,10 +102,10 @@ void tst_QJNIEnvironment::javaVM()
 Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
     Q_UNUSED(reserved)
-    tst_QJNIEnvironment::m_javaVM = vm;
+    tst_QAndroidJniEnvironment::m_javaVM = vm;
     return JNI_VERSION_1_6;
 }
 
-QTEST_APPLESS_MAIN(tst_QJNIEnvironment)
+QTEST_APPLESS_MAIN(tst_QAndroidJniEnvironment)
 
-#include "tst_qjnienvironment.moc"
+#include "tst_qandroidjnienvironment.moc"
diff --git a/tests/auto/qandroidjniobject/qandroidjniobject.pro b/tests/auto/qandroidjniobject/qandroidjniobject.pro
new file mode 100644
index 0000000..83e658a
--- /dev/null
+++ b/tests/auto/qandroidjniobject/qandroidjniobject.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qandroidjniobject
+QT += testlib androidextras
+SOURCES += tst_qandroidjniobject.cpp
diff --git a/tests/auto/qjniobject/tst_qjniobject.cpp b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
index cc0f286..4b8f1d5 100644
--- a/tests/auto/qjniobject/tst_qjniobject.cpp
+++ b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
@@ -41,15 +41,15 @@
 
 #include <QString>
 #include <QtTest>
-#include <QtAndroidExtras/QJNIObject>
-#include <QtAndroidExtras/QJNIEnvironment>
+#include <QtAndroidExtras/QAndroidJniObject>
+#include <QtAndroidExtras/QAndroidJniEnvironment>
 
-class tst_QJNIObject : public QObject
+class tst_QAndroidJniObject : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QJNIObject();
+    tst_QAndroidJniObject();
 
 private slots:
     void initTestCase();
@@ -102,62 +102,62 @@ public:
     static jclass m_activityDelegateClass;
 };
 
-jclass tst_QJNIObject::m_activityDelegateClass = 0;
+jclass tst_QAndroidJniObject::m_activityDelegateClass = 0;
 
-tst_QJNIObject::tst_QJNIObject()
+tst_QAndroidJniObject::tst_QAndroidJniObject()
 {
 }
 
-void tst_QJNIObject::initTestCase()
+void tst_QAndroidJniObject::initTestCase()
 {
 }
 
-void tst_QJNIObject::cleanupTestCase()
+void tst_QAndroidJniObject::cleanupTestCase()
 {
 }
 
-void tst_QJNIObject::ctor()
+void tst_QAndroidJniObject::ctor()
 {
     {
-        QJNIObject object;
+        QAndroidJniObject object;
         QVERIFY(!object.isValid());
     }
 
     {
-        QJNIObject object("java/lang/String");
+        QAndroidJniObject object("java/lang/String");
         QVERIFY(object.isValid());
     }
 
     {
-        QJNIObject string = QJNIObject::fromString(QLatin1String("Hello, Java"));
-        QJNIObject object("java/lang/String", "(Ljava/lang/String;)V", string.object<jstring>());
+        QAndroidJniObject string = QAndroidJniObject::fromString(QLatin1String("Hello, Java"));
+        QAndroidJniObject object("java/lang/String", "(Ljava/lang/String;)V", string.object<jstring>());
         QVERIFY(object.isValid());
         QCOMPARE(string.toString(), object.toString());
     }
 
     {
-        QJNIEnvironment env;
+        QAndroidJniEnvironment env;
         jclass javaStringClass = env->FindClass("java/lang/String");
-        QJNIObject string(javaStringClass);
+        QAndroidJniObject string(javaStringClass);
         QVERIFY(string.isValid());
     }
 
     {
-        QJNIEnvironment env;
+        QAndroidJniEnvironment env;
         const QString qString = QLatin1String("Hello, Java");
         jclass javaStringClass = env->FindClass("java/lang/String");
-        QJNIObject string = QJNIObject::fromString(qString);
-        QJNIObject stringCpy(javaStringClass, "(Ljava/lang/String;)V", string.object<jstring>());
+        QAndroidJniObject string = QAndroidJniObject::fromString(qString);
+        QAndroidJniObject stringCpy(javaStringClass, "(Ljava/lang/String;)V", string.object<jstring>());
         QVERIFY(stringCpy.isValid());
         QCOMPARE(qString, stringCpy.toString());
     }
 }
 
-void tst_QJNIObject::callMethodTest()
+void tst_QAndroidJniObject::callMethodTest()
 {
     {
-        QJNIObject jString1 = QJNIObject::fromString(QLatin1String("Hello, Java"));
-        QJNIObject jString2 = QJNIObject::fromString(QLatin1String("hELLO, jAVA"));
+        QAndroidJniObject jString1 = QAndroidJniObject::fromString(QLatin1String("Hello, Java"));
+        QAndroidJniObject jString2 = QAndroidJniObject::fromString(QLatin1String("hELLO, jAVA"));
         QVERIFY(jString1 != jString2);
 
         const jboolean isEmpty = jString1.callMethod<jboolean>("isEmpty");
@@ -171,38 +171,38 @@ void tst_QJNIObject::callMethodTest()
 
     {
         jlong jLong = 100;
-        QJNIObject longObject("java/lang/Long", "(J)V", jLong);
+        QAndroidJniObject longObject("java/lang/Long", "(J)V", jLong);
         jlong ret = longObject.callMethod<jlong>("longValue");
         QCOMPARE(ret, jLong);
     }
 }
 
-void tst_QJNIObject::callObjectMethodTest()
+void tst_QAndroidJniObject::callObjectMethodTest()
 {
     const QString qString = QLatin1String("Hello, Java");
-    QJNIObject jString = QJNIObject::fromString(qString);
+    QAndroidJniObject jString = QAndroidJniObject::fromString(qString);
     const QString qStringRet = jString.callObjectMethod<jstring>("toUpperCase").toString();
     QCOMPARE(qString.toUpper(), qStringRet);
 
-    QJNIObject subString = jString.callObjectMethod("substring",
+    QAndroidJniObject subString = jString.callObjectMethod("substring",
                                                     "(II)Ljava/lang/String;",
                                                     0, 4);
     QCOMPARE(subString.toString(), qString.mid(0, 4));
 }
 
-void tst_QJNIObject::stringConvertionTest()
+void tst_QAndroidJniObject::stringConvertionTest()
 {
     const QString qString(QLatin1String("Hello, Java"));
-    QJNIObject jString = QJNIObject::fromString(qString);
+    QAndroidJniObject jString = QAndroidJniObject::fromString(qString);
     QVERIFY(jString.isValid());
     QString qStringRet = jString.toString();
     QCOMPARE(qString, qStringRet);
 }
 
-void tst_QJNIObject::compareOperatorTests()
+void tst_QAndroidJniObject::compareOperatorTests()
 {
     QString str("hello!");
-    QJNIObject stringObject = QJNIObject::fromString(str);
+    QAndroidJniObject stringObject = QAndroidJniObject::fromString(str);
 
     jobject jobj = stringObject.object<jobject>();
     jstring jsobj = stringObject.object<jstring>();
@@ -212,14 +212,14 @@ void tst_QJNIObject::compareOperatorTests()
     QVERIFY(jsobj == stringObject);
     QVERIFY(stringObject == jsobj);
 
-    QJNIObject stringObject3 = stringObject.object<jstring>();
+    QAndroidJniObject stringObject3 = stringObject.object<jstring>();
     QVERIFY(stringObject3 == stringObject);
 
-    QJNIObject stringObject2 = QJNIObject::fromString(str);
+    QAndroidJniObject stringObject2 = QAndroidJniObject::fromString(str);
     QVERIFY(stringObject != stringObject2);
 
     jstring jstrobj = 0;
-    QJNIObject invalidStringObject;
+    QAndroidJniObject invalidStringObject;
     QVERIFY(invalidStringObject == jstrobj);
 
     QVERIFY(jstrobj != stringObject);
@@ -227,13 +227,13 @@ void tst_QJNIObject::compareOperatorTests()
     QVERIFY(!invalidStringObject.isValid());
 }
 
-void tst_QJNIObject::callStaticObjectMethodClassName()
+void tst_QAndroidJniObject::callStaticObjectMethodClassName()
 {
-    QJNIObject formatString = QJNIObject::fromString(QLatin1String("test format"));
+    QAndroidJniObject formatString = QAndroidJniObject::fromString(QLatin1String("test format"));
     QVERIFY(formatString.isValid());
 
-    QVERIFY(QJNIObject::isClassAvailable("java/lang/String"));
-    QJNIObject returnValue = QJNIObject::callStaticObjectMethod("java/lang/String",
+    QVERIFY(QAndroidJniObject::isClassAvailable("java/lang/String"));
+    QAndroidJniObject returnValue = QAndroidJniObject::callStaticObjectMethod("java/lang/String",
                                                                 "format",
                                                                 "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;",
                                                                 formatString.object<jstring>(),
@@ -245,16 +245,16 @@ void tst_QJNIObject::callStaticObjectMethodClassName()
     QCOMPARE(returnedString, QString::fromLatin1("test format"));
 }
 
-void tst_QJNIObject::callStaticObjectMethod()
+void tst_QAndroidJniObject::callStaticObjectMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/String");
     QVERIFY(cls != 0);
 
-    QJNIObject formatString = QJNIObject::fromString(QLatin1String("test format"));
+    QAndroidJniObject formatString = QAndroidJniObject::fromString(QLatin1String("test format"));
     QVERIFY(formatString.isValid());
 
-    QJNIObject returnValue = QJNIObject::callStaticObjectMethod(cls,
+    QAndroidJniObject returnValue = QAndroidJniObject::callStaticObjectMethod(cls,
                                                                 "format",
                                                                 "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;",
                                                                 formatString.object<jstring>(),
@@ -266,17 +266,17 @@ void tst_QJNIObject::callStaticObjectMethod()
     QCOMPARE(returnedString, QString::fromLatin1("test format"));
 }
 
-void tst_QJNIObject::callStaticBooleanMethod()
+void tst_QAndroidJniObject::callStaticBooleanMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Boolean");
     QVERIFY(cls != 0);
 
     {
-        QJNIObject parameter = QJNIObject::fromString("true");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("true");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>(cls,
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>(cls,
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -284,10 +284,10 @@ void tst_QJNIObject::callStaticBooleanMethod()
     }
 
     {
-        QJNIObject parameter = QJNIObject::fromString("false");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("false");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>(cls,
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>(cls,
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -295,13 +295,13 @@ void tst_QJNIObject::callStaticBooleanMethod()
     }
 }
 
-void tst_QJNIObject::callStaticBooleanMethodClassName()
+void tst_QAndroidJniObject::callStaticBooleanMethodClassName()
 {
     {
-        QJNIObject parameter = QJNIObject::fromString("true");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("true");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>("java/lang/Boolean",
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>("java/lang/Boolean",
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -309,10 +309,10 @@ void tst_QJNIObject::callStaticBooleanMethodClassName()
     }
 
     {
-        QJNIObject parameter = QJNIObject::fromString("false");
+        QAndroidJniObject parameter = QAndroidJniObject::fromString("false");
         QVERIFY(parameter.isValid());
 
-        jboolean b = QJNIObject::callStaticMethod<jboolean>("java/lang/Boolean",
+        jboolean b = QAndroidJniObject::callStaticMethod<jboolean>("java/lang/Boolean",
                                                             "parseBoolean",
                                                             "(Ljava/lang/String;)Z",
                                                             parameter.object<jstring>());
@@ -320,40 +320,40 @@ void tst_QJNIObject::callStaticBooleanMethodClassName()
     }
 }
 
-void tst_QJNIObject::callStaticByteMethodClassName()
+void tst_QAndroidJniObject::callStaticByteMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jbyte returnValue = QJNIObject::callStaticMethod<jbyte>("java/lang/Byte",
+    jbyte returnValue = QAndroidJniObject::callStaticMethod<jbyte>("java/lang/Byte",
                                                             "parseByte",
                                                             "(Ljava/lang/String;)B",
                                                             parameter.object<jstring>());
     QCOMPARE(returnValue, jbyte(number.toInt()));
 }
 
-void tst_QJNIObject::callStaticByteMethod()
+void tst_QAndroidJniObject::callStaticByteMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Byte");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jbyte returnValue = QJNIObject::callStaticMethod<jbyte>(cls,
+    jbyte returnValue = QAndroidJniObject::callStaticMethod<jbyte>(cls,
                                                             "parseByte",
                                                             "(Ljava/lang/String;)B",
                                                             parameter.object<jstring>());
     QCOMPARE(returnValue, jbyte(number.toInt()));
 }
 
-void tst_QJNIObject::callStaticIntMethodClassName()
+void tst_QAndroidJniObject::callStaticIntMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jint returnValue = QJNIObject::callStaticMethod<jint>("java/lang/Integer",
+    jint returnValue = QAndroidJniObject::callStaticMethod<jint>("java/lang/Integer",
                                                           "parseInt",
                                                           "(Ljava/lang/String;)I",
                                                           parameter.object<jstring>());
@@ -361,25 +361,25 @@ void tst_QJNIObject::callStaticIntMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticIntMethod()
+void tst_QAndroidJniObject::callStaticIntMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Integer");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jint returnValue = QJNIObject::callStaticMethod<jint>(cls,
+    jint returnValue = QAndroidJniObject::callStaticMethod<jint>(cls,
                                                           "parseInt",
                                                           "(Ljava/lang/String;)I",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toInt());
 }
 
-void tst_QJNIObject::callStaticCharMethodClassName()
+void tst_QAndroidJniObject::callStaticCharMethodClassName()
 {
-    jchar returnValue = QJNIObject::callStaticMethod<jchar>("java/lang/Character",
+    jchar returnValue = QAndroidJniObject::callStaticMethod<jchar>("java/lang/Character",
                                                             "toUpperCase",
                                                             "(C)C",
                                                             jchar('a'));
@@ -387,25 +387,25 @@ void tst_QJNIObject::callStaticCharMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticCharMethod()
+void tst_QAndroidJniObject::callStaticCharMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Character");
     QVERIFY(cls != 0);
 
-    jchar returnValue = QJNIObject::callStaticMethod<jchar>(cls,
+    jchar returnValue = QAndroidJniObject::callStaticMethod<jchar>(cls,
                                                             "toUpperCase",
                                                             "(C)C",
                                                             jchar('a'));
     QCOMPARE(returnValue, jchar('A'));
 }
 
-void tst_QJNIObject::callStaticDoubleMethodClassName    ()
+void tst_QAndroidJniObject::callStaticDoubleMethodClassName    ()
 {
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jdouble returnValue = QJNIObject::callStaticMethod<jdouble>("java/lang/Double",
+    jdouble returnValue = QAndroidJniObject::callStaticMethod<jdouble>("java/lang/Double",
                                                           "parseDouble",
                                                           "(Ljava/lang/String;)D",
                                                           parameter.object<jstring>());
@@ -413,28 +413,28 @@ void tst_QJNIObject::callStaticDoubleMethodClassName    ()
 }
 
 
-void tst_QJNIObject::callStaticDoubleMethod()
+void tst_QAndroidJniObject::callStaticDoubleMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Double");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jdouble returnValue = QJNIObject::callStaticMethod<jdouble>(cls,
+    jdouble returnValue = QAndroidJniObject::callStaticMethod<jdouble>(cls,
                                                           "parseDouble",
                                                           "(Ljava/lang/String;)D",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toDouble());
 }
 
-void tst_QJNIObject::callStaticFloatMethodClassName()
+void tst_QAndroidJniObject::callStaticFloatMethodClassName()
 {
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jfloat returnValue = QJNIObject::callStaticMethod<jfloat>("java/lang/Float",
+    jfloat returnValue = QAndroidJniObject::callStaticMethod<jfloat>("java/lang/Float",
                                                           "parseFloat",
                                                           "(Ljava/lang/String;)F",
                                                           parameter.object<jstring>());
@@ -442,28 +442,28 @@ void tst_QJNIObject::callStaticFloatMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticFloatMethod()
+void tst_QAndroidJniObject::callStaticFloatMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Float");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123.45);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jfloat returnValue = QJNIObject::callStaticMethod<jfloat>(cls,
+    jfloat returnValue = QAndroidJniObject::callStaticMethod<jfloat>(cls,
                                                           "parseFloat",
                                                           "(Ljava/lang/String;)F",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toFloat());
 }
 
-void tst_QJNIObject::callStaticShortMethodClassName()
+void tst_QAndroidJniObject::callStaticShortMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jshort returnValue = QJNIObject::callStaticMethod<jshort>("java/lang/Short",
+    jshort returnValue = QAndroidJniObject::callStaticMethod<jshort>("java/lang/Short",
                                                           "parseShort",
                                                           "(Ljava/lang/String;)S",
                                                           parameter.object<jstring>());
@@ -471,54 +471,54 @@ void tst_QJNIObject::callStaticShortMethodClassName()
 }
 
 
-void tst_QJNIObject::callStaticShortMethod()
+void tst_QAndroidJniObject::callStaticShortMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Short");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jshort returnValue = QJNIObject::callStaticMethod<jshort>(cls,
+    jshort returnValue = QAndroidJniObject::callStaticMethod<jshort>(cls,
                                                           "parseShort",
                                                           "(Ljava/lang/String;)S",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, number.toShort());
 }
 
-void tst_QJNIObject::callStaticLongMethodClassName()
+void tst_QAndroidJniObject::callStaticLongMethodClassName()
 {
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jlong returnValue = QJNIObject::callStaticMethod<jlong>("java/lang/Long",
+    jlong returnValue = QAndroidJniObject::callStaticMethod<jlong>("java/lang/Long",
                                                           "parseLong",
                                                           "(Ljava/lang/String;)J",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, jlong(number.toLong()));
 }
 
-void tst_QJNIObject::callStaticLongMethod()
+void tst_QAndroidJniObject::callStaticLongMethod()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Long");
     QVERIFY(cls != 0);
 
     QString number = QString::number(123);
-    QJNIObject parameter = QJNIObject::fromString(number);
+    QAndroidJniObject parameter = QAndroidJniObject::fromString(number);
 
-    jlong returnValue = QJNIObject::callStaticMethod<jlong>(cls,
+    jlong returnValue = QAndroidJniObject::callStaticMethod<jlong>(cls,
                                                           "parseLong",
                                                           "(Ljava/lang/String;)J",
                                                           parameter.object<jstring>());
     QCOMPARE(returnValue, jlong(number.toLong()));
 }
 
-void tst_QJNIObject::getStaticObjectFieldClassName()
+void tst_QAndroidJniObject::getStaticObjectFieldClassName()
 {
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>("java/lang/Boolean",
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>("java/lang/Boolean",
                                                                           "FALSE",
                                                                           "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -528,7 +528,7 @@ void tst_QJNIObject::getStaticObjectFieldClassName()
     }
 
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>("java/lang/Boolean",
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>("java/lang/Boolean",
                                                                  "TRUE",
                                                                  "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -538,14 +538,14 @@ void tst_QJNIObject::getStaticObjectFieldClassName()
     }
 }
 
-void tst_QJNIObject::getStaticObjectField()
+void tst_QAndroidJniObject::getStaticObjectField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Boolean");
     QVERIFY(cls != 0);
 
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>(cls,
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>(cls,
                                                                           "FALSE",
                                                                           "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -555,7 +555,7 @@ void tst_QJNIObject::getStaticObjectField()
     }
 
     {
-        QJNIObject boolObject = QJNIObject::getStaticObjectField<jobject>(cls,
+        QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField<jobject>(cls,
                                                                  "TRUE",
                                                                  "Ljava/lang/Boolean;");
         QVERIFY(boolObject.isValid());
@@ -565,138 +565,138 @@ void tst_QJNIObject::getStaticObjectField()
     }
 }
 
-void tst_QJNIObject::getStaticIntFieldClassName()
+void tst_QAndroidJniObject::getStaticIntFieldClassName()
 {
-    jint i = QJNIObject::getStaticField<jint>("java/lang/Double", "SIZE");
+    jint i = QAndroidJniObject::getStaticField<jint>("java/lang/Double", "SIZE");
     QCOMPARE(i, 64);
 }
 
-void tst_QJNIObject::getStaticIntField()
+void tst_QAndroidJniObject::getStaticIntField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Double");
     QVERIFY(cls != 0);
 
-    jint i = QJNIObject::getStaticField<jint>(cls, "SIZE");
+    jint i = QAndroidJniObject::getStaticField<jint>(cls, "SIZE");
     QCOMPARE(i, 64);
 }
 
-void tst_QJNIObject::getStaticByteFieldClassName()
+void tst_QAndroidJniObject::getStaticByteFieldClassName()
 {
-    jbyte i = QJNIObject::getStaticField<jbyte>("java/lang/Byte", "MAX_VALUE");
+    jbyte i = QAndroidJniObject::getStaticField<jbyte>("java/lang/Byte", "MAX_VALUE");
     QCOMPARE(i, jbyte(127));
 }
 
-void tst_QJNIObject::getStaticByteField()
+void tst_QAndroidJniObject::getStaticByteField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Byte");
     QVERIFY(cls != 0);
 
-    jbyte i = QJNIObject::getStaticField<jbyte>(cls, "MAX_VALUE");
+    jbyte i = QAndroidJniObject::getStaticField<jbyte>(cls, "MAX_VALUE");
     QCOMPARE(i, jbyte(127));
 }
 
-void tst_QJNIObject::getStaticLongFieldClassName()
+void tst_QAndroidJniObject::getStaticLongFieldClassName()
 {
-    jlong i = QJNIObject::getStaticField<jlong>("java/lang/Long", "MAX_VALUE");
+    jlong i = QAndroidJniObject::getStaticField<jlong>("java/lang/Long", "MAX_VALUE");
     QCOMPARE(i, jlong(9223372036854775807L));
 }
 
-void tst_QJNIObject::getStaticLongField()
+void tst_QAndroidJniObject::getStaticLongField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Long");
     QVERIFY(cls != 0);
 
-    jlong i = QJNIObject::getStaticField<jlong>(cls, "MAX_VALUE");
+    jlong i = QAndroidJniObject::getStaticField<jlong>(cls, "MAX_VALUE");
     QCOMPARE(i, jlong(9223372036854775807L));
 }
 
-void tst_QJNIObject::getStaticDoubleFieldClassName()
+void tst_QAndroidJniObject::getStaticDoubleFieldClassName()
 {
-    jdouble i = QJNIObject::getStaticField<jdouble>("java/lang/Double", "NaN");
+    jdouble i = QAndroidJniObject::getStaticField<jdouble>("java/lang/Double", "NaN");
     jlong *k = reinterpret_cast<jlong*>(&i);
     QCOMPARE(*k, jlong(0x7ff8000000000000L));
 }
 
-void tst_QJNIObject::getStaticDoubleField()
+void tst_QAndroidJniObject::getStaticDoubleField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Double");
     QVERIFY(cls != 0);
 
-    jdouble i = QJNIObject::getStaticField<jdouble>(cls, "NaN");
+    jdouble i = QAndroidJniObject::getStaticField<jdouble>(cls, "NaN");
     jlong *k = reinterpret_cast<jlong*>(&i);
     QCOMPARE(*k, jlong(0x7ff8000000000000L));
 }
 
-void tst_QJNIObject::getStaticFloatFieldClassName()
+void tst_QAndroidJniObject::getStaticFloatFieldClassName()
 {
-    jfloat i = QJNIObject::getStaticField<jfloat>("java/lang/Float", "NaN");
+    jfloat i = QAndroidJniObject::getStaticField<jfloat>("java/lang/Float", "NaN");
     unsigned *k = reinterpret_cast<unsigned*>(&i);
     QCOMPARE(*k, unsigned(0x7fc00000));
 }
 
-void tst_QJNIObject::getStaticFloatField()
+void tst_QAndroidJniObject::getStaticFloatField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Float");
     QVERIFY(cls != 0);
 
-    jfloat i = QJNIObject::getStaticField<jfloat>(cls, "NaN");
+    jfloat i = QAndroidJniObject::getStaticField<jfloat>(cls, "NaN");
     unsigned *k = reinterpret_cast<unsigned*>(&i);
     QCOMPARE(*k, unsigned(0x7fc00000));
 }
 
-void tst_QJNIObject::getStaticShortFieldClassName()
+void tst_QAndroidJniObject::getStaticShortFieldClassName()
 {
-    jshort i = QJNIObject::getStaticField<jshort>("java/lang/Short", "MAX_VALUE");
+    jshort i = QAndroidJniObject::getStaticField<jshort>("java/lang/Short", "MAX_VALUE");
     QCOMPARE(i, jshort(32767));
 }
 
-void tst_QJNIObject::getStaticShortField()
+void tst_QAndroidJniObject::getStaticShortField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Short");
     QVERIFY(cls != 0);
 
-    jshort i = QJNIObject::getStaticField<jshort>(cls, "MAX_VALUE");
+    jshort i = QAndroidJniObject::getStaticField<jshort>(cls, "MAX_VALUE");
     QCOMPARE(i, jshort(32767));
 }
 
-void tst_QJNIObject::getStaticCharFieldClassName()
+void tst_QAndroidJniObject::getStaticCharFieldClassName()
 {
-    jchar i = QJNIObject::getStaticField<jchar>("java/lang/Character", "MAX_VALUE");
+    jchar i = QAndroidJniObject::getStaticField<jchar>("java/lang/Character", "MAX_VALUE");
     QCOMPARE(i, jchar(0xffff));
 }
 
-void tst_QJNIObject::getStaticCharField()
+void tst_QAndroidJniObject::getStaticCharField()
 {
-    QJNIEnvironment env;
+    QAndroidJniEnvironment env;
     jclass cls = env->FindClass("java/lang/Character");
     QVERIFY(cls != 0);
 
-    jchar i = QJNIObject::getStaticField<jchar>(cls, "MAX_VALUE");
+    jchar i = QAndroidJniObject::getStaticField<jchar>(cls, "MAX_VALUE");
     QCOMPARE(i, jchar(0xffff));
 }
 
 
-void tst_QJNIObject::getBooleanField()
+void tst_QAndroidJniObject::getBooleanField()
 {
     QVERIFY(m_activityDelegateClass);
 
-    QJNIObject obj(m_activityDelegateClass);
+    QAndroidJniObject obj(m_activityDelegateClass);
 
     QVERIFY(obj.isValid());
     QVERIFY(!obj.getField<jboolean>("m_fullScreen"));
 }
 
-void tst_QJNIObject::getIntField()
+void tst_QAndroidJniObject::getIntField()
 {
     QVERIFY(m_activityDelegateClass);
 
-    QJNIObject obj(m_activityDelegateClass);
+    QAndroidJniObject obj(m_activityDelegateClass);
 
     QVERIFY(obj.isValid());
     jint res = obj.getField<jint>("m_currentRotation");
@@ -720,11 +720,11 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
     JNIEnv *env = uenv.nenv;
 
     jclass clazz = env->FindClass("org/qtproject/qt5/android/QtActivityDelegate");
-    tst_QJNIObject::m_activityDelegateClass = (jclass)env->NewGlobalRef(clazz);
+    tst_QAndroidJniObject::m_activityDelegateClass = (jclass)env->NewGlobalRef(clazz);
 
     return JNI_VERSION_1_6;
 }
 
-QTEST_APPLESS_MAIN(tst_QJNIObject)
+QTEST_APPLESS_MAIN(tst_QAndroidJniObject)
 
-#include "tst_qjniobject.moc"
+#include "tst_qandroidjniobject.moc"
diff --git a/tests/auto/qjnienvironment/qjnienvironment.pro b/tests/auto/qjnienvironment/qjnienvironment.pro
deleted file mode 100644
index e4b7b09..0000000
--- a/tests/auto/qjnienvironment/qjnienvironment.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qjnienvironment
-QT += testlib androidextras
-SOURCES += tst_qjnienvironment.cpp
diff --git a/tests/auto/qjniobject/qjniobject.pro b/tests/auto/qjniobject/qjniobject.pro
deleted file mode 100644
index 30a0a0d..0000000
--- a/tests/auto/qjniobject/qjniobject.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qjniobject
-QT += testlib androidextras
-SOURCES += tst_qjniobject.cpp