From d9f3ea15495725f0bbde861af8990bad60524394 Mon Sep 17 00:00:00 2001 From: kitasuke Date: Wed, 24 Jul 2019 11:57:59 +0900 Subject: [PATCH 1/3] Rename test files with consistent suffix --- ...ition.swift => AbsolutePositionTests.swift} | 18 +++++++++--------- ...gnosticTest.swift => DiagnosticTests.swift} | 2 +- .../IncrementalParsingTests.swift | 2 +- .../SwiftSyntaxTest/MultithreadingTests.swift | 2 +- .../{ParseFile.swift => ParseFileTests.swift} | 2 +- ...hildren.swift => SyntaxChildrenTests.swift} | 2 +- ...ions.swift => SyntaxCollectionsTests.swift} | 2 +- ...xFactory.swift => SyntaxFactoryTests.swift} | 2 +- Tests/SwiftSyntaxTest/SyntaxTests.swift | 2 +- ...sts.swift => SyntaxTreeModifierTests.swift} | 0 ...itorTest.swift => SyntaxVisitorTests.swift} | 2 +- Tests/SwiftSyntaxTest/TokenTest.swift | 2 +- Tests/SwiftSyntaxTest/TriviaTests.swift | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) rename Tests/SwiftSyntaxTest/{AbsolutePosition.swift => AbsolutePositionTests.swift} (92%) rename Tests/SwiftSyntaxTest/{DiagnosticTest.swift => DiagnosticTests.swift} (98%) rename Tests/SwiftSyntaxTest/{ParseFile.swift => ParseFileTests.swift} (96%) rename Tests/SwiftSyntaxTest/{SyntaxChildren.swift => SyntaxChildrenTests.swift} (95%) rename Tests/SwiftSyntaxTest/{SyntaxCollections.swift => SyntaxCollectionsTests.swift} (98%) rename Tests/SwiftSyntaxTest/{SyntaxFactory.swift => SyntaxFactoryTests.swift} (99%) rename Tests/SwiftSyntaxTest/{ModifierTests.swift => SyntaxTreeModifierTests.swift} (100%) rename Tests/SwiftSyntaxTest/{VisitorTest.swift => SyntaxVisitorTests.swift} (98%) diff --git a/Tests/SwiftSyntaxTest/AbsolutePosition.swift b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift similarity index 92% rename from Tests/SwiftSyntaxTest/AbsolutePosition.swift rename to Tests/SwiftSyntaxTest/AbsolutePositionTests.swift index 631f2f3f5c5..fa5ea6e8218 100644 --- a/Tests/SwiftSyntaxTest/AbsolutePosition.swift +++ b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift @@ -10,7 +10,7 @@ fileprivate class FuncRenamer: SyntaxRewriter { } } -public class AbsolutePositionTestCase: XCTestCase { +public class AbsolutePositionTests: XCTestCase { public static let allTests = [ ("testVisitor", testVisitor), @@ -114,8 +114,8 @@ public class AbsolutePositionTestCase: XCTestCase { $0.useItem(Syntax(ReturnStmtSyntax { $0.useReturnKeyword( SyntaxFactory.makeReturnKeyword( - leadingTrivia: AbsolutePositionTestCase.leadingTrivia, - trailingTrivia: AbsolutePositionTestCase.trailingTrivia)) + leadingTrivia: AbsolutePositionTests.leadingTrivia, + trailingTrivia: AbsolutePositionTests.trailingTrivia)) }) )}, count: count) return SyntaxFactory.makeSourceFile( @@ -138,12 +138,12 @@ public class AbsolutePositionTestCase: XCTestCase { // Test Node trivia setters and getters - XCTAssertEqual(AbsolutePositionTestCase.leadingTrivia, root.leadingTrivia) + XCTAssertEqual(AbsolutePositionTests.leadingTrivia, root.leadingTrivia) XCTAssertEqual([], root.trailingTrivia) var modifiedRoot1 = root.withLeadingTrivia([.spaces(6), .tabs(1)]) XCTAssertEqual([.spaces(6), .tabs(1)], modifiedRoot1.leadingTrivia) - XCTAssertEqual(AbsolutePositionTestCase.leadingTrivia, root.leadingTrivia) + XCTAssertEqual(AbsolutePositionTests.leadingTrivia, root.leadingTrivia) modifiedRoot1.leadingTrivia = [.blockComment("/* this is a comment */")] XCTAssertEqual([.blockComment("/* this is a comment */")], modifiedRoot1.leadingTrivia) @@ -155,18 +155,18 @@ public class AbsolutePositionTestCase: XCTestCase { // Test Collection trivia setters and getters - XCTAssertEqual(AbsolutePositionTestCase.leadingTrivia, root.statements.leadingTrivia) - XCTAssertEqual(AbsolutePositionTestCase.trailingTrivia, root.statements.trailingTrivia) + XCTAssertEqual(AbsolutePositionTests.leadingTrivia, root.statements.leadingTrivia) + XCTAssertEqual(AbsolutePositionTests.trailingTrivia, root.statements.trailingTrivia) var modifiedStatements1 = root.withLeadingTrivia([.carriageReturnLineFeeds(3)]) XCTAssertEqual([.carriageReturnLineFeeds(3)], modifiedStatements1.leadingTrivia) - XCTAssertEqual(AbsolutePositionTestCase.leadingTrivia, root.statements.leadingTrivia) + XCTAssertEqual(AbsolutePositionTests.leadingTrivia, root.statements.leadingTrivia) modifiedStatements1.leadingTrivia = [.garbageText("GARBAGE")] XCTAssertEqual([.garbageText("GARBAGE")], modifiedStatements1.leadingTrivia) var modifiedStatements2 = root.withTrailingTrivia([.formfeeds(1), .carriageReturns(3)]) XCTAssertEqual([.formfeeds(1), .carriageReturns(3)], modifiedStatements2.trailingTrivia) - XCTAssertEqual(AbsolutePositionTestCase.trailingTrivia, root.statements.trailingTrivia) + XCTAssertEqual(AbsolutePositionTests.trailingTrivia, root.statements.trailingTrivia) modifiedStatements2.trailingTrivia = [.verticalTabs(4)] XCTAssertEqual([.verticalTabs(4)], modifiedStatements2.trailingTrivia) } diff --git a/Tests/SwiftSyntaxTest/DiagnosticTest.swift b/Tests/SwiftSyntaxTest/DiagnosticTests.swift similarity index 98% rename from Tests/SwiftSyntaxTest/DiagnosticTest.swift rename to Tests/SwiftSyntaxTest/DiagnosticTests.swift index 8f82a3dc011..947b06e0f51 100644 --- a/Tests/SwiftSyntaxTest/DiagnosticTest.swift +++ b/Tests/SwiftSyntaxTest/DiagnosticTests.swift @@ -27,7 +27,7 @@ fileprivate extension Diagnostic.Message { } } -public class DiagnosticTestCase: XCTestCase { +public class DiagnosticTests: XCTestCase { public static let allTests = [ ("testDiagnosticEmission", testDiagnosticEmission), diff --git a/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift b/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift index 946f57f8ec7..ec28be7dd77 100644 --- a/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift +++ b/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class IncrementalParsingTestCase: XCTestCase { +public class IncrementalParsingTests: XCTestCase { public static let allTests = [ ("testIncrementalInvalid", testIncrementalInvalid), diff --git a/Tests/SwiftSyntaxTest/MultithreadingTests.swift b/Tests/SwiftSyntaxTest/MultithreadingTests.swift index c3977a30f51..99dace761da 100644 --- a/Tests/SwiftSyntaxTest/MultithreadingTests.swift +++ b/Tests/SwiftSyntaxTest/MultithreadingTests.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class MultithreadingTestCase: XCTestCase { +public class MultithreadingTests: XCTestCase { public static let allTests = [ ("testPathological", testPathological), diff --git a/Tests/SwiftSyntaxTest/ParseFile.swift b/Tests/SwiftSyntaxTest/ParseFileTests.swift similarity index 96% rename from Tests/SwiftSyntaxTest/ParseFile.swift rename to Tests/SwiftSyntaxTest/ParseFileTests.swift index b138d9e8145..22841924a83 100644 --- a/Tests/SwiftSyntaxTest/ParseFile.swift +++ b/Tests/SwiftSyntaxTest/ParseFileTests.swift @@ -23,7 +23,7 @@ enum Animal { case dog } -public class ParseFileTestCase: XCTestCase { +public class ParseFileTests: XCTestCase { public static let allTests = [ ("testParseSingleFile", testParseSingleFile), diff --git a/Tests/SwiftSyntaxTest/SyntaxChildren.swift b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift similarity index 95% rename from Tests/SwiftSyntaxTest/SyntaxChildren.swift rename to Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift index 9a2aea6c63b..44650890ca1 100644 --- a/Tests/SwiftSyntaxTest/SyntaxChildren.swift +++ b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class SyntaxChildrenAPITestCase: XCTestCase { +public class SyntaxChildrenTests: XCTestCase { public static let allTests = [ ("testIterateWithAllPresent", testIterateWithAllPresent), diff --git a/Tests/SwiftSyntaxTest/SyntaxCollections.swift b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift similarity index 98% rename from Tests/SwiftSyntaxTest/SyntaxCollections.swift rename to Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift index ae7c0acce32..f8a266e6d93 100644 --- a/Tests/SwiftSyntaxTest/SyntaxCollections.swift +++ b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift @@ -8,7 +8,7 @@ fileprivate func integerLiteralElement(_ int: Int) -> ArrayElementSyntax { trailingComma: nil) } -public class SyntaxCollectionsAPITestCase: XCTestCase { +public class SyntaxCollectionsTests: XCTestCase { public static let allTests = [ ("testAppendingElement", testAppendingElement), diff --git a/Tests/SwiftSyntaxTest/SyntaxFactory.swift b/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift similarity index 99% rename from Tests/SwiftSyntaxTest/SyntaxFactory.swift rename to Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift index 67f4d160395..1eedb8f9b85 100644 --- a/Tests/SwiftSyntaxTest/SyntaxFactory.swift +++ b/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift @@ -16,7 +16,7 @@ fileprivate func cannedStructDecl() -> StructDeclSyntax { } } -public class SyntaxFactoryAPITestCase: XCTestCase { +public class SyntaxFactoryTests: XCTestCase { public static let allTests = [ ("testGenerated", testGenerated), diff --git a/Tests/SwiftSyntaxTest/SyntaxTests.swift b/Tests/SwiftSyntaxTest/SyntaxTests.swift index e19ac44485f..140ca372ce9 100644 --- a/Tests/SwiftSyntaxTest/SyntaxTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxTests.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class SyntaxAPITestCase: XCTestCase { +public class SyntaxTests: XCTestCase { public static let allTests = [ ("testSyntaxAPI", testSyntaxAPI), diff --git a/Tests/SwiftSyntaxTest/ModifierTests.swift b/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift similarity index 100% rename from Tests/SwiftSyntaxTest/ModifierTests.swift rename to Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift diff --git a/Tests/SwiftSyntaxTest/VisitorTest.swift b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift similarity index 98% rename from Tests/SwiftSyntaxTest/VisitorTest.swift rename to Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift index 24b2879dca8..a6b7f1b8ba6 100644 --- a/Tests/SwiftSyntaxTest/VisitorTest.swift +++ b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class SyntaxVisitorTestCase: XCTestCase { +public class SyntaxVisitorTests: XCTestCase { public static let allTests = [ ("testBasic", testBasic), diff --git a/Tests/SwiftSyntaxTest/TokenTest.swift b/Tests/SwiftSyntaxTest/TokenTest.swift index b6d7e659b48..bf82bfedaba 100644 --- a/Tests/SwiftSyntaxTest/TokenTest.swift +++ b/Tests/SwiftSyntaxTest/TokenTest.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class TokenSyntaxTestCase: XCTestCase { +public class TokenTests: XCTestCase { public static let allTests = [ ("testKeywordKinds", testKeywordKinds), diff --git a/Tests/SwiftSyntaxTest/TriviaTests.swift b/Tests/SwiftSyntaxTest/TriviaTests.swift index 9da15b62e78..3c037b688bf 100644 --- a/Tests/SwiftSyntaxTest/TriviaTests.swift +++ b/Tests/SwiftSyntaxTest/TriviaTests.swift @@ -1,7 +1,7 @@ import XCTest import SwiftSyntax -public class TriviaTestCase: XCTestCase { +public class TriviaTests: XCTestCase { public static let allTests = [ ("testTriviaEquatable", testTriviaEquatable), From bbd78f90351222850dca6fc26534f1bfd4689833 Mon Sep 17 00:00:00 2001 From: Alex Hoppen Date: Mon, 4 Nov 2019 15:09:24 -0800 Subject: [PATCH 2/3] Give more information if gyb or lit cannot be found --- build-script.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-script.py b/build-script.py index cd70535dabb..55a5f028a22 100755 --- a/build-script.py +++ b/build-script.py @@ -79,11 +79,12 @@ def check_gyb_exec(): if not os.path.exists(GYB_EXEC): fatal_error(''' Error: Could not find gyb. +Looking at '%s'. Make sure you have the main swift repo checked out next to the swift-syntax repository. Refer to README.md for more information. -''') +''' % GYB_EXEC) def check_rsync(): @@ -246,10 +247,11 @@ def check_lit_exec(): if not os.path.exists(LIT_EXEC): fatal_error(''' Error: Could not find lit.py. +Looking at '%s'. Make sure you have the llvm repo checked out next to the swift-syntax repo. Refer to README.md for more information. -''') +''' % LIT_EXEC) def check_incr_transfer_roundtrip_exec(): From 3e09eea111eae2f26d751722ecdc6e26a56502ec Mon Sep 17 00:00:00 2001 From: Alex Hoppen Date: Wed, 6 Nov 2019 15:36:32 -0800 Subject: [PATCH 3/3] Test SwiftSyntax using --enable-test-discovery We can thus remove the allTests properties and LinuxMain.swift --- Tests/LinuxMain.swift | 23 ------------------- .../AbsolutePositionTests.swift | 12 ---------- .../SwiftSyntaxTest/ClassificationTests.swift | 4 ---- .../CustomReflecatbleTests.swift | 4 ---- Tests/SwiftSyntaxTest/DiagnosticTests.swift | 5 ---- .../IncrementalParsingTests.swift | 5 ---- .../SwiftSyntaxTest/MultithreadingTests.swift | 5 ---- Tests/SwiftSyntaxTest/ParseFileTests.swift | 5 ---- .../SwiftSyntaxTest/SyntaxChildrenTests.swift | 6 ----- .../SyntaxCollectionsTests.swift | 11 --------- .../SwiftSyntaxTest/SyntaxFactoryTests.swift | 10 -------- Tests/SwiftSyntaxTest/SyntaxTests.swift | 5 ---- .../SyntaxTreeModifierTests.swift | 4 ---- .../SwiftSyntaxTest/SyntaxVisitorTests.swift | 8 ------- Tests/SwiftSyntaxTest/TokenTest.swift | 4 ---- Tests/SwiftSyntaxTest/TriviaTests.swift | 5 ---- build-script.py | 2 ++ 17 files changed, 2 insertions(+), 116 deletions(-) delete mode 100644 Tests/LinuxMain.swift diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift deleted file mode 100644 index 86ffff82fe0..00000000000 --- a/Tests/LinuxMain.swift +++ /dev/null @@ -1,23 +0,0 @@ -import XCTest -import SwiftSyntaxTest - -XCTMain({ () -> [XCTestCaseEntry] in - var testCases: [XCTestCaseEntry] = [ - testCase(AbsolutePositionTestCase.allTests), - testCase(ClassificationTests.allTests), - testCase(DiagnosticTestCase.allTests), - testCase(IncrementalParsingTestCase.allTests), - testCase(MultithreadingTestCase.allTests), - testCase(ParseFileTestCase.allTests), - testCase(SyntaxChildrenAPITestCase.allTests), - testCase(SyntaxCollectionsAPITestCase.allTests), - testCase(SyntaxFactoryAPITestCase.allTests), - testCase(SyntaxAPITestCase.allTests), - testCase(SyntaxVisitorTestCase.allTests), - testCase(TokenSyntaxTestCase.allTests), - testCase(SyntaxTreeModifierTests.allTests), - testCase(TriviaTests.allTests), - testCase(CustomReflectableTests.allTests), - ] - return testCases -}()) diff --git a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift index fa5ea6e8218..64d46d0f4f4 100644 --- a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift +++ b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift @@ -12,18 +12,6 @@ fileprivate class FuncRenamer: SyntaxRewriter { public class AbsolutePositionTests: XCTestCase { - public static let allTests = [ - ("testVisitor", testVisitor), - ("testClosure", testClosure), - ("testRename", testRename), - ("testCurrentFile", testCurrentFile), - ("testRecursion", testRecursion), - ("testTrivias", testTrivias), - ("testImplicit", testImplicit), - ("testWithoutSourceFileRoot", testWithoutSourceFileRoot), - ("testSourceLocation", testSourceLocation), - ] - public func testVisitor() { XCTAssertNoThrow(try { let source = try String(contentsOf: getInput("visitor.swift")) diff --git a/Tests/SwiftSyntaxTest/ClassificationTests.swift b/Tests/SwiftSyntaxTest/ClassificationTests.swift index bc4f17e8e84..0a5dc857ed3 100644 --- a/Tests/SwiftSyntaxTest/ClassificationTests.swift +++ b/Tests/SwiftSyntaxTest/ClassificationTests.swift @@ -2,10 +2,6 @@ import XCTest import SwiftSyntax public class ClassificationTests: XCTestCase { - public static let allTests = [ - ("testClassification", testClassification), - ("testTokenClassification", testTokenClassification), - ] public func testClassification() { let source = "// blah.\nlet x/*yo*/ = 0" diff --git a/Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift b/Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift index 2fcc0e2c482..c32880cea0b 100644 --- a/Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift +++ b/Tests/SwiftSyntaxTest/CustomReflecatbleTests.swift @@ -3,10 +3,6 @@ import SwiftSyntax public class CustomReflectableTests: XCTestCase { - public static let allTests = [ - ("testDump", testDump), - ] - public func testDump() { struct TestCase { diff --git a/Tests/SwiftSyntaxTest/DiagnosticTests.swift b/Tests/SwiftSyntaxTest/DiagnosticTests.swift index 947b06e0f51..c352907d2fa 100644 --- a/Tests/SwiftSyntaxTest/DiagnosticTests.swift +++ b/Tests/SwiftSyntaxTest/DiagnosticTests.swift @@ -29,11 +29,6 @@ fileprivate extension Diagnostic.Message { public class DiagnosticTests: XCTestCase { - public static let allTests = [ - ("testDiagnosticEmission", testDiagnosticEmission), - ("testSourceLocations", testSourceLocations), - ] - public func testDiagnosticEmission() { let startLoc = loc() let fixLoc = loc() diff --git a/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift b/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift index ec28be7dd77..3210df9c54b 100644 --- a/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift +++ b/Tests/SwiftSyntaxTest/IncrementalParsingTests.swift @@ -3,11 +3,6 @@ import SwiftSyntax public class IncrementalParsingTests: XCTestCase { - public static let allTests = [ - ("testIncrementalInvalid", testIncrementalInvalid), - ("testReusedNode", testReusedNode), - ] - public func testIncrementalInvalid() { let original = "struct A { func f() {" let step: (String, (Int, Int, String)) = diff --git a/Tests/SwiftSyntaxTest/MultithreadingTests.swift b/Tests/SwiftSyntaxTest/MultithreadingTests.swift index 99dace761da..b3b753e8ed9 100644 --- a/Tests/SwiftSyntaxTest/MultithreadingTests.swift +++ b/Tests/SwiftSyntaxTest/MultithreadingTests.swift @@ -3,11 +3,6 @@ import SwiftSyntax public class MultithreadingTests: XCTestCase { - public static let allTests = [ - ("testPathological", testPathological), - ("testTwoAccesses", testTwoAccesses), - ] - public func testPathological() { let tuple = SyntaxFactory.makeVoidTupleType() diff --git a/Tests/SwiftSyntaxTest/ParseFileTests.swift b/Tests/SwiftSyntaxTest/ParseFileTests.swift index 22841924a83..736a69225f5 100644 --- a/Tests/SwiftSyntaxTest/ParseFileTests.swift +++ b/Tests/SwiftSyntaxTest/ParseFileTests.swift @@ -25,11 +25,6 @@ enum Animal { public class ParseFileTests: XCTestCase { - public static let allTests = [ - ("testParseSingleFile", testParseSingleFile), - ("testEnumCaseStructure", testEnumCaseStructure) - ] - public func testParseSingleFile() { let currentFile = URL(fileURLWithPath: #file) XCTAssertNoThrow(try { diff --git a/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift index 44650890ca1..ca1797f8a3e 100644 --- a/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift @@ -3,12 +3,6 @@ import SwiftSyntax public class SyntaxChildrenTests: XCTestCase { - public static let allTests = [ - ("testIterateWithAllPresent", testIterateWithAllPresent), - ("testIterateWithSomeMissing", testIterateWithSomeMissing), - ("testIterateWithAllMissing", testIterateWithAllMissing), - ] - public func testIterateWithAllPresent() { let returnStmt = SyntaxFactory.makeReturnStmt( returnKeyword: SyntaxFactory.makeReturnKeyword(), diff --git a/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift index f8a266e6d93..b78d405c242 100644 --- a/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift @@ -10,17 +10,6 @@ fileprivate func integerLiteralElement(_ int: Int) -> ArrayElementSyntax { public class SyntaxCollectionsTests: XCTestCase { - public static let allTests = [ - ("testAppendingElement", testAppendingElement), - ("testInsertingElement", testInsertingElement), - ("testPrependingElement", testPrependingElement), - ("testRemovingFirstElement", testRemovingFirstElement), - ("testRemovingLastElement", testRemovingLastElement), - ("testRemovingElement", testRemovingElement), - ("testReplacingElement", testReplacingElement), - ("testIteration", testIteration), - ] - public func testAppendingElement() { let arrayElementList = SyntaxFactory.makeArrayElementList([ integerLiteralElement(0) diff --git a/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift b/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift index 1eedb8f9b85..202006b39df 100644 --- a/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift @@ -18,16 +18,6 @@ fileprivate func cannedStructDecl() -> StructDeclSyntax { public class SyntaxFactoryTests: XCTestCase { - public static let allTests = [ - ("testGenerated", testGenerated), - ("testTokenSyntax", testTokenSyntax), - ("testFunctionCallSyntaxBuilder", testFunctionCallSyntaxBuilder), - ("testWithOptionalChild", testWithOptionalChild), - ("testUnknownSyntax", testUnknownSyntax), - ("testMakeStringLiteralExpr", testMakeStringLiteralExpr), - ("testMakeBinaryOperator", testMakeBinaryOperator), - ] - public func testGenerated() { let structDecl = cannedStructDecl() diff --git a/Tests/SwiftSyntaxTest/SyntaxTests.swift b/Tests/SwiftSyntaxTest/SyntaxTests.swift index 140ca372ce9..2d3d84229b0 100644 --- a/Tests/SwiftSyntaxTest/SyntaxTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxTests.swift @@ -3,11 +3,6 @@ import SwiftSyntax public class SyntaxTests: XCTestCase { - public static let allTests = [ - ("testSyntaxAPI", testSyntaxAPI), - ("testPositions", testPositions), - ] - public func testSyntaxAPI() { let source = "struct A { func f() {} }" let tree = try! SyntaxParser.parse(source: source) diff --git a/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift b/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift index ae36c88bf9a..2657349fc90 100644 --- a/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift @@ -20,10 +20,6 @@ fileprivate func cannedVarDecl() -> VariableDeclSyntax { public class SyntaxTreeModifierTests: XCTestCase { - public static let allTests = [ - ("testAccessorAsModifier", testAccessorAsModifier) - ] - public func testAccessorAsModifier() { var VD = cannedVarDecl() XCTAssertEqual("\(VD)", "let a: Int") diff --git a/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift index a6b7f1b8ba6..0d4f58595cd 100644 --- a/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift @@ -3,14 +3,6 @@ import SwiftSyntax public class SyntaxVisitorTests: XCTestCase { - public static let allTests = [ - ("testBasic", testBasic), - ("testRewritingNodeWithEmptyChild", testRewritingNodeWithEmptyChild), - ("testSyntaxRewriterVisitAny", testSyntaxRewriterVisitAny), - ("testSyntaxRewriterVisitCollection", testSyntaxRewriterVisitCollection), - ("testVisitorClass", testVisitorClass), - ] - public func testBasic() { class FuncCounter: SyntaxVisitor { var funcCount = 0 diff --git a/Tests/SwiftSyntaxTest/TokenTest.swift b/Tests/SwiftSyntaxTest/TokenTest.swift index bf82bfedaba..c22e8a5be9e 100644 --- a/Tests/SwiftSyntaxTest/TokenTest.swift +++ b/Tests/SwiftSyntaxTest/TokenTest.swift @@ -3,10 +3,6 @@ import SwiftSyntax public class TokenTests: XCTestCase { - public static let allTests = [ - ("testKeywordKinds", testKeywordKinds), - ] - public func testKeywordKinds() { XCTAssertTrue(TokenKind.operatorKeyword.isKeyword) XCTAssertTrue(TokenKind.funcKeyword.isKeyword) diff --git a/Tests/SwiftSyntaxTest/TriviaTests.swift b/Tests/SwiftSyntaxTest/TriviaTests.swift index 3c037b688bf..0468fac5d19 100644 --- a/Tests/SwiftSyntaxTest/TriviaTests.swift +++ b/Tests/SwiftSyntaxTest/TriviaTests.swift @@ -3,11 +3,6 @@ import SwiftSyntax public class TriviaTests: XCTestCase { - public static let allTests = [ - ("testTriviaEquatable", testTriviaEquatable), - ("testTriviaPieceEquatable", testTriviaPieceEquatable) - ] - func testTriviaEquatable() { XCTAssertEqual([.spaces(2), .tabs(1)] as Trivia, [.spaces(2), .tabs(1)]) XCTAssertNotEqual([.spaces(2), .tabs(1)] as Trivia, [.spaces(2), .tabs(2)]) diff --git a/build-script.py b/build-script.py index 55a5f028a22..3122029724d 100755 --- a/build-script.py +++ b/build-script.py @@ -165,6 +165,8 @@ def get_swiftpm_invocation(toolchain, action, build_dir, multiroot_data_file, swiftpm_call = [swift_exec, action] swiftpm_call.extend(['--package-path', PACKAGE_DIR]) + if platform.system() != 'Darwin': + swiftpm_call.extend(['--enable-test-discovery']) if release: swiftpm_call.extend(['--configuration', 'release']) if build_dir: