Test bridging of Bundle parameters (#22)

Author: marcprux

Package.swift

@@ -27,14 +27,14 @@ let package = Package(
         .testTarget(name: "SkipAndroidBridgeTests", dependencies: [
             "SkipAndroidBridge",
             .product(name: "SkipTest", package: "skip"),
-        ], plugins: [.plugin(name: "skipstone", package: "skip")]),
+        ], resources: [.process("Resources")], plugins: [.plugin(name: "skipstone", package: "skip")]),
 
         .target(name: "SkipAndroidBridgeSamples", dependencies: [
             "SkipAndroidBridge",
         ], resources: [.process("Resources")], plugins: [.plugin(name: "skipstone", package: "skip")]),
         .testTarget(name: "SkipAndroidBridgeSamplesTests", dependencies: [
             "SkipAndroidBridgeSamples",
             .product(name: "SkipTest", package: "skip"),
-        ], plugins: [.plugin(name: "skipstone", package: "skip")]),
+        ], resources: [.process("Resources")], plugins: [.plugin(name: "skipstone", package: "skip")]),
     ]
 )

…droidBridgeSamples/Resources/sample.json …/Resources/SkipAndroidBridgeSamples.jsonSources/SkipAndroidBridgeSamples/Resources/sample.json renamed to Sources/SkipAndroidBridgeSamples/Resources/SkipAndroidBridgeSamples.json Sources/SkipAndroidBridgeSamples/Resources/sample.json renamed to Sources/SkipAndroidBridgeSamples/Resources/SkipAndroidBridgeSamples.json

@@ -18,12 +18,12 @@ public func bundleClassName() -> String {
     "\(Bundle.module)"
 }
 
-public func getAssetURL(named name: String) -> URL? {
-    Bundle.module.url(forResource: name, withExtension: nil)
+public func getAssetURL(named name: String, in bundle: Bundle? = nil) -> URL? {
+    (bundle ?? Bundle.module).url(forResource: name, withExtension: nil)
 }
 
-public func getAssetContents(named name: String) throws -> Data? {
-    guard let url = getAssetURL(named: name) else { return nil }
+public func getAssetContents(named name: String, in bundle: Bundle? = nil) throws -> Data? {
+    guard let url = getAssetURL(named: name, in: bundle) else { return nil }
     return try Data(contentsOf: url)
 }
 

Sources/SkipAndroidBridgeSamples/SkipAndroidBridgeSamples.swift

@@ -0,0 +1 @@
+{ "name": "SkipAndroidBridgeSamplesTests" }

Tests/SkipAndroidBridgeSamplesTests/Resources/SkipAndroidBridgeSamplesTests.json

@@ -36,31 +36,39 @@ final class SkipAndroidBridgeSamplesTests: XCTestCase {
         }
     }
 
-    func testResourceURL() throws {
+    func resourceURLTest(name: String, bundle: Bundle?) throws {
         if isRobolectric {
             // unwrap fails on Robolectric
             throw XCTSkip("unknown error on Robolectric")
         }
 
-        let url = try XCTUnwrap(getAssetURL(named: "sample.json"))
+        let url = try XCTUnwrap(getAssetURL(named: "\(name).json", in: bundle))
         if isRobolectric || !isJava {
             XCTAssertEqual("file", url.scheme)
-            XCTAssertEqual("sample.json", url.lastPathComponent)
+            XCTAssertEqual("\(name).json", url.lastPathComponent)
         } else {
             XCTAssertEqual("asset", url.scheme)
-            XCTAssertEqual("asset:/skip/android/bridge/samples/Resources/sample.json", url.absoluteString)
+            XCTAssertEqual("asset:/skip/android/bridge/samples/Resources/\(name).json", url.absoluteString)
         }
 
-        let expectedContents = #"{ "name": "SkipAndroidBridgeSamples" }"# + "\n"
+        let expectedContents = "{ \"name\": \"\(name)\" }\n"
 
-        let bridgedData = try XCTUnwrap(getAssetContents(named: "sample.json"))
+        let bridgedData = try XCTUnwrap(getAssetContents(named: "\(name).json", in: bundle))
         XCTAssertEqual(expectedContents, String(data: bridgedData, encoding: .utf8))
 
         // also try loading localy with the Java side of the URLProtocol
         let localData = try Data(contentsOf: url)
         XCTAssertEqual(expectedContents, String(data: localData, encoding: .utf8))
     }
 
+    func testResourceURL() throws {
+        try resourceURLTest(name: "SkipAndroidBridgeSamples", bundle: nil)
+    }
+
+    func testResourceURLWithBundleParameter() throws {
+        try resourceURLTest(name: "SkipAndroidBridgeSamplesTests", bundle: .module)
+    }
+
     func testUserDefaultsClassName() throws {
         let className = userDefaultsClassName()
         if isAndroid {

Tests/SkipAndroidBridgeSamplesTests/SkipAndroidBridgeSamplesTests.swift

@@ -0,0 +1 @@
+{ "name": "SkipAndroidBridgeTests" }