Add default callback test

xpenatan · Sep 1, 2024 · e1c3442 · e1c3442
1 parent 4e4ffab
commit e1c3442
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 21 deletions.
diff --git a/example/app/core/src/main/java/com/github/xpenatan/jparser/example/app/TestLib.java b/example/app/core/src/main/java/com/github/xpenatan/jparser/example/app/TestLib.java
@@ -2,6 +2,7 @@
 
 import com.github.xpenatan.jparser.example.testlib.CallbackClass;
 import com.github.xpenatan.jparser.example.testlib.CallbackClassManual;
+import com.github.xpenatan.jparser.example.testlib.DefaultCallbackClass;
 import com.github.xpenatan.jparser.example.testlib.TestCallbackClass;
 import com.github.xpenatan.jparser.example.testlib.TestConstructorClass;
 import com.github.xpenatan.jparser.example.testlib.TestMethodClass;
@@ -317,6 +318,23 @@ public int onIntCallback(int intValue01, int intValue02) {
             }
             test.dispose();
         }
+        {
+            TestCallbackClass test = new TestCallbackClass();
+            try {
+                test.set_intValue01(10);
+                test.set_intValue02(3);
+                CallbackClass callback = new DefaultCallbackClass();
+                int value = test.callIntCallback(callback);
+                if(!(value == 7)) {
+                    throw new RuntimeException("value == 7");
+                }
+            } catch(Throwable e) {
+                e.printStackTrace();
+                test.dispose();
+                return false;
+            }
+            test.dispose();
+        }
         {
             TestCallbackClass test = new TestCallbackClass();
             try {

diff --git a/example/lib/lib-build/src/main/cpp/TestLib.idl b/example/lib/lib-build/src/main/cpp/TestLib.idl
@@ -167,10 +167,10 @@ interface CallbackClassManualImpl {
 };
 CallbackClassManualImpl implements CallbackClassManual;
 
-//interface DefaultCallbackClass {
-//    void DefaultCallbackClass();
-//};
-//DefaultCallbackClass implements CallbackClass;
+interface DefaultCallbackClass {
+    void DefaultCallbackClass();
+};
+DefaultCallbackClass implements CallbackClass;
 
 //[JSImplementation="DefaultCallbackClass"]
 //interface DefaultCallbackClassImpl {

diff --git a/example/lib/lib-build/src/main/cpp/source/TestLib/src/TestLib.h b/example/lib/lib-build/src/main/cpp/source/TestLib/src/TestLib.h
@@ -278,23 +278,6 @@ class CallbackClass
     }
 };
 
-class CallbackClassManual
-{
-public:
-    virtual ~CallbackClassManual() {}
-
-    virtual void onVoidCallback(TestObjectClass& refData, TestObjectClass* pointerData) const = 0;
-    virtual int onIntCallback(int intValue01, int intValue02) const = 0;
-    virtual float onFloatCallback(float floatValue01, float Value02) const = 0;
-    virtual bool onBoolCallback(bool boolValue01) const = 0;
-    virtual void onStringCallback(const char* strValue01) const = 0;
-
-    int addInt(int a, int b)
-    {
-        return a + b;
-    }
-};
-
 class DefaultCallbackClass : public CallbackClass
 {
 public:
@@ -324,6 +307,25 @@ class DefaultCallbackClass : public CallbackClass
     virtual unsigned short onUnsignedShortCallback(unsigned short unsignedShort) const {
         return 20;
     }
+    virtual void onAnyCallback(void * anyPtr) const {
+    }
+};
+
+class CallbackClassManual
+{
+public:
+    virtual ~CallbackClassManual() {}
+
+    virtual void onVoidCallback(TestObjectClass& refData, TestObjectClass* pointerData) const = 0;
+    virtual int onIntCallback(int intValue01, int intValue02) const = 0;
+    virtual float onFloatCallback(float floatValue01, float Value02) const = 0;
+    virtual bool onBoolCallback(bool boolValue01) const = 0;
+    virtual void onStringCallback(const char* strValue01) const = 0;
+
+    int addInt(int a, int b)
+    {
+        return a + b;
+    }
 };
 
 class TestCallbackClass {