Update allTests signature for the latest Corelibs XCTest version

runt18 · Feb 6, 2016 · f4d794d · f4d794d
1 parent 6d50ff4
commit f4d794d
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 16 deletions.
diff --git a/Sources/Quick/QuickSpec.swift b/Sources/Quick/QuickSpec.swift
@@ -8,7 +8,7 @@ public class QuickSpec: XCTestCase, XCTestCaseProvider {
 
     public required init() {}
 
-    public var allTests : [(String, () -> Void)] {
+    public var allTests : [(String, () throws -> Void)] {
         gatherExamplesIfNeeded()
 
         let examples = World.sharedWorld.examples(self.dynamicType)

diff --git a/Sources/QuickFocusedTests/FocusedTests.swift b/Sources/QuickFocusedTests/FocusedTests.swift
@@ -41,7 +41,7 @@ class FunctionalTests_FocusedSpec_Unfocused: QuickSpec {
 }
 
 class FocusedTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testOnlyFocusedExamplesAreExecuted", testOnlyFocusedExamplesAreExecuted),
         ]

diff --git a/Sources/QuickTestHelpers/SpecRunner.swift b/Sources/QuickTestHelpers/SpecRunner.swift
@@ -9,16 +9,21 @@ public func qck_runSpecs(specClasses: [QuickSpec.Type]) -> TestRun {
     World.sharedWorld.isRunningAdditionalSuites = true
 
     var executionCount: UInt = 0
+    var hadUnexpectedFailure = false
 
     let fails = gatherFailingExpectations(silently: true) {
         for specClass in specClasses {
             let spec = specClass.init()
             for (_, test) in spec.allTests {
-                test()
+                do {
+                    try test()
+                } catch {
+                    hadUnexpectedFailure = true
+                }
                 executionCount += 1
             }
         }
     }
 
-    return TestRun(executionCount: executionCount, hasSucceeded: fails.isEmpty)
+    return TestRun(executionCount: executionCount, hasSucceeded: fails.isEmpty && !hadUnexpectedFailure)
 }
diff --git a/Sources/QuickTests/FunctionalTests/AfterEachTests.swift b/Sources/QuickTests/FunctionalTests/AfterEachTests.swift
@@ -69,7 +69,7 @@ class FunctionalTests_AfterEachSpec: QuickSpec {
 }
 
 class AfterEachTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testAfterEachIsExecutedInTheCorrectOrder", testAfterEachIsExecutedInTheCorrectOrder),
         ]

diff --git a/Sources/QuickTests/FunctionalTests/AfterSuiteTests.swift b/Sources/QuickTests/FunctionalTests/AfterSuiteTests.swift
@@ -24,7 +24,7 @@ class FunctionalTests_AfterSuite_Spec: QuickSpec {
 }
 
 class AfterSuiteTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testAfterSuiteIsNotExecutedBeforeAnyExamples", testAfterSuiteIsNotExecutedBeforeAnyExamples),
         ]

diff --git a/Sources/QuickTests/FunctionalTests/BeforeEachTests.swift b/Sources/QuickTests/FunctionalTests/BeforeEachTests.swift
@@ -54,7 +54,7 @@ class FunctionalTests_BeforeEachSpec: QuickSpec {
 }
 
 class BeforeEachTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testBeforeEachIsExecutedInTheCorrectOrder", testBeforeEachIsExecutedInTheCorrectOrder),
         ]

diff --git a/Sources/QuickTests/FunctionalTests/BeforeSuiteTests.swift b/Sources/QuickTests/FunctionalTests/BeforeSuiteTests.swift
@@ -24,7 +24,7 @@ class FunctionalTests_BeforeSuite_Spec: QuickSpec {
 }
 
 class BeforeSuiteTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testBeforeSuiteIsExecutedBeforeAnyExamples", testBeforeSuiteIsExecutedBeforeAnyExamples),
         ]

