diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-04-26 13:19:46 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-05-17 00:34:06 +0200 |
| commit | 367092d7e02bfe0054b78e856b7addbdb56aae2e (patch) | |
| tree | f17793c691da879973689d9cab355ea3f2f1e4e1 /tests/auto | |
| parent | f6e89e901ba718d64b50f79f3b1b327a7f6a0211 (diff) | |
Return specific types for frequently used Java objects
This allows us to specialize JNI type signature templates for e.g. the
context object, which in Java signatures is "android/content/Context".
Introduce a Q_DECLARE_JNI_TYPE macro that takes care of the plumbing.
The types declared this way live in the QtJniTypes namespace, and
transparently convert from and to jobject. Since jobject is a typedef
to _jobject* we cannot create a subclass. Use a "Object" superclass
that we can provide a QJniObject constructor for so that we don't
require the QJniObject declaration to be able to use the macro.
The APIs in the QNativeInterface namespace doesn't provide source or
binary compatibility guarantees, so we can change the return types.
Change-Id: I4cf9fa734ec9a5550b6fddeb14ef0ffd72663f29
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp b/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp index 49835a0e45..c4abfe399a 100644 --- a/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp +++ b/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp @@ -40,6 +40,11 @@ static_assert(QtJniTypes::typeSignature<QtJavaWrapper>() == "Lorg/qtproject/qt/a static_assert(QtJniTypes::typeSignature<QtJavaWrapper>() != "Ljava/lang/Object;"); static_assert(!(QtJniTypes::typeSignature<QtJavaWrapper>() == "X")); +Q_DECLARE_JNI_TYPE(JavaType, "Lorg/qtproject/qt/JavaType;"); +static_assert(QtJniTypes::typeSignature<QtJniTypes::JavaType>() == "Lorg/qtproject/qt/JavaType;"); +Q_DECLARE_JNI_TYPE(ArrayType, "[Lorg/qtproject/qt/ArrayType;") +static_assert(QtJniTypes::typeSignature<QtJniTypes::ArrayType>() == "[Lorg/qtproject/qt/ArrayType;"); + static_assert(QtJniTypes::fieldSignature<jint>() == "I"); static_assert(QtJniTypes::fieldSignature<jint>() != "X"); static_assert(QtJniTypes::fieldSignature<jint>() != "Ljava/lang/Object;"); @@ -57,6 +62,8 @@ static_assert(QtJniTypes::methodSignature<void, jint>() == "(I)V"); static_assert(QtJniTypes::methodSignature<void, jint, jstring>() == "(ILjava/lang/String;)V"); static_assert(QtJniTypes::methodSignature<jlong, jint, jclass>() == "(ILjava/lang/Class;)J"); static_assert(QtJniTypes::methodSignature<jobject, jint, jstring>() == "(ILjava/lang/String;)Ljava/lang/Object;"); +static_assert(QtJniTypes::methodSignature<QtJniTypes::JavaType, jint, jstring>() + == "(ILjava/lang/String;)Lorg/qtproject/qt/JavaType;"); static_assert(QtJniTypes::isPrimitiveType<jint>()); static_assert(QtJniTypes::isPrimitiveType<void>()); @@ -66,6 +73,7 @@ static_assert(!QtJniTypes::isPrimitiveType<QtCustomJniObject>()); static_assert(!QtJniTypes::isObjectType<jint>()); static_assert(!QtJniTypes::isObjectType<void>()); static_assert(QtJniTypes::isObjectType<jobject>()); +static_assert(QtJniTypes::isObjectType<jobjectArray>()); static_assert(QtJniTypes::isObjectType<QtCustomJniObject>()); static_assert(QtJniTypes::String("ABCDE").startsWith("ABC")); @@ -86,6 +94,7 @@ static_assert(!QtJniTypes::String("ABCDE").endsWith('F')); void tst_QJniTypes::initTestCase() { + } QTEST_MAIN(tst_QJniTypes) |