Merge pull request #214 from kostiakoval/init-lib-tests

[swift-build] update `swift build --init library` tests format

Author: kostiakoval

Sources/swift-build/initPackage.swift

@@ -121,9 +121,9 @@ final class InitPackage {
         }
         print("Creating Tests/LinuxMain.swift")
         try fputs("import XCTest\n", linuxMainFP)
-        try fputs("@testable import \(pkgname)test\n\n", linuxMainFP)
+        try fputs("@testable import \(pkgname)TestSuite\n\n", linuxMainFP)
         try fputs("XCTMain([\n", linuxMainFP)
-        try fputs("\t\(pkgname)(),\n", linuxMainFP)
+        try fputs("\t testCase(\(pkgname)Tests.allTests),\n", linuxMainFP)
         try fputs("])\n", linuxMainFP)
     }
 
@@ -132,16 +132,16 @@ final class InitPackage {
         print("Creating Tests/\(pkgname)/")
         try mkdir(testModule)
 
-        let testsFile = Path.join(testModule, "\(pkgname).swift")
-        print("Creating Tests/\(pkgname)/\(pkgname).swift")
+        let testsFile = Path.join(testModule, "\(pkgname)Tests.swift")
+        print("Creating Tests/\(pkgname)/\(pkgname)Tests.swift")
         let testsFileFP = try fopen(testsFile, mode: .Write)
         defer {
             fclose(testsFileFP)
         }
         try fputs("import XCTest\n", testsFileFP)
         try fputs("@testable import \(pkgname)\n\n", testsFileFP)
 
-        try fputs("class \(pkgname): XCTestCase {\n\n", testsFileFP)
+        try fputs("class \(pkgname)Tests: XCTestCase {\n\n", testsFileFP)
 
         try fputs("\tfunc testExample() {\n", testsFileFP)
         try fputs("\t\t// This is an example of a functional test case.\n", testsFileFP)
@@ -150,14 +150,12 @@ final class InitPackage {
 
         try fputs("}\n", testsFileFP)
 
-        try fputs("\n#if os(Linux)\n", testsFileFP)
-        try fputs("extension \(pkgname): XCTestCaseProvider {\n", testsFileFP)
-        try fputs("\tvar allTests : [(String, () throws -> Void)] {\n", testsFileFP)
+        try fputs("extension \(pkgname)Tests {\n", testsFileFP)
+        try fputs("\tstatic var allTests : [(String, \(pkgname)Tests -> () throws -> Void)] {\n", testsFileFP)
         try fputs("\t\treturn [\n", testsFileFP)
         try fputs("\t\t\t(\"testExample\", testExample),\n", testsFileFP)
         try fputs("\t\t]\n", testsFileFP)
         try fputs("\t}\n", testsFileFP)
         try fputs("}\n", testsFileFP)
-        try fputs("#endif\n", testsFileFP)
     }
 }