diff --git a/...ces/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift b/...ces/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
@@ -17,7 +17,7 @@ class Configuration_AfterEachSpec: QuickSpec {
 }
 
 class Configuration_AfterEachTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testExampleIsRunAfterTheConfigurationBeforeEachIsExecuted", testExampleIsRunAfterTheConfigurationBeforeEachIsExecuted),
         ]

diff --git a/...s/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift b/...s/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
@@ -14,7 +14,7 @@ class Configuration_BeforeEachSpec: QuickSpec {
 }
 
 class Configuration_BeforeEachTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testExampleIsRunAfterTheConfigurationBeforeEachIsExecuted", testExampleIsRunAfterTheConfigurationBeforeEachIsExecuted),
         ]

diff --git a/Sources/QuickTests/FunctionalTests/DescribeTests.swift b/Sources/QuickTests/FunctionalTests/DescribeTests.swift
@@ -5,7 +5,7 @@ import Quick
 #if _runtime(_ObjC)
 
 class DescribeTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testDescribeThrowsIfUsedOutsideOfQuickSpec", testDescribeThrowsIfUsedOutsideOfQuickSpec),
         ]

diff --git a/Sources/QuickTests/FunctionalTests/ItTests.swift b/Sources/QuickTests/FunctionalTests/ItTests.swift
@@ -112,7 +112,7 @@ class FunctionalTests_ItSpec: QuickSpec {
 }
 
 class ItTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testAllExamplesAreExecuted", testAllExamplesAreExecuted),
         ]

diff --git a/Sources/QuickTests/FunctionalTests/PendingTests.swift b/Sources/QuickTests/FunctionalTests/PendingTests.swift
@@ -28,7 +28,7 @@ class FunctionalTests_PendingSpec: QuickSpec {
 }
 
 class PendingTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testAnOtherwiseFailingExampleWhenMarkedPendingDoesNotCauseTheSuiteToFail", testAnOtherwiseFailingExampleWhenMarkedPendingDoesNotCauseTheSuiteToFail),
             ("testBeforeEachOnlyRunForEnabledExamples", testBeforeEachOnlyRunForEnabledExamples),

diff --git a/Sources/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift b/Sources/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
@@ -28,7 +28,7 @@ class FunctionalTests_SharedExamples_BeforeEachSpec: QuickSpec {
 }
 
 class SharedExamples_BeforeEachTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testBeforeEachOutsideOfSharedExamplesExecutedOnceBeforeEachExample", testBeforeEachOutsideOfSharedExamplesExecutedOnceBeforeEachExample),
             ("testBeforeEachInSharedExamplesExecutedOnceBeforeEachSharedExample", testBeforeEachInSharedExamplesExecutedOnceBeforeEachSharedExample),

diff --git a/Sources/QuickTests/FunctionalTests/SharedExamplesTests.swift b/Sources/QuickTests/FunctionalTests/SharedExamplesTests.swift
@@ -37,7 +37,7 @@ class FunctionalTests_SharedExamples_ErrorSpec: QuickSpec {
 
 // Shared examples are defined in QuickTests/Fixtures
 class SharedExamplesTests: XCTestCase, XCTestCaseProvider {
-    var allTests: [(String, () -> Void)] {
+    var allTests: [(String, () throws -> Void)] {
         return [
             ("testAGroupOfThreeSharedExamplesExecutesThreeExamples", testAGroupOfThreeSharedExamplesExecutesThreeExamples),
             ("testSharedExamplesWithContextPassContextToExamples", testSharedExamplesWithContextPassContextToExamples),

diff --git a/Sources/QuickTests/Helpers/XCTestCaseProvider.swift b/Sources/QuickTests/Helpers/XCTestCaseProvider.swift
@@ -9,7 +9,7 @@ import XCTest
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 
 public protocol XCTestCaseProvider {
-    var allTests : [(String, () -> Void)] { get }
+    var allTests: [(String, () throws -> Void)] { get }
 }
 
 extension XCTestCase {