fix tests since we changed how we get env

Author: ktoso

Tests/JExtractSwiftTests/JNI/JNIStructTests.swift

@@ -63,11 +63,19 @@ struct JNIStructTests {
       """
       @Override
       protected Runnable $createDestroyFunction() {
-        long $selfPointer = this.pointer(); 
+        long self$ = this.$memoryAddress();
+        if (CallTraces.TRACE_DOWNCALLS) {
+          CallTraces.traceDowncall("MyStruct.$createDestroyFunction",
+              "this", this,
+              "self", self$);
+        }
         return new Runnable() {
           @Override
           public void run() {
-            MyStruct.$destroy($selfPointer);
+            if (CallTraces.TRACE_DOWNCALLS) {
+              CallTraces.traceDowncall("MyStruct.$destroy", "self", self$);
+            }
+            MyStruct.$destroy(self$);
           }
         };
       }
@@ -90,8 +98,8 @@ struct JNIStructTests {
           * }
           */
         public static MyStruct init(long x, long y, SwiftArena swiftArena$) {
-          long selfPointer = MyStruct.allocatingInit(x, y);
-          return new MyStruct(selfPointer, swiftArena$);
+          long self$ = MyStruct.allocatingInit(x, y);
+          return new MyStruct(self$, swiftArena$);
         }
         """,
         """
@@ -112,9 +120,9 @@ struct JNIStructTests {
         """
         @_cdecl("Java_com_example_swift_MyStruct_allocatingInit__JJ")
         func Java_com_example_swift_MyStruct_allocatingInit__JJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, x: jlong, y: jlong) -> jlong {
-          let selfPointer = UnsafeMutablePointer<MyStruct>.allocate(capacity: 1)
-          selfPointer.initialize(to: MyStruct(x: Int64(fromJNI: x, in: environment!), y: Int64(fromJNI: y, in: environment!)))
-          return Int64(Int(bitPattern: selfPointer)).getJNIValue(in: environment)
+          let self$ = UnsafeMutablePointer<MyStruct>.allocate(capacity: 1)
+          self$.initialize(to: MyStruct(x: Int64(fromJNI: x, in: environment!), y: Int64(fromJNI: y, in: environment!)))
+          return Int64(Int(bitPattern: self$)).getJNIValue(in: environment)
         }
         """
       ]
@@ -127,14 +135,21 @@ struct JNIStructTests {
       input: source,
       .jni,
       .swift,
-      detectChunkByInitialLines: 1,
       expectedChunks: [
         """
         @_cdecl("Java_com_example_swift_MyStruct__00024destroy__J")
         func Java_com_example_swift_MyStruct__00024destroy__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) {
-          let pointer = UnsafeMutablePointer<MyStruct>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
-          pointer.deinitialize(count: 1)
-          pointer.deallocate()
+          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<MyStruct>(bitPattern: selfBits$) else {
+            fatalError("Missing self pointer in call to \\(#function)!")
+          }
+          self$.deinitialize(count: 1)
+          self$.deallocate()
         }
         """
       ]
@@ -156,8 +171,8 @@ struct JNIStructTests {
           * }
           */
         public void doSomething(long x) {
-          long selfPointer = this.pointer();
-          MyStruct.$doSomething(x, selfPointer);
+          long self$ = this.$memoryAddress();
+          MyStruct.$doSomething(x, self$);
         }
         """,
         """
@@ -178,7 +193,15 @@ struct JNIStructTests {
         """
         @_cdecl("Java_com_example_swift_MyStruct__00024doSomething__JJ")
         func Java_com_example_swift_MyStruct__00024doSomething__JJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, x: jlong, selfPointer: jlong) {
-          let self$ = UnsafeMutablePointer<MyStruct>(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<MyStruct>(bitPattern: selfBits$) else {
+            fatalError("Missing self pointer in call to \\(#function)!")
+          }
           self$.pointee.doSomething(x: Int64(fromJNI: x, in: environment!))
         }
         """,

Tests/JExtractSwiftTests/MethodImportTests.swift

@@ -168,7 +168,6 @@ final class MethodImportTests {
     }
 
     assertOutput(
-      dump: true,
       output,
       expected:
         """
@@ -212,7 +211,6 @@ final class MethodImportTests {
     }
 
     assertOutput(
-      dump: true,
       output,
       expected:
         """
@@ -256,7 +254,6 @@ final class MethodImportTests {
     }
 
     assertOutput(
-      dump: true,
       output,
       expected:
         """