Skip to content

Commit f2a195f

Browse files
ktosoktoso
committed
fix: adjust tests to take config, not just module name
1 parent 59aef18 commit f2a195f

File tree

5 files changed

+53
-46
lines changed

5 files changed

+53
-46
lines changed

‎Tests/JExtractSwiftTests/Asserts/LoweringAssertions.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
@_spi(Testing) import JExtractSwiftLib
16+
import JavaKitConfigurationShared
1617
import SwiftSyntax
1718
import Testing
1819

@@ -31,9 +32,9 @@ func assertLoweredFunction(
3132
line: Int = #line,
3233
column: Int = #column
3334
) throws {
34-
let translator = Swift2JavaTranslator(
35-
swiftModuleName: swiftModuleName
36-
)
35+
var config = Configuration()
36+
config.swiftModule = swiftModuleName
37+
let translator = Swift2JavaTranslator(config: config)
3738

3839
if let sourceFile {
3940
translator.add(filePath: "Fake.swift", text: sourceFile)
@@ -117,9 +118,9 @@ func assertLoweredVariableAccessor(
117118
line: Int = #line,
118119
column: Int = #column
119120
) throws {
120-
let translator = Swift2JavaTranslator(
121-
swiftModuleName: swiftModuleName
122-
)
121+
var config = Configuration()
122+
config.swiftModule = swiftModuleName
123+
let translator = Swift2JavaTranslator(config: config)
123124

124125
if let sourceFile {
125126
translator.add(filePath: "Fake.swift", text: sourceFile)

‎Tests/JExtractSwiftTests/Asserts/TextAssertions.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ func assertOutput(
3535
line: Int = #line,
3636
column: Int = #column
3737
) throws {
38-
let translator = Swift2JavaTranslator(swiftModuleName: swiftModuleName)
38+
var config = Configuration()
39+
config.swiftModule = swiftModuleName
40+
let translator = Swift2JavaTranslator(config: config)
3941

4042
try! translator.analyze(file: "/fake/Fake.swiftinterface", text: input)
4143

‎Tests/JExtractSwiftTests/FuncCallbackImportTests.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import JExtractSwiftLib
16+
import JavaKitConfigurationShared
1617
import Testing
1718

1819
final class FuncCallbackImportTests {
@@ -36,9 +37,9 @@ final class FuncCallbackImportTests {
3637

3738
@Test("Import: public func callMe(callback: () -> Void)")
3839
func func_callMeFunc_callback() throws {
39-
let st = Swift2JavaTranslator(
40-
swiftModuleName: "__FakeModule"
41-
)
40+
var config = Configuration()
41+
config.swiftModule = "__FakeModule"
42+
let st = Swift2JavaTranslator(config: config)
4243
st.log.logLevel = .error
4344

4445
try st.analyze(file: "Fake.swift", text: Self.class_interfaceFile)
@@ -125,9 +126,9 @@ final class FuncCallbackImportTests {
125126

126127
@Test("Import: public func callMeMore(callback: (UnsafeRawPointer, Float) -> Int, fn: () -> ())")
127128
func func_callMeMoreFunc_callback() throws {
128-
let st = Swift2JavaTranslator(
129-
swiftModuleName: "__FakeModule"
130-
)
129+
var config = Configuration()
130+
config.swiftModule = "__FakeModule"
131+
let st = Swift2JavaTranslator(config: config)
131132
st.log.logLevel = .error
132133

133134
try st.analyze(file: "Fake.swift", text: Self.class_interfaceFile)

‎Tests/JExtractSwiftTests/FunctionDescriptorImportTests.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import JExtractSwiftLib
16+
import JavaKitConfigurationShared
1617
import Testing
1718

1819
@Suite
@@ -233,9 +234,9 @@ extension FunctionDescriptorTests {
233234
logLevel: Logger.Level = .trace,
234235
body: (String) throws -> Void
235236
) throws {
236-
let st = Swift2JavaTranslator(
237-
swiftModuleName: swiftModuleName
238-
)
237+
var config = Configuration()
238+
config.swiftModule = swiftModuleName
239+
let st = Swift2JavaTranslator(config: config)
239240
st.log.logLevel = logLevel
240241

241242
try st.analyze(file: "/fake/Sample.swiftinterface", text: interfaceFile)
@@ -266,9 +267,9 @@ extension FunctionDescriptorTests {
266267
logLevel: Logger.Level = .trace,
267268
body: (String) throws -> Void
268269
) throws {
269-
let st = Swift2JavaTranslator(
270-
swiftModuleName: swiftModuleName
271-
)
270+
var config = Configuration()
271+
config.swiftModule = swiftModuleName
272+
let st = Swift2JavaTranslator(config: config)
272273
st.log.logLevel = logLevel
273274

274275
try st.analyze(file: "/fake/Sample.swiftinterface", text: interfaceFile)

‎Tests/JExtractSwiftTests/MethodImportTests.swift

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import JExtractSwiftLib
16+
import JavaKitConfigurationShared
1617
import Testing
1718

1819
final class MethodImportTests {
@@ -64,9 +65,9 @@ final class MethodImportTests {
6465

6566
@Test("Import: public func helloWorld()")
6667
func method_helloWorld() throws {
67-
let st = Swift2JavaTranslator(
68-
swiftModuleName: "__FakeModule"
69-
)
68+
var config = Configuration()
69+
config.swiftModule = "__FakeModule"
70+
let st = Swift2JavaTranslator(config: config)
7071
st.log.logLevel = .error
7172

7273
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -103,9 +104,9 @@ final class MethodImportTests {
103104

104105
@Test("Import: public func globalTakeInt(i: Int)")
105106
func func_globalTakeInt() throws {
106-
let st = Swift2JavaTranslator(
107-
swiftModuleName: "__FakeModule"
108-
)
107+
var config = Configuration()
108+
config.swiftModule = "__FakeModule"
109+
let st = Swift2JavaTranslator(config: config)
109110
st.log.logLevel = .error
110111

111112
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -144,9 +145,9 @@ final class MethodImportTests {
144145

145146
@Test("Import: public func globalTakeIntLongString(i32: Int32, l: Int64, s: String)")
146147
func func_globalTakeIntLongString() throws {
147-
let st = Swift2JavaTranslator(
148-
swiftModuleName: "__FakeModule"
149-
)
148+
var config = Configuration()
149+
config.swiftModule = "__FakeModule"
150+
let st = Swift2JavaTranslator(config: config)
150151
st.log.logLevel = .error
151152

152153
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -188,9 +189,9 @@ final class MethodImportTests {
188189

189190
@Test("Import: public func globalReturnClass() -> MySwiftClass")
190191
func func_globalReturnClass() throws {
191-
let st = Swift2JavaTranslator(
192-
swiftModuleName: "__FakeModule"
193-
)
192+
var config = Configuration()
193+
config.swiftModule = "__FakeModule"
194+
let st = Swift2JavaTranslator(config: config)
194195
st.log.logLevel = .error
195196

196197
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -232,9 +233,9 @@ final class MethodImportTests {
232233

233234
@Test("Import: func swapRawBufferPointer(buffer: _)")
234235
func func_globalSwapRawBufferPointer() throws {
235-
let st = Swift2JavaTranslator(
236-
swiftModuleName: "__FakeModule"
237-
)
236+
var config = Configuration()
237+
config.swiftModule = "__FakeModule"
238+
let st = Swift2JavaTranslator(config: config)
238239
st.log.logLevel = .error
239240

240241
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -279,9 +280,9 @@ final class MethodImportTests {
279280

280281
@Test
281282
func method_class_helloMemberFunction() throws {
282-
let st = Swift2JavaTranslator(
283-
swiftModuleName: "__FakeModule"
284-
)
283+
var config = Configuration()
284+
config.swiftModule = "__FakeModule"
285+
let st = Swift2JavaTranslator(config: config)
285286
st.log.logLevel = .error
286287

287288
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -321,9 +322,9 @@ final class MethodImportTests {
321322

322323
@Test
323324
func method_class_makeInt() throws {
324-
let st = Swift2JavaTranslator(
325-
swiftModuleName: "__FakeModule"
326-
)
325+
var config = Configuration()
326+
config.swiftModule = "__FakeModule"
327+
let st = Swift2JavaTranslator(config: config)
327328
st.log.logLevel = .info
328329

329330
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -363,9 +364,9 @@ final class MethodImportTests {
363364

364365
@Test
365366
func class_constructor() throws {
366-
let st = Swift2JavaTranslator(
367-
swiftModuleName: "__FakeModule"
368-
)
367+
var config = Configuration()
368+
config.swiftModule = "__FakeModule"
369+
let st = Swift2JavaTranslator(config: config)
369370
st.log.logLevel = .info
370371

371372
try st.analyze(file: "Fake.swift", text: class_interfaceFile)
@@ -406,9 +407,10 @@ final class MethodImportTests {
406407

407408
@Test
408409
func struct_constructor() throws {
409-
let st = Swift2JavaTranslator(
410-
swiftModuleName: "__FakeModule"
411-
)
410+
var config = Configuration()
411+
config.swiftModule = "__FakeModule"
412+
let st = Swift2JavaTranslator(config: config)
413+
412414
st.log.logLevel = .info
413415

414416
try st.analyze(file: "Fake.swift", text: class_interfaceFile)

0 commit comments

Comments
 (0)