fix tests after thunk body refactors

Author: ktoso

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -206,13 +206,15 @@ extension JNISwift2JavaGenerator {
     printDeclDocumentation(&printer, decl)
     printer.printBraceBlock("public \(renderFunctionSignature(decl))") { printer in
       var arguments = translatedDecl.translatedFunctionSignature.parameters.map(\.name)
-      arguments.append("selfPointer")
+
+      let selfVarName = "self$"
+      arguments.append(selfVarName)
 
       let returnKeyword = translatedDecl.translatedFunctionSignature.resultType.isVoid ? "" : "return "
 
       printer.print(
         """
-        long self$ = this.$memoryAddress();
+        long \(selfVarName) = this.$memoryAddress();
         \(returnKeyword)\(translatedDecl.parentName).$\(translatedDecl.name)(\(arguments.joined(separator: ", ")));
         """
       )
@@ -267,18 +269,17 @@ extension JNISwift2JavaGenerator {
     printer.printBraceBlock("protected Runnable \(funcName)()") { printer in
       printer.print(
         """
+        long self$ = this.$memoryAddress();
         if (CallTraces.TRACE_DOWNCALLS) {
           CallTraces.traceDowncall("\(type.swiftNominal.name).\(funcName)",
               "this", this,
-              "this.$memoryAddress()", this.$memoryAddress());
+              "self", self$);
         }
-        long self$ = this.$memoryAddress();
-        assert(self$ > 0);
         return new Runnable() {
           @Override
           public void run() {
             if (CallTraces.TRACE_DOWNCALLS) {
-              CallTraces.traceDowncall("\(type.swiftNominal.name).$destroy(" + self$ + ")");
+              CallTraces.traceDowncall("\(type.swiftNominal.name).$destroy", "self", self$);
             }
             \(type.swiftNominal.name).$destroy(self$);
           }

Tests/JExtractSwiftTests/JNI/JNIClassTests.swift

@@ -70,14 +70,21 @@ struct JNIClassTests {
       """
       @Override
       protected Runnable $createDestroyFunction() {
-        long $self = this.$memoryAddress();
+        long self$ = this.$memoryAddress();
+        if (CallTraces.TRACE_DOWNCALLS) {
+          CallTraces.traceDowncall("MyClass.$createDestroyFunction",
+              "this", this,
+              "self", self$);
+        }
         return new Runnable() {
           @Override
           public void run() {
-            MyClass.$destroy($self);
+            if (CallTraces.TRACE_DOWNCALLS) {
+              CallTraces.traceDowncall("MyClass.$destroy", "self", self$);
+            }
+            MyClass.$destroy(self$);
           }
         };
-      }
       """
     ])
   }
@@ -200,7 +207,15 @@ struct JNIClassTests {
         """
         @_cdecl("Java_com_example_swift_MyClass__00024destroy__J")
         func Java_com_example_swift_MyClass__00024destroy__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) {
-          let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
+          guard let env$ = environment else {
+            fatalError("Missing JNIEnv in downcall to \\(#function)")
+          }
+          assert(selfPointer != 0, "selfPointer memory address was null")
+          let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
+          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
+          guard let self$ = UnsafeMutablePointer<MySwiftClass>(bitPattern: selfBits$) else {
+            fatalError("Missing self pointer in call to \\(#function)!")
+          }
           self$.deinitialize(count: 1)
           self$.deallocate()
         }
@@ -246,7 +261,15 @@ struct JNIClassTests {
         """
         @_cdecl("Java_com_example_swift_MyClass__00024doSomething__JJ")
         func Java_com_example_swift_MyClass__00024doSomething__JJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, x: jlong, selfPointer: jlong) {
-          let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
+          guard let env$ = environment else {
+            fatalError("Missing JNIEnv in downcall to \\(#function)")
+          }
+          assert(selfPointer != 0, "selfPointer memory address was null")
+          let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
+          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
+          guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
+            fatalError("Missing self pointer in call to \\(#function)!")
+          }
           self$.pointee.doSomething(x: Int64(fromJNI: x, in: environment!))
         }
         """,