[TestSupport] Move XCTAssertThrows into test support.

Author: ddunbar

Package.swift

@@ -111,6 +111,9 @@ let package = Package(
 
         // MARK: Additional Test Dependencies
 
+        Target(
+            name: "BasicTests",
+            dependencies: ["TestSupport"]),
         Target(
             name: "BuildTests",
             dependencies: ["Build", "TestSupport"]),

Sources/TestSupport/XCTAssertHelpers.swift

@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import func XCTest.XCTFail
+import XCTest
 
 import Basic
 import POSIX
@@ -67,3 +67,15 @@ public func XCTAssertNoSuchPath(_ path: AbsolutePath, file: StaticString = #file
         XCTFail("path exists but should not: \(path.asString)", file: file, line: line)
     }
 }
+
+public func XCTAssertThrows<T: Swift.Error>(_ expectedError: T, file: StaticString = #file, line: UInt = #line, _ body: () throws -> ()) where T: Equatable {
+    do {
+        try body()
+        XCTFail("body completed successfully", file: file, line: line)
+    } catch let error as T {
+        XCTAssertEqual(error, expectedError, file: file, line: line)
+    } catch {
+        XCTFail("unexpected error thrown", file: file, line: line)
+    }
+}
+

Tests/BasicTests/FileSystemTests.swift

@@ -13,16 +13,7 @@ import XCTest
 import Basic
 import POSIX
 
-func XCTAssertThrows<T: Swift.Error>(_ expectedError: T, file: StaticString = #file, line: UInt = #line, _ body: () throws -> ()) where T: Equatable {
-    do {
-        try body()
-        XCTFail("body completed successfully", file: file, line: line)
-    } catch let error as T {
-        XCTAssertEqual(error, expectedError, file: file, line: line)
-    } catch {
-        XCTFail("unexpected error thrown", file: file, line: line)
-    }
-}
+import TestSupport
 
 class FileSystemTests: XCTestCase {
 

Tests/BasicTests/GraphAlgorithmsTests.swift

@@ -12,6 +12,8 @@ import XCTest
 
 import Basic
 
+import TestSupport
+
 private func topologicalSort(_ nodes: [Int], _ successors: [Int: [Int]]) throws -> [Int] {
     return try topologicalSort(nodes, successors: { successors[$0] ?? [] })
 }

Tests/SourceControlTests/GitRepositoryTests.swift

@@ -10,24 +10,13 @@
 
 import XCTest
 
-import TestSupport
 import Basic
 import SourceControl
 import Utility
 
-@testable import class SourceControl.GitRepository
+import TestSupport
 
-// FIXME: Move to Utilities.
-func XCTAssertThrows<T: Swift.Error>(_ expectedError: T, file: StaticString = #file, line: UInt = #line, _ body: () throws -> ()) where T: Equatable {
-    do {
-        try body()
-        XCTFail("body completed successfully", file: file, line: line)
-    } catch let error as T {
-        XCTAssertEqual(error, expectedError, file: file, line: line)
-    } catch {
-        XCTFail("unexpected error thrown", file: file, line: line)
-    }
-}
+@testable import class SourceControl.GitRepository
 
 class GitRepositoryTests: XCTestCase {
     /// Test the basic provider functions.

Utilities/bootstrap

@@ -307,7 +307,9 @@ def parse_manifest():
     targets = list(map(convert, pattern.finditer(manifest_data)))
 
     # Remove the targets which should be ignored in stage 1.
-    targets = [target for target in targets if target.name not in g_ignored_targets]
+    targets = [target for target in targets
+               if target.name not in g_ignored_targets and
+                  not target.name.endswith("Tests")]
 
     # substitute strings for Target objects
     for target in targets:
@@ -340,7 +342,7 @@ def parse_manifest():
 # Hard-coded target definition.
 g_project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 g_source_root = os.path.join(g_project_root, "Sources")
-g_ignored_targets = ["swiftpm-xctest-helper", "TestSupport", "BuildTests", "CommandsTests", "FunctionalTests", "GetTests", "PackageLoadingTests", "SourceControlTests", "UtilityTests"]
+g_ignored_targets = ["swiftpm-xctest-helper", "TestSupport"]
 targets = parse_manifest()
 target_map = dict((t.name, t) for t in targets)