diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-02-10 18:09:15 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 12:39:04 +0100 |
| commit | af130d3047322dc3889dc09970905cbdb40c86f4 (patch) | |
| tree | 8b793456a4383e6f58cfec64ef09b0ebac552bd0 /tests | |
| parent | a4dd3f81448db91b10bdfb236ac81caa8617c381 (diff) | |
Add non-templated versions of get[Static]ObjectField()
Ideally the getStaticObjectField() and getObjectField() methods, that
take a signature, should never have been templated. Removing the
templated versions now will cause ABI breakage, so the only solution
is to add new non-templated versions.
Change-Id: I2f6e9f259b7bc511ef5bcaeb8a2077b0f267b8c8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp index 47b476a..e0f4201 100644 --- a/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp +++ b/tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp @@ -531,6 +531,15 @@ void tst_QAndroidJniObject::getStaticObjectFieldClassName() jboolean booleanValue = boolObject.callMethod<jboolean>("booleanValue"); QVERIFY(booleanValue); } + + { + QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField("java/lang/Boolean", + "FALSE", + "Ljava/lang/Boolean;"); + QVERIFY(boolObject.isValid()); + jboolean booleanValue = boolObject.callMethod<jboolean>("booleanValue"); + QVERIFY(!booleanValue); + } } void tst_QAndroidJniObject::getStaticObjectField() @@ -558,6 +567,16 @@ void tst_QAndroidJniObject::getStaticObjectField() jboolean booleanValue = boolObject.callMethod<jboolean>("booleanValue"); QVERIFY(booleanValue); } + + { + QAndroidJniObject boolObject = QAndroidJniObject::getStaticObjectField(cls, + "FALSE", + "Ljava/lang/Boolean;"); + QVERIFY(boolObject.isValid()); + + jboolean booleanValue = boolObject.callMethod<jboolean>("booleanValue"); + QVERIFY(!booleanValue); + } } void tst_QAndroidJniObject::getStaticIntFieldClassName() @@ -679,8 +698,6 @@ void tst_QAndroidJniObject::getStaticCharField() void tst_QAndroidJniObject::getBooleanField() { - QVERIFY(m_activityDelegateClass); - QAndroidJniObject obj("org/qtproject/qt5/android/QtActivityDelegate"); QVERIFY(obj.isValid()); @@ -693,7 +710,6 @@ void tst_QAndroidJniObject::getIntField() QVERIFY(obj.isValid()); jint res = obj.getField<jint>("m_currentRotation"); - QCOMPARE(res, -1); } |