diff --git a/Tests/SourceKittenFrameworkTests/Fixtures/LinuxSwiftModuleGroups@swift-3.1.json b/Tests/SourceKittenFrameworkTests/Fixtures/LinuxSwiftModuleGroups@swift-3.1.json deleted file mode 100644 index 1f0ea2e5e..000000000 --- a/Tests/SourceKittenFrameworkTests/Fixtures/LinuxSwiftModuleGroups@swift-3.1.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "key.modulegroups" : [ - { - "key.groupname" : "Assert" - }, - { - "key.groupname" : "Bool" - }, - { - "key.groupname" : "C" - }, - { - "key.groupname" : "Collection" - }, - { - "key.groupname" : "Collection/Array" - }, - { - "key.groupname" : "Collection/HashedCollections" - }, - { - "key.groupname" : "Collection/Lazy Views" - }, - { - "key.groupname" : "Collection/Type-erased" - }, - { - "key.groupname" : "Math" - }, - { - "key.groupname" : "Math/Floating" - }, - { - "key.groupname" : "Math/Integers" - }, - { - "key.groupname" : "Misc" - }, - { - "key.groupname" : "Optional" - }, - { - "key.groupname" : "Pointer" - }, - { - "key.groupname" : "Protocols" - }, - { - "key.groupname" : "Reflection" - }, - { - "key.groupname" : "String" - } - ] -} \ No newline at end of file diff --git a/Tests/SourceKittenFrameworkTests/Fixtures/SwiftModuleGroups@swift-3.1.json b/Tests/SourceKittenFrameworkTests/Fixtures/SwiftModuleGroups@swift-3.1.json deleted file mode 100644 index f9e8e53c1..000000000 --- a/Tests/SourceKittenFrameworkTests/Fixtures/SwiftModuleGroups@swift-3.1.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "key.modulegroups" : [ - { - "key.groupname" : "Assert" - }, - { - "key.groupname" : "Bool" - }, - { - "key.groupname" : "C" - }, - { - "key.groupname" : "Collection" - }, - { - "key.groupname" : "Collection\/Array" - }, - { - "key.groupname" : "Collection\/HashedCollections" - }, - { - "key.groupname" : "Collection\/Lazy Views" - }, - { - "key.groupname" : "Collection\/Type-erased" - }, - { - "key.groupname" : "Math" - }, - { - "key.groupname" : "Math\/Floating" - }, - { - "key.groupname" : "Math\/Integers" - }, - { - "key.groupname" : "Misc" - }, - { - "key.groupname" : "Optional" - }, - { - "key.groupname" : "Pointer" - }, - { - "key.groupname" : "Protocols" - }, - { - "key.groupname" : "Reflection" - }, - { - "key.groupname" : "String" - } - ] -} diff --git a/Tests/SourceKittenFrameworkTests/RequestTests.swift b/Tests/SourceKittenFrameworkTests/RequestTests.swift index cc47c2c11..2f1b2e3e7 100644 --- a/Tests/SourceKittenFrameworkTests/RequestTests.swift +++ b/Tests/SourceKittenFrameworkTests/RequestTests.swift @@ -11,11 +11,6 @@ import SourceKittenFramework import XCTest class RequestTests: XCTestCase { - func testProtocolVersion() { - let version = Request.protocolVersion().send() - compareJSONString(withFixtureNamed: "ProtocolVersion", jsonString: toJSON(toNSDictionary(version))) - } - func testSwiftModuleGroups() { let groups = Request.moduleGroups(module: "Swift", arguments: ["-sdk", sdkPath()]).send() compareJSONString(withFixtureNamed: "SwiftModuleGroups", jsonString: toJSON(toNSDictionary(groups))) @@ -29,7 +24,6 @@ class RequestTests: XCTestCase { "_T021SourceKittenFramework7RequestOD", "_T0s10DictionaryVySS9Structure22SourceKitRepresentable_pGD" ] -#if swift(>=3.2) let expectedResult: NSDictionary = [ "key.results": [ ["key.name": "Swift.String"], @@ -39,17 +33,7 @@ class RequestTests: XCTestCase { ["key.name": "Swift.Dictionary"] ] ] -#else - let expectedResult: NSDictionary = [ - "key.results": [ - ["key.name": "Swift.String"], - ["key.name": "__C.NSRange with unmangled suffix \"mD\""], - ["key.name": "__ObjC.Process"], - ["key.name": "SourceKittenFramework.Request"], - ["key.name": "Swift.Dictionary"] - ] - ] -#endif + let result = Request.demangle(names: mangledNames).send() XCTAssertEqual(toNSDictionary(result), expectedResult, "should demange names.") } @@ -58,7 +42,7 @@ class RequestTests: XCTestCase { let result = Request.editorOpenInterface( name: UUID().uuidString, moduleName: "Swift", - group: .name("Assert"), // Choose a relative small group. + group: .name("Assert"), // Choose a relatively small group. synthesizedExtension: true, arguments: ["-sdk", sdkPath()] ).send() @@ -69,7 +53,6 @@ class RequestTests: XCTestCase { extension RequestTests { static var allTests: [(String, (RequestTests) -> () throws -> Void)] { return [ - ("testProtocolVersion", testProtocolVersion), ("testSwiftModuleGroups", testSwiftModuleGroups), ("testEditorOpenInterface", testEditorOpenInterface) ]