Test case fixes

skiptools · Oct 17, 2024 · 3054fd2 · 3054fd2
1 parent 3c95660
commit 3054fd2
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 745 deletions.
diff --git a/Darwin/Sources/AppDroidAppMain.swift b/Darwin/Sources/AppDroidAppMain.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import SwiftUI
 import AppDroid
 

diff --git a/LICENSE.GPL b/LICENSE.GPL
diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://source.skip.tools/skip.git", from: "1.1.10"),
-        .package(url: "https://source.skip.tools/skip-ui.git", branch: "main"),
+        .package(url: "https://source.skip.tools/skip-ui.git", from: "1.0.0"),
         .package(url: "https://source.skip.tools/skip-bridge.git", branch: "main"),
         .package(url: "https://github.com/apple/swift-algorithms", from: "1.2.0"),
     ],

diff --git a/Sources/AppDroid/AppDroid.swift b/Sources/AppDroid/AppDroid.swift
@@ -1,6 +1,2 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 public class AppDroidModule {
 }
diff --git a/Sources/AppDroid/AppDroidApp.swift b/Sources/AppDroid/AppDroidApp.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import Foundation
 import OSLog
 import SwiftUI

diff --git a/Sources/AppDroid/BridgeView.swift b/Sources/AppDroid/BridgeView.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import SwiftUI
 import AppDroidModel
 

diff --git a/Sources/AppDroid/ContentView.swift b/Sources/AppDroid/ContentView.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import SwiftUI
 
 public struct ContentView: View {

diff --git a/Sources/AppDroidModel/AppDroidKotlin.swift b/Sources/AppDroidModel/AppDroidKotlin.swift
@@ -1,8 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
-//import Foundation
 
 // SKIP @bridgeToSwift
 func getJavaSystemProperty(_ name: String) -> String? {

diff --git a/Sources/AppDroidModel/Swift/AppDroidSwift.swift b/Sources/AppDroidModel/Swift/AppDroidSwift.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import Foundation
 
 // SKIP @bridgeToKotlin

diff --git a/Tests/AppDroidModelTests/AppDroidModelTests.swift b/Tests/AppDroidModelTests/AppDroidModelTests.swift
@@ -1,27 +1,24 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import XCTest
-import OSLog
-import Foundation
+import SkipBridge
 @testable import AppDroidModel
 
-let logger: Logger = Logger(subsystem: "AppDroidModel", category: "Tests")
-
 @available(macOS 13, *)
 final class AppDroidModelTests: XCTestCase {
+    override func setUp() {
+        #if SKIP
+        loadPeerLibrary(packageName: "skipapp-appdroid", moduleName: "AppDroidModel")
+        #endif
+    }
+
     func testAppDroidModel() throws {
-        logger.log("running testAppDroidModel")
-        XCTAssertEqual(1 + 2, 3, "basic test")
-
-        // load the TestData.json file from the Resources folder and decode it into a struct
-        let resourceURL: URL = try XCTUnwrap(Bundle.module.url(forResource: "TestData", withExtension: "json"))
-        let testData = try JSONDecoder().decode(TestData.self, from: Data(contentsOf: resourceURL))
-        XCTAssertEqual("AppDroidModel", testData.testModuleName)
+        #if SKIP
+        XCTAssertEqual("/", getJavaSystemProperty("file.separator"))
+        #else
+        throw XCTSkip("getJavaSystemProperty only works in transpiled test")
+        #endif
     }
-}
 
-struct TestData : Codable, Hashable {
-    var testModuleName: String
-}
+    func testClosure() {
+        XCTAssertEqual("value = 1", swiftClosure1Var(1))
+    }
+}
diff --git a/Tests/AppDroidModelTests/XCSkipTests.swift b/Tests/AppDroidModelTests/XCSkipTests.swift
@@ -1,8 +1,4 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
-import Foundation
+//import Foundation
 #if os(macOS) // Skip transpiled tests only run on macOS targets
 import SkipTest
 
@@ -22,11 +18,11 @@ final class XCSkipTests: XCTestCase, XCGradleHarness {
 }
 #endif
 
-/// True when running in a transpiled Java runtime environment
-let isJava = ProcessInfo.processInfo.environment["java.io.tmpdir"] != nil
-/// True when running within an Android environment (either an emulator or device)
-let isAndroid = isJava && ProcessInfo.processInfo.environment["ANDROID_ROOT"] != nil
-/// True is the transpiled code is currently running in the local Robolectric test environment
-let isRobolectric = isJava && !isAndroid
-/// True if the system's `Int` type is 32-bit.
-let is32BitInteger = Int64(Int.max) == Int64(Int32.max)
+///// True when running in a transpiled Java runtime environment
+//let isJava = ProcessInfo.processInfo.environment["java.io.tmpdir"] != nil
+///// True when running within an Android environment (either an emulator or device)
+//let isAndroid = isJava && ProcessInfo.processInfo.environment["ANDROID_ROOT"] != nil
+///// True is the transpiled code is currently running in the local Robolectric test environment
+//let isRobolectric = isJava && !isAndroid
+///// True if the system's `Int` type is 32-bit.
+//let is32BitInteger = Int64(Int.max) == Int64(Int32.max)
diff --git a/Tests/AppDroidTests/AppDroidTests.swift b/Tests/AppDroidTests/AppDroidTests.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import XCTest
 import OSLog
 import Foundation
@@ -24,4 +20,4 @@ final class AppDroidTests: XCTestCase {
 
 struct TestData : Codable, Hashable {
     var testModuleName: String
-}
+}
diff --git a/Tests/AppDroidTests/XCSkipTests.swift b/Tests/AppDroidTests/XCSkipTests.swift
@@ -1,7 +1,3 @@
-// This is free software: you can redistribute and/or modify it
-// under the terms of the GNU General Public License 3.0
-// as published by the Free Software Foundation https://fsf.org
-
 import Foundation
 #if os(macOS) // Skip transpiled tests only run on macOS targets
 import SkipTest