From ed07354be69b6bc0867227bcb366a1686e7fcbfc Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 31 Jan 2024 09:49:54 +0100
Subject: [PATCH] JNI: Fix QJniObject::callback test case

Don't call the native function directly, call the Java function that
calls the native function.

Change-Id: Icdcf250313a38f6e4bc2b90fb7b0adbfa5a890fb
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit cfcd56a78fae5d4f4c79f9e76d6bcd57f8a3cde2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp b/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
index cce1ac31a2c..d893c1da48c 100644
--- a/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
+++ b/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
@@ -1977,7 +1977,7 @@ void tst_QJniObject::callback()
         QVERIFY(TestClass::registerNativeMethods({
             Q_JNI_NATIVE_METHOD(callbackWithByte)
         }));
-        result = testObject.callMethod<int>("callbackWithByte", jbyte(123));
+        result = testObject.callMethod<int>("callMeBackWithByte", jbyte(123));
         QVERIFY(calledWithByte);
         QCOMPARE(calledWithByte.value(), 123);
         break;
@@ -1985,7 +1985,7 @@ void tst_QJniObject::callback()
         QVERIFY(TestClass::registerNativeMethods({
             Q_JNI_NATIVE_METHOD(callbackWithBoolean)
         }));
-        result = testObject.callMethod<int>("callbackWithBoolean", true);
+        result = testObject.callMethod<int>("callMeBackWithBoolean", true);
         QVERIFY(calledWithBoolean);
         QCOMPARE(calledWithBoolean.value(), true);
         break;
@@ -1993,7 +1993,7 @@ void tst_QJniObject::callback()
         QVERIFY(TestClass::registerNativeMethods({
             Q_JNI_NATIVE_METHOD(callbackWithInt)
         }));
-        result = testObject.callMethod<int>("callbackWithInt", 12345);
+        result = testObject.callMethod<int>("callMeBackWithInt", 12345);
         QVERIFY(calledWithInt);
         QCOMPARE(calledWithInt.value(), 12345);
         break;
@@ -2001,7 +2001,7 @@ void tst_QJniObject::callback()
         QVERIFY(TestClass::registerNativeMethods({
             Q_JNI_NATIVE_METHOD(callbackWithDouble)
         }));
-        result = testObject.callMethod<int>("callbackWithDouble", 1.2345);
+        result = testObject.callMethod<int>("callMeBackWithDouble", 1.2345);
         QVERIFY(calledWithDouble);
         QCOMPARE(calledWithDouble.value(), 1.2345);
         break;