Add test for swift-test specifier

Author: aciidgh

Fixtures/ValidLayouts/SwiftTestModule/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "SwiftTestModule"
+)

Fixtures/ValidLayouts/SwiftTestModule/Sources/SwiftTest.swift

@@ -0,0 +1,3 @@
+public func giveNumber() -> Int {
+	return 5
+}

Fixtures/ValidLayouts/SwiftTestModule/Tests/LinuxMain.swift

@@ -0,0 +1,7 @@
+import XCTest
+
+@testable import SwiftTestModuleTestSuite
+
+XCTMain([
+    testCase(SwiftTestModuleTests.allTests),
+])

Fixtures/ValidLayouts/SwiftTestModule/Tests/SwiftTestModule/SwiftTest.swift

@@ -0,0 +1,21 @@
+@testable import SwiftTestModule
+import XCTest
+
+class SwiftTestModuleTests: XCTestCase {
+	func testGiveNumber() {
+		XCTAssertEqual(giveNumber(), 5)
+	}
+	
+	func testGiveNumber2() {
+		XCTAssertEqual(giveNumber(), 5)
+	}
+}
+
+extension SwiftTestModuleTests {
+    static var allTests : [(String, SwiftTestModuleTests -> () throws -> Void)] {
+        return [
+                   ("testGiveNumber", testGiveNumber),
+                   ("testGiveNumber2", testGiveNumber2),
+        ]
+    }
+}

Sources/swift-test/usage.swift

@@ -18,8 +18,8 @@ func usage(_ print: (String) -> Void = { print($0) }) {
     print("USAGE: swift test [specifier] [options]")
     print("")
     print("SPECIFIER:")
-    print("  TestModule.TestCase         Run a test case subclass")
-    print("  TestModule.TestCase/test1   Run a specific test method")
+    print("  -s TestModule.TestCase         Run a test case subclass")
+    print("  -s TestModule.TestCase/test1   Run a specific test method")
     print("")
     print("OPTIONS:")
     print("  --chdir              Change working directory before any other operation [-C]")
@@ -34,8 +34,11 @@ enum Mode: Argument, Equatable, CustomStringConvertible {
         switch argument {
         case "--help", "--usage", "-h":
             self = .Usage
+        case "-s":
+            guard let specifier = pop() else { throw OptionsParser.Error.ExpectedAssociatedValue(argument) }
+            self = .Run(specifier)
         default:
-            self = .Run(argument)
+            return nil
         }
     }
 

Tests/Functional/SwiftTestTests.swift

@@ -0,0 +1,70 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+import XCTest
+
+class SwiftTestTests: XCTestCase {
+    
+    func testSwiftTestTests() {
+        fixture(name: "ValidLayouts/SwiftTestModule") { prefix in
+            XCTAssertBuilds(prefix)
+            XCTAssertTests(prefix)
+        }
+    }
+    
+    func testSwiftTestTestsSelectedTest() {
+        // Here we check if specifer in swift test works.
+        // Only one test method should execute.
+        fixture(name: "ValidLayouts/SwiftTestModule") { prefix in
+            XCTAssertBuilds(prefix)
+            
+            var ranFirstTest = false
+            var ranSecondTest = false
+            
+            XCTAssertTests(prefix, additionalArgs: ["-s", "SwiftTestModuleTestSuite.SwiftTestModuleTests/testGiveNumber"]) { output in
+                let exploded = output.characters.split(separator: "\n").map(String.init)
+                #if os(OSX)
+                    ranFirstTest = exploded.contains("Test Case '-[SwiftTestModuleTestSuite.SwiftTestModuleTests testGiveNumber]' started.")
+                    ranSecondTest = exploded.contains("Test Case '-[SwiftTestModuleTestSuite.SwiftTestModuleTests testGiveNumber2]' started.")
+                #else
+                    ranFirstTest = !exploded.filter { self.string($0, hasPrefix:"Test Case \'SwiftTestModuleTests.testGiveNumber\' started") }.isEmpty
+                    ranSecondTest = !exploded.filter { self.string($0, hasPrefix:"Test Case \'SwiftTestModuleTests.testGiveNumber2\' started") }.isEmpty
+                #endif
+            }
+            XCTAssertEqual(ranFirstTest, true, "First test did not run")
+            XCTAssertEqual(ranSecondTest, false, "Second test ran")
+        }
+    }
+    
+    // FIXME: Copy pasted from libc/String+Linux.swift because swiftc errors out saying:
+    // `ambiguous use of 'hasPrefix'` found in `Foundation.String` and `libc.String`.
+    // This is probably because XCTest imports Foundation and libc is imported in other
+    // parts of Funtional testsuite.
+    private func string(_ prefix: String, hasPrefix str: String) -> Bool {
+        if prefix.utf8.count < str.utf8.count {
+            return false
+        }
+        for i in 0..<str.utf8.count {
+            if prefix.utf8[prefix.utf8.startIndex.advanced(by: i)] != str.utf8[str.utf8.startIndex.advanced(by: i)] {
+                return false
+            }
+        }
+        return true
+    }
+}
+
+extension SwiftTestTests {
+    static var allTests : [(String, SwiftTestTests -> () throws -> Void)] {
+        return [
+                   ("testSwiftTestTests", testSwiftTestTests),
+                   ("testSwiftTestTestsSelectedTest", testSwiftTestTestsSelectedTest),
+        ]
+    }
+}

Tests/Functional/Utilities.swift

@@ -110,7 +110,6 @@ func swiftBuildPath() -> String {
 #endif
 }
 
-
 func executeSwiftBuild(_ chdir: String, configuration: Configuration = .Debug, printIfError: Bool = false, Xld: [String] = []) throws -> String {
     var env = [String:String]()
 #if Xcode
@@ -155,6 +154,44 @@ func executeSwiftBuild(_ chdir: String, configuration: Configuration = .Debug, p
     }
 }
 
+func swiftTestPath() -> String {
+    #if os(OSX)
+        for bundle in NSBundle.allBundles() where bundle.bundlePath.hasSuffix(".xctest") {
+            return Path.join(bundle.bundlePath.parentDirectory, "swift-test")
+        }
+        fatalError()
+    #else
+        return Path.join(Process.arguments.first!.abspath().parentDirectory, "swift-test")
+    #endif
+}
+
+func executeSwiftTest(_ chdir: String, printIfError: Bool = false, additionalArgs: [String] = []) throws -> String {
+    let args = [swiftTestPath(), "--chdir", chdir] + additionalArgs
+    var out = ""
+    do {
+        try popen(args, redirectStandardError: true, environment: [:]) {
+            out += $0
+        }
+        return out
+    } catch {
+        if printIfError {
+            print("output:", out)
+            print("swift-test:", swiftTestPath())
+        }
+        throw error
+    }
+}
+
+func XCTAssertTests(_ paths: String..., file: StaticString = #file, line: UInt = #line, additionalArgs: [String] = [], output: ((String) -> Void)? = nil) {
+    let prefix = Path.join(paths)
+    do {
+        let out = try executeSwiftTest(prefix, printIfError: true, additionalArgs: additionalArgs)
+        output?(out)
+    } catch {
+        XCTFail("`swift test \(additionalArgs)' failed:\n\n\(error)\n", file: file, line: line)
+    }
+}
+
 func mktmpdir(_ file: StaticString = #file, line: UInt = #line, @noescape body: (String) throws -> Void) {
     do {
         try POSIX.mkdtemp("spm-tests") { dir in

Tests/LinuxMain.swift

@@ -16,6 +16,7 @@ import XCTest
 
 XCTMain([
     testCase(TestClangModulesTestCase.allTests),
+	testCase(SwiftTestTests.allTests),
     testCase(DependencyResolutionTestCase.allTests),
     testCase(FileTests.allTests),
     testCase(GetTests.allTests),