adjust tests to new codegen

ktoso · ktoso · commit e42ae03325d9 · 2025-11-04T15:25:59.000+09:00
diff --git a/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift b/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift
@@ -69,7 +69,7 @@ struct JNIAsyncTests {
                   environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
                 }
                 let swiftResult$ = await SwiftModule.asyncVoid()
-                environment = try JavaVirtualMachine.shared().environment()
+                environment = try! JavaVirtualMachine.shared().environment()
                 environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])
               }
             }
@@ -82,7 +82,7 @@ struct JNIAsyncTests {
                 environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
               }
               let swiftResult$ = await SwiftModule.asyncVoid()
-              environment = try JavaVirtualMachine.shared().environment()
+              environment = try! JavaVirtualMachine.shared().environment()
               environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])
             }
           }
@@ -144,7 +144,7 @@ struct JNIAsyncTests {
                 }
                 do {
                   let swiftResult$ = await try SwiftModule.async()
-                  environment = try JavaVirtualMachine.shared().environment()
+                  environment = try! JavaVirtualMachine.shared().environment()
                   environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])
                 }
                 catch {
@@ -164,7 +164,7 @@ struct JNIAsyncTests {
               }
               do {
                 let swiftResult$ = await try SwiftModule.async()
-                environment = try JavaVirtualMachine.shared().environment()
+                environment = try! JavaVirtualMachine.shared().environment()
                 environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])
               }
               catch {
@@ -231,7 +231,7 @@ struct JNIAsyncTests {
                 environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
               }
               let swiftResult$ = await SwiftModule.async(i: Int64(fromJNI: i, in: environment))
-              environment = try JavaVirtualMachine.shared().environment()
+              environment = try! JavaVirtualMachine.shared().environment()
               let boxedResult$ = SwiftJavaRuntimeSupport._JNIBoxedConversions.box(swiftResult$.getJNIValue(in: environment), in: environment)
               environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: boxedResult$)])
             }
@@ -245,7 +245,7 @@ struct JNIAsyncTests {
                 environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
               }
               let swiftResult$ = await SwiftModule.async(i: Int64(fromJNI: i, in: environment))
-              environment = try JavaVirtualMachine.shared().environment()
+              environment = try! JavaVirtualMachine.shared().environment()
               let boxedResult$ = SwiftJavaRuntimeSupport._JNIBoxedConversions.box(swiftResult$.getJNIValue(in: environment), in: environment)
               environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: boxedResult$)])
             }
@@ -322,7 +322,7 @@ struct JNIAsyncTests {
                   environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
                 }
                 let swiftResult$ = await SwiftModule.async(c: c$.pointee)
-                environment = try JavaVirtualMachine.shared().environment()
+                environment = try! JavaVirtualMachine.shared().environment()
                 let result$ = UnsafeMutablePointer<MyClass>.allocate(capacity: 1)
                 result$.initialize(to: swiftResult$)
                 let resultBits$ = Int64(Int(bitPattern: result$))
@@ -339,7 +339,7 @@ struct JNIAsyncTests {
                 environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
               }
               let swiftResult$ = await SwiftModule.async(c: c$.pointee)
-              environment = try JavaVirtualMachine.shared().environment()
+              environment = try! JavaVirtualMachine.shared().environment()
               let result$ = UnsafeMutablePointer<MyClass>.allocate(capacity: 1)
               result$.initialize(to: swiftResult$)
               let resultBits$ = Int64(Int(bitPattern: result$))

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ struct JNIAsyncTests {`
`69`	`69`	`environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)`
`70`	`70`	`}`
`71`	`71`	`let swiftResult$ = await SwiftModule.asyncVoid()`
`72`		`- environment = try JavaVirtualMachine.shared().environment()`
	`72`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`73`	`73`	`environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -82,7 +82,7 @@ struct JNIAsyncTests {`
`82`	`82`	`environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)`
`83`	`83`	`}`
`84`	`84`	`let swiftResult$ = await SwiftModule.asyncVoid()`
`85`		`- environment = try JavaVirtualMachine.shared().environment()`
	`85`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`86`	`86`	`environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -144,7 +144,7 @@ struct JNIAsyncTests {`
`144`	`144`	`}`
`145`	`145`	`do {`
`146`	`146`	`let swiftResult$ = await try SwiftModule.async()`
`147`		`- environment = try JavaVirtualMachine.shared().environment()`
	`147`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`148`	`148`	`environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])`
`149`	`149`	`}`
`150`	`150`	`catch {`
`@@ -164,7 +164,7 @@ struct JNIAsyncTests {`
`164`	`164`	`}`
`165`	`165`	`do {`
`166`	`166`	`let swiftResult$ = await try SwiftModule.async()`
`167`		`- environment = try JavaVirtualMachine.shared().environment()`
	`167`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`168`	`168`	`environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])`
`169`	`169`	`}`
`170`	`170`	`catch {`
`@@ -231,7 +231,7 @@ struct JNIAsyncTests {`
`231`	`231`	`environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)`
`232`	`232`	`}`
`233`	`233`	`let swiftResult$ = await SwiftModule.async(i: Int64(fromJNI: i, in: environment))`
`234`		`- environment = try JavaVirtualMachine.shared().environment()`
	`234`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`235`	`235`	`let boxedResult$ = SwiftJavaRuntimeSupport._JNIBoxedConversions.box(swiftResult$.getJNIValue(in: environment), in: environment)`
`236`	`236`	`environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: boxedResult$)])`
`237`	`237`	`}`
`@@ -245,7 +245,7 @@ struct JNIAsyncTests {`
`245`	`245`	`environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)`
`246`	`246`	`}`
`247`	`247`	`let swiftResult$ = await SwiftModule.async(i: Int64(fromJNI: i, in: environment))`
`248`		`- environment = try JavaVirtualMachine.shared().environment()`
	`248`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`249`	`249`	`let boxedResult$ = SwiftJavaRuntimeSupport._JNIBoxedConversions.box(swiftResult$.getJNIValue(in: environment), in: environment)`
`250`	`250`	`environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: boxedResult$)])`
`251`	`251`	`}`
`@@ -322,7 +322,7 @@ struct JNIAsyncTests {`
`322`	`322`	`environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)`
`323`	`323`	`}`
`324`	`324`	`let swiftResult$ = await SwiftModule.async(c: c$.pointee)`
`325`		`- environment = try JavaVirtualMachine.shared().environment()`
	`325`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`326`	`326`	`let result$ = UnsafeMutablePointer<MyClass>.allocate(capacity: 1)`
`327`	`327`	`result$.initialize(to: swiftResult$)`
`328`	`328`	`let resultBits$ = Int64(Int(bitPattern: result$))`
`@@ -339,7 +339,7 @@ struct JNIAsyncTests {`
`339`	`339`	`environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)`
`340`	`340`	`}`
`341`	`341`	`let swiftResult$ = await SwiftModule.async(c: c$.pointee)`
`342`		`- environment = try JavaVirtualMachine.shared().environment()`
	`342`	`+ environment = try! JavaVirtualMachine.shared().environment()`
`343`	`343`	`let result$ = UnsafeMutablePointer<MyClass>.allocate(capacity: 1)`
`344`	`344`	`result$.initialize(to: swiftResult$)`
`345`	`345`	`let resultBits$ = Int64(Int(bitPattern: result$))`