Merge pull request #14 from daltonclaybrook/feature/more-tests-and-cl…

…eanup Remove some unused code and update one test
daltonclaybrook · Aug 25, 2020 · d1b689d · d1b689d
2 parents 927165c + b5dc989
commit d1b689d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 36 deletions.
diff --git a/Sources/SettlerFramework/DataStructures/DefinitionError.swift b/Sources/SettlerFramework/DataStructures/DefinitionError.swift
@@ -57,13 +57,3 @@ extension DefinitionError {
         Located(value: self, file: file, offset: offset)
     }
 }
-
-struct AggregateError<E: Error>: Error {
-    let underlying: [E]
-}
-
-extension AggregateError: CustomStringConvertible where E: CustomStringConvertible {
-    var description: String {
-        underlying.map(\.description).joined(separator: "\n")
-    }
-}
diff --git a/Sources/SettlerFramework/Extensions/Dictionary+Additions.swift b/Sources/SettlerFramework/Extensions/Dictionary+Additions.swift
@@ -42,9 +42,4 @@ extension Dictionary where Key == String, Value == SourceKitRepresentable {
     var nameLength: Int64? {
         self[SwiftDocKey.nameLength.rawValue] as? Int64
     }
-
-    var accessibility: Accessibility? {
-        let accessibilityString = self[Accessibility.docKey] as? String
-        return accessibilityString.flatMap(Accessibility.init(rawValue:))
-    }
 }
diff --git a/Sources/SettlerFramework/Utility/Accessibility.swift b/Sources/SettlerFramework/Utility/Accessibility.swift
diff --git a/Tests/SettlerTests/XcodeErrorDescriptionTests.swift b/Tests/SettlerTests/XcodeErrorDescriptionTests.swift
@@ -26,20 +26,26 @@ final class XcodeErrorDescriptionTests: XCTestCase {
     }
 
     func testJoinedErrorStringsAreCorrect() {
-        let contents = "extension TestResolver {}"
-        let file1 = MockFile(path: "/path/one.swift", contents: contents)
-        let error1 = DefinitionError.cantFindDeclarationFile
-            .located(in: file1, offset: 0)
-        let file2 = MockFile(path: "/path/two.swift", contents: contents)
-        let error2 = DefinitionError
+        let errors: [DefinitionError] = [
+            .keyIsNotAnEnum,
+            .invalidTypeAlias,
+            .invalidFunction,
+            .unexpectedSyntaxElement,
+            .cantFindDeclarationFile,
+            .circularResolverDependency(keys: ["Key.Foo", "Key.Bar"]),
             .resolverFunctionCannotBeThrowingIfResultIsUsedLazily
-            .located(in: file2, offset: 0)
-        let result = [error1, error2].errorString
-        let expected = """
-        /path/one.swift:1:1: error: \(error1.value.description)
-        /path/two.swift:1:1: error: \(error2.value.description)
-        """
-        XCTAssertEqual(result, expected)
+        ]
+        let contents = "extension TestResolver {}"
+        let locatedErrors = errors.enumerated()
+            .map { (index, error) -> Located<DefinitionError> in
+                let file = MockFile(path: "/path/file\(index).swift", contents: contents)
+                return error.located(in: file, offset: 0)
+            }
+        let expectedErrorStrings = locatedErrors.map { located in
+            "\(located.filePath!):1:1: error: \(located.value.description)"
+        }
+        let expected = expectedErrorStrings.joined(separator: "\n")
+        XCTAssertEqual(locatedErrors.errorString, expected)
     }
 }