Skip to content

Commit 49e95c6

Browse files
ktosoktoso
committed
update tests
1 parent 602a6ac commit 49e95c6

File tree

4 files changed

+100
-23
lines changed

4 files changed

+100
-23
lines changed

‎SwiftKitFFM/src/main/java/org/swift/swiftkit/ffm/FFMSwiftInstanceCleanup.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import java.lang.foreign.MemorySegment;
2020

2121
public class FFMSwiftInstanceCleanup implements SwiftInstanceCleanup {
22-
private final MemorySegment selfPointer;
23-
private final SwiftAnyType selfType;
22+
private final MemorySegment memoryAddress;
23+
private final SwiftAnyType type;
2424
private final Runnable markAsDestroyed;
2525

26-
public FFMSwiftInstanceCleanup(MemorySegment selfPointer, SwiftAnyType selfType, Runnable markAsDestroyed) {
27-
this.selfPointer = selfPointer;
28-
this.selfType = selfType;
26+
public FFMSwiftInstanceCleanup(MemorySegment memoryAddress, SwiftAnyType type, Runnable markAsDestroyed) {
27+
this.memoryAddress = memoryAddress;
28+
this.type = type;
2929
this.markAsDestroyed = markAsDestroyed;
3030
}
3131

@@ -34,9 +34,9 @@ public void run() {
3434
markAsDestroyed.run();
3535

3636
// Allow null pointers just for AutoArena tests.
37-
if (selfType != null && selfPointer != null) {
38-
System.out.println("[debug] Destroy swift value [" + selfType.getSwiftName() + "]: " + selfPointer);
39-
SwiftValueWitnessTable.destroy(selfType, self$);
37+
if (type != null && memoryAddress != null) {
38+
System.out.println("[debug] Destroy swift value [" + type.getSwiftName() + "]: " + memoryAddress);
39+
SwiftValueWitnessTable.destroy(type, memoryAddress);
4040
}
4141
}
4242
}

‎Tests/JExtractSwiftTests/Asserts/TextAssertions.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ func assertOutput(
112112
print("==== ---------------------------------------------------------------")
113113

114114
#expect(output.contains(expected), sourceLocation: sourceLocation)
115+
fatalError("Failed: \(filePath):\(line)")
115116
continue
116117
}
117118

‎Tests/JExtractSwiftTests/JNI/JNIClassTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ struct JNIClassTests {
213213
assert(selfPointer != 0, "selfPointer memory address was null")
214214
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
215215
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
216-
guard let self$ = UnsafeMutablePointer<MySwiftClass>(bitPattern: selfBits$) else {
216+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
217217
fatalError("Missing self pointer in call to \\(#function)!")
218218
}
219219
self$.deinitialize(count: 1)
@@ -233,11 +233,11 @@ struct JNIClassTests {
233233
expectedChunks: [
234234
"""
235235
/**
236-
* Downcall to Swift:
237-
* {@snippet lang=swift :
238-
* public func doSomething(x: Int64)
239-
* }
240-
*/
236+
* Downcall to Swift:
237+
* {@snippet lang=swift :
238+
* public func doSomething(x: Int64)
239+
* }
240+
*/
241241
public void doSomething(long x) {
242242
long self$ = this.$memoryAddress();
243243
MyClass.$doSomething(x, self$);

‎Tests/JExtractSwiftTests/JNI/JNIVariablesTests.swift‎

Lines changed: 85 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,15 @@ struct JNIVariablesTests {
6969
"""
7070
@_cdecl("Java_com_example_swift_MyClass__00024getConstant__J")
7171
func Java_com_example_swift_MyClass__00024getConstant__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) -> jlong {
72-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
72+
guard let env$ = environment else {
73+
fatalError("Missing JNIEnv in downcall to \\(#function)")
74+
}
75+
assert(selfPointer != 0, "selfPointer memory address was null")
76+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
77+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
78+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
79+
fatalError("Missing self pointer in call to \\(#function)!")
80+
}
7381
let result = self$.pointee.constant
7482
return result.getJNIValue(in: environment)
7583
}
@@ -131,15 +139,31 @@ struct JNIVariablesTests {
131139
"""
132140
@_cdecl("Java_com_example_swift_MyClass__00024getMutable__J")
133141
func Java_com_example_swift_MyClass__00024getMutable__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) -> jlong {
134-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
142+
guard let env$ = environment else {
143+
fatalError("Missing JNIEnv in downcall to \\(#function)")
144+
}
145+
assert(selfPointer != 0, "selfPointer memory address was null")
146+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
147+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
148+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
149+
fatalError("Missing self pointer in call to \\(#function)!")
150+
}
135151
let result = self$.pointee.mutable
136152
return result.getJNIValue(in: environment)
137153
}
138154
""",
139155
"""
140156
@_cdecl("Java_com_example_swift_MyClass__00024setMutable__JJ")
141157
func Java_com_example_swift_MyClass__00024setMutable__JJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, newValue: jlong, selfPointer: jlong) {
142-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
158+
guard let env$ = environment else {
159+
fatalError("Missing JNIEnv in downcall to \\(#function)")
160+
}
161+
assert(selfPointer != 0, "selfPointer memory address was null")
162+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
163+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
164+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
165+
fatalError("Missing self pointer in call to \\(#function)!")
166+
}
143167
self$.pointee.mutable = Int64(fromJNI: newValue, in: environment!)
144168
}
145169
"""
@@ -185,7 +209,16 @@ struct JNIVariablesTests {
185209
"""
186210
@_cdecl("Java_com_example_swift_MyClass__00024getComputed__J")
187211
func Java_com_example_swift_MyClass__00024getComputed__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) -> jlong {
188-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
212+
guard let env$ = environment else {
213+
fatalError("Missing JNIEnv in downcall to \\(#function)")
214+
}
215+
assert(selfPointer != 0, "selfPointer memory address was null")
216+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
217+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
218+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
219+
fatalError("Missing self pointer in call to \\(#function)!")
220+
}
221+
189222
let result = self$.pointee.computed
190223
return result.getJNIValue(in: environment)
191224
}
@@ -232,7 +265,16 @@ struct JNIVariablesTests {
232265
"""
233266
@_cdecl("Java_com_example_swift_MyClass__00024getComputedThrowing__J")
234267
func Java_com_example_swift_MyClass__00024getComputedThrowing__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) -> jlong {
235-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
268+
guard let env$ = environment else {
269+
fatalError("Missing JNIEnv in downcall to \\(#function)")
270+
}
271+
assert(selfPointer != 0, "selfPointer memory address was null")
272+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
273+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
274+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
275+
fatalError("Missing self pointer in call to \\(#function)!")
276+
}
277+
236278
do {
237279
let result = try self$.pointee.computedThrowing
238280
return result.getJNIValue(in: environment)
@@ -299,15 +341,33 @@ struct JNIVariablesTests {
299341
"""
300342
@_cdecl("Java_com_example_swift_MyClass__00024getGetterAndSetter__J")
301343
func Java_com_example_swift_MyClass__00024getGetterAndSetter__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) -> jlong {
302-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
344+
guard let env$ = environment else {
345+
fatalError("Missing JNIEnv in downcall to \\(#function)")
346+
}
347+
assert(selfPointer != 0, "selfPointer memory address was null")
348+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
349+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
350+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
351+
fatalError("Missing self pointer in call to \\(#function)!")
352+
}
353+
303354
let result = self$.pointee.getterAndSetter
304355
return result.getJNIValue(in: environment)
305356
}
306357
""",
307358
"""
308359
@_cdecl("Java_com_example_swift_MyClass__00024setGetterAndSetter__JJ")
309360
func Java_com_example_swift_MyClass__00024setGetterAndSetter__JJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, newValue: jlong, selfPointer: jlong) {
310-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
361+
guard let env$ = environment else {
362+
fatalError("Missing JNIEnv in downcall to \\(#function)")
363+
}
364+
assert(selfPointer != 0, "selfPointer memory address was null")
365+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
366+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
367+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
368+
fatalError("Missing self pointer in call to \\(#function)!")
369+
}
370+
311371
self$.pointee.getterAndSetter = Int64(fromJNI: newValue, in: environment!)
312372
}
313373
"""
@@ -368,15 +428,31 @@ struct JNIVariablesTests {
368428
"""
369429
@_cdecl("Java_com_example_swift_MyClass__00024isSomeBoolean__J")
370430
func Java_com_example_swift_MyClass__00024isSomeBoolean__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) -> jboolean {
371-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
431+
guard let env$ = environment else {
432+
fatalError("Missing JNIEnv in downcall to \\(#function)")
433+
}
434+
assert(selfPointer != 0, "selfPointer memory address was null")
435+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
436+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
437+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
438+
fatalError("Missing self pointer in call to \\(#function)!")
439+
}
372440
let result = self$.pointee.someBoolean
373441
return result.getJNIValue(in: environment)
374442
}
375443
""",
376444
"""
377445
@_cdecl("Java_com_example_swift_MyClass__00024setSomeBoolean__ZJ")
378446
func Java_com_example_swift_MyClass__00024setSomeBoolean__ZJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, newValue: jboolean, selfPointer: jlong) {
379-
let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
447+
guard let env$ = environment else {
448+
fatalError("Missing JNIEnv in downcall to \\(#function)")
449+
}
450+
assert(selfPointer != 0, "selfPointer memory address was null")
451+
let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
452+
assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
453+
guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
454+
fatalError("Missing self pointer in call to \\(#function)!")
455+
}
380456
self$.pointee.someBoolean = Bool(fromJNI: newValue, in: environment!)
381457
}
382458
"""

0 commit comments

Comments
 (0)