-
Notifications
You must be signed in to change notification settings - Fork 49
Split the Java2Swift tool out into a library target and add a test harness #73
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2024 Apple Inc. and the Swift.org project authors | ||
| // Licensed under Apache License v2.0 | ||
| // | ||
| // See LICENSE.txt for license information | ||
| // See CONTRIBUTORS.txt for the list of Swift.org project authors | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| import JavaKit | ||
| import Java2SwiftLib | ||
| import JavaKitVM | ||
| import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43 | ||
|
|
||
| /// Handy reference to the JVM abstraction. | ||
| var jvm: JavaVirtualMachine { | ||
| get throws { | ||
| try .shared() | ||
| } | ||
| } | ||
|
|
||
| class Java2SwiftTests: XCTestCase { | ||
| func testJavaLangObjectMapping() async throws { | ||
| try assertTranslatedClass( | ||
| JavaObject.self, | ||
| swiftTypeName: "MyJavaObject", | ||
| expectedChunks: [ | ||
| "import JavaKit", | ||
| """ | ||
| @JavaClass("java.lang.Object") | ||
| public struct MyJavaObject { | ||
| """, | ||
| """ | ||
| @JavaMethod | ||
| public func toString() -> String | ||
| """, | ||
| """ | ||
| @JavaMethod | ||
| public func wait() throws | ||
| """ | ||
| ] | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| /// Translate a Java class and assert that the translated output contains | ||
| /// each of the expected "chunks" of text. | ||
| func assertTranslatedClass<JavaClassType: AnyJavaObject>( | ||
| _ javaType: JavaClassType.Type, | ||
| swiftTypeName: String, | ||
| translatedClasses: [ | ||
| String: (swiftType: String, swiftModule: String?, isOptional: Bool) | ||
| ] = JavaTranslator.defaultTranslatedClasses, | ||
| expectedChunks: [String], | ||
| file: StaticString = #filePath, | ||
| line: UInt = #line | ||
| ) throws { | ||
| let environment = try jvm.environment() | ||
| let translator = JavaTranslator( | ||
| swiftModuleName: "SwiftModule", | ||
| environment: environment | ||
| ) | ||
|
|
||
| translator.translatedClasses = translatedClasses | ||
| translator.translatedClasses[javaType.fullJavaClassName] = (swiftTypeName, nil, true) | ||
|
|
||
| translator.startNewFile() | ||
| let translatedDecls = translator.translateClass( | ||
| try JavaClass<JavaObject>( | ||
| javaThis: javaType.getJNIClass(in: environment), | ||
| environment: environment) | ||
| ) | ||
| let importDecls = translator.getImportDecls() | ||
|
|
||
| let swiftFileText = """ | ||
| // Auto-generated by Java-to-Swift wrapper generator. | ||
| \(importDecls.map { $0.description }.joined()) | ||
| \(translatedDecls.map { $0.description }.joined(separator: "\n")) | ||
| """ | ||
|
|
||
| for expectedChunk in expectedChunks { | ||
| if swiftFileText.contains(expectedChunk) { | ||
| continue | ||
| } | ||
|
|
||
| XCTFail("Expected chunk '\(expectedChunk)' not found in '\(swiftFileText)'", file: file, line: line) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about the “lib” suffix tbh, just java2swift is fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd have to rename the executable target to drop the Lib suffix