Merge pull request #1306 from RomanPodymov/v6

More when

Author: mxcl

Sources/when.swift

@@ -391,11 +391,21 @@ public func when(_ guarantees: Guarantee<Void>...) -> Guarantee<Void> {
     return when(guarantees: guarantees)
 }
 
+/// Waits on all provided Guarantees.
+public func when<T>(_ guarantees: Guarantee<T>...) -> Guarantee<[T]> {
+    return when(guarantees: guarantees)
+}
+
 /// Waits on all provided Guarantees.
 public func when(guarantees: [Guarantee<Void>]) -> Guarantee<Void> {
     return when(fulfilled: guarantees).recover{ _ in }.asVoid()
 }
 
+/// Waits on all provided Guarantees.
+public func when<T>(guarantees: [Guarantee<T>]) -> Guarantee<[T]> {
+    return __when(guarantees).map(on: nil) { guarantees.map { $0.value! } }
+}
+
 /// Waits on all provided Guarantees.
 public func when<U, V>(guarantees gu: Guarantee<U>, _ gv: Guarantee<V>) -> Guarantee<(U, V)> {
     return __when([gu.asVoid(), gv.asVoid()]).map(on: nil) { (gu.value!, gv.value!) }

Tests/CorePromise/WhenTests.swift

@@ -251,18 +251,64 @@ class WhenTests: XCTestCase {
         waitForExpectations(timeout: 1)
     }
 
-    func testGuaranteeWhen() {
+    func testGuaranteesWhenVoidVarArgs() {
         let ex1 = expectation(description: "")
-        when(Guarantee(), Guarantee()).done {
+        var someNumber = 0
+        let g1 = Guarantee<Void> { resolver in
+            someNumber += 1
+            resolver(())
+        }
+        let g2 = Guarantee<Void> { resolver in
+            someNumber += 2
+            resolver(())
+        }
+        when(g1, g2).done {
+            XCTAssertEqual(someNumber, 3)
+            ex1.fulfill()
+        }
+        wait(for: [ex1], timeout: 10)
+    }
+    
+    func testGuaranteesWhenVarArgs() {
+        let ex1 = expectation(description: "")
+        let g1 = Guarantee<Int>.value(1)
+        let g2 = Guarantee<Int>.value(4)
+        let g3 = Guarantee<Int>.value(2)
+        let g4 = Guarantee<Int>.value(5)
+        let g5 = Guarantee<Int>.value(3)
+        when(g1, g2, g3, g4, g5).done {
+            XCTAssertEqual($0, [1, 4, 2, 5, 3])
+            ex1.fulfill()
+        }
+        wait(for: [ex1], timeout: 10)
+    }
+    
+    func testGuaranteesWhenVoidArray() {
+        let ex1 = expectation(description: "")
+        var someNumber = 0
+        when(guarantees: (0..<100).map { _ in
+            Guarantee<Void> { resolver in
+                someNumber += 1
+                resolver(())
+            }
+        }).done {
+            XCTAssertEqual(someNumber, 100)
             ex1.fulfill()
         }
 
-        let ex2 = expectation(description: "")
-        when(guarantees: [Guarantee(), Guarantee()]).done {
-            ex2.fulfill()
+        wait(for: [ex1], timeout: 10)
+    }
+    
+    func testGuaranteesWhenArray() {
+        let ex1 = expectation(description: "")
+        when(guarantees: (0..<100).map {
+            Guarantee<Int>.value($0)
+        }).done {
+            XCTAssertEqual($0, Array(0..<100))
+            ex1.fulfill()
         }
 
-        wait(for: [ex1, ex2], timeout: 10)
+        wait(for: [ex1], timeout: 10)
     }
 
     func testDoubleTupleGuarantees() {

Tests/CorePromise/XCTestManifests.swift

@@ -256,7 +256,10 @@ extension WhenTests {
         ("testDoubleTuple", testDoubleTuple),
         ("testDoubleTupleGuarantees", testDoubleTupleGuarantees),
         ("testEmpty", testEmpty),
-        ("testGuaranteeWhen", testGuaranteeWhen),
+        ("testGuaranteesWhenArray", testGuaranteesWhenArray),
+        ("testGuaranteesWhenVarArgs", testGuaranteesWhenVarArgs),
+        ("testGuaranteesWhenVoidArray", testGuaranteesWhenVoidArray),
+        ("testGuaranteesWhenVoidVarArgs", testGuaranteesWhenVoidVarArgs),
         ("testInt", testInt),
         ("testProgress", testProgress),
         ("testProgressDoesNotExceed100Percent", testProgressDoesNotExceed100Percent),