Tweaks on ConbiniForTesting SPM build & fix warnings on Xcode 12 #file

dehesa · Jul 28, 2020 · 2881c81 · 2881c81
1 parent 6862839
commit 2881c81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Package.swift b/Package.swift
@@ -8,12 +8,12 @@ let package = Package(
     ],
     products: [
         .library(name: "Conbini", targets: ["Conbini"]),
-        .library(name: "ConbiniForTesting", targets: ["Conbini", "ConbiniForTesting"])
+        .library(name: "ConbiniForTesting", targets: ["ConbiniForTesting"])
     ],
     dependencies: [],
     targets: [
         .target(name: "Conbini", dependencies: [], path: "sources/conbini"),
-        .target(name: "ConbiniForTesting", dependencies: [.target(name: "Conbini")], path: "sources/testing"),
+        .target(name: "ConbiniForTesting", dependencies: [], path: "sources/testing"),
         .testTarget(name: "ConbiniTests", dependencies: ["Conbini"], path: "tests/conbiniTests"),
         .testTarget(name: "ConbiniForTestingTests", dependencies: ["ConbiniForTesting"], path: "tests/testingTests")
     ]

diff --git a/README.md b/README.md
@@ -45,8 +45,6 @@ The testing conveniences depend on [XCTest](https://developer.apple.com/document
 -   `import Conbini` includes all code excepts the testing conveniences.
 -   `import ConbiniForTesting` includes the testing functionality only.
 
-The rule of thumb is to use `import Conbini` in your regular code (e.g. within your framework or app) and write `import ConbiniForTesting` within your test target files.
-
 </p></details>
 </ul>
 

diff --git a/sources/testing/subscribers/Expectations.swift b/sources/testing/subscribers/Expectations.swift
@@ -19,7 +19,7 @@ extension Publisher {
         let cancellable = self.sink(receiveCompletion: {
             switch $0 {
             case .finished: exp.fulfill()
-            case .failure(let e): XCTFail("The publisher completed with failure when successfull completion was expected.\n\(e)\n", file: file, line: line)
+            case .failure(let e): XCTFail("The publisher completed with failure when successfull completion was expected.\n\(e)\n", file: (file), line: line)
             }
         }, receiveValue: { _ in return })
 
@@ -43,7 +43,7 @@ extension Publisher {
 
         let cancellable = self.sink(receiveCompletion: {
             switch $0 {
-            case .finished: XCTFail("The publisher completed successfully when a failure was expected", file: file, line: line)
+            case .finished: XCTFail("The publisher completed successfully when a failure was expected", file: (file), line: line)
             case .failure(_): exp.fulfill()
             }
         }, receiveValue: { (_) in return })
@@ -73,18 +73,18 @@ extension Publisher {
             cancellable = nil
             switch $0 {
             case .failure(let e):
-                return XCTFail("The publisher completed with failure when successfull completion was expected\n\(e)\n", file: file, line: line)
+                return XCTFail("The publisher completed with failure when successfull completion was expected\n\(e)\n", file: (file), line: line)
             case .finished:
                 guard case .some = value else {
-                    return XCTFail("The publisher completed without outputting any value", file: file, line: line)
+                    return XCTFail("The publisher completed without outputting any value", file: (file), line: line)
                 }
                 exp.fulfill()
             }
         }, receiveValue: {
             guard case .none = value else {
                 cancellable?.cancel()
                 cancellable = nil
-                return XCTFail("The publisher produced more than one value when only one was expected", file: file, line: line)
+                return XCTFail("The publisher produced more than one value when only one was expected", file: (file), line: line)
             }
             value = $0
         })
@@ -94,7 +94,7 @@ extension Publisher {
         cancellable?.cancel()
 
         guard let result = value else {
-            XCTFail("The publisher didn't produce any value before the timeout ellapsed", file: file, line: line)
+            XCTFail("The publisher didn't produce any value before the timeout ellapsed", file: (file), line: line)
             fatalError(file: file, line: line)
         }
         return result
@@ -122,7 +122,7 @@ extension Publisher {
             case .finished:
                 exp.fulfill()
             case .failure(let e):
-                XCTFail("The publisher completed with failure when successfull completion was expected\n\(e)\n", file: file, line: line)
+                XCTFail("The publisher completed with failure when successfull completion was expected\n\(e)\n", file: (file), line: line)
                 fatalError()
             }
         }, receiveValue: { result.append($0) })
@@ -156,7 +156,7 @@ extension Publisher {
             cancellable = nil
             switch $0 {
             case .finished: if result.count == values { return exp.fulfill() }
-            case .failure(let e): XCTFail(String(describing: e), file: file, line: line)
+            case .failure(let e): XCTFail(String(describing: e), file: (file), line: line)
             }
         }, receiveValue: { (output) in
             guard result.count < values else { return }