Skip to content

Commit 82e86fd

Browse files
committed
Update enums and tests
1 parent e12d92d commit 82e86fd

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Sources/Java2SwiftLib/JavaTranslator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ extension JavaTranslator {
274274
)
275275

276276
if !enumConstants.isEmpty {
277-
let enumName = "\(swiftTypeName)Cases"
277+
let enumName = "\(swiftTypeName.splitSwiftTypeName().name)Cases"
278278
members.append(
279279
contentsOf: translateToEnumValue(name: enumName, enumFields: enumConstants)
280280
)

Tests/Java2SwiftTests/Java2SwiftTests.swift

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Java2SwiftTests: XCTestCase {
3737
"import JavaKit",
3838
"""
3939
@JavaClass("java.lang.Object")
40-
public struct `MyJavaObject` {
40+
public struct MyJavaObject {
4141
""",
4242
"""
4343
@JavaMethod
@@ -121,20 +121,24 @@ class Java2SwiftTests: XCTestCase {
121121
swiftTypeName: "ProcessBuilder",
122122
translatedClasses: [
123123
"java.lang.ProcessBuilder": ("ProcessBuilder", nil, true),
124-
"java.lang.ProcessBuilder.Redirect": ("ProcessBuilder.Redirect", nil, true),
125-
"java.lang.ProcessBuilder.Redirect.Type": ("ProcessBuilder.Redirect.Type", nil, true),
124+
"java.lang.ProcessBuilder$Redirect": ("ProcessBuilder.Redirect", nil, true),
125+
"java.lang.ProcessBuilder$Redirect$Type": ("ProcessBuilder.Redirect.Type", nil, true),
126126
],
127127
expectedChunks: [
128128
"import JavaKit",
129+
"""
130+
@JavaMethod
131+
public func redirectInput() -> ProcessBuilder.Redirect?
132+
""",
129133
"""
130134
extension ProcessBuilder {
131-
@JavaClass("java.lang.ProcessBuilder.Redirect")
132-
public struct `Redirect` {
135+
@JavaClass("java.lang.ProcessBuilder$Redirect")
136+
public struct Redirect {
133137
""",
134138
"""
135139
extension ProcessBuilder.Redirect {
136-
@JavaClass("java.lang.ProcessBuilder.Redirect.Type")
137-
public struct `Type` {
140+
@JavaClass("java.lang.ProcessBuilder$Redirect$Type")
141+
public struct Type {
138142
"""
139143
]
140144
)

0 commit comments

Comments
 (0)