Refactor tests and add more SwiftPackageUpdateTests

Nef10 · May 30, 2021 · 0bcdc21 · 0bcdc21
1 parent e956165
commit 0bcdc21
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 37 deletions.
diff --git a/Sources/SwiftDependencyUpdaterLibrary/SwiftPackageUpdate.swift b/Sources/SwiftDependencyUpdaterLibrary/SwiftPackageUpdate.swift
@@ -36,7 +36,7 @@ struct SwiftPackageUpdate {
             return output
         } catch {
             let error = error as! ShellOutError // swiftlint:disable:this force_cast
-            throw PackageDescriptionError.loadingFailed(error.message)
+            throw SwiftPackageUpdateError.loadingFailed(error.message)
         }
     }
 

diff --git a/Tests/SwiftDependencyUpdaterLibraryTests/Extensions/XCTestCase.swift b/Tests/SwiftDependencyUpdaterLibraryTests/Extensions/XCTestCase.swift
@@ -47,6 +47,18 @@ extension XCTestCase {
         return folder
     }
 
+    func createEmptySwiftPackage() -> URL {
+        let folder = emptyFolderURL()
+        let packageSwift = temporaryFileURL(in: folder, name: "Package.swift")
+        createFile(at: packageSwift, content: TestUtils.emptyPackageSwiftFileContent)
+        let packageResolved = temporaryFileURL(in: folder, name: "Package.resolved")
+        createFile(at: packageResolved, content: TestUtils.emptyPackageResolvedFileContent)
+        let sourceFile = temporaryFileURL(in: folder.appendingPathComponent("Sources/Name"), name: "Name.swift")
+        createFile(at: sourceFile, content: "")
+
+        return folder
+    }
+
     func assert<T, E: Error & Equatable>(_ expression: @autoclosure () throws -> T, throws expectedError: E, in file: StaticString = #file, line: UInt = #line) {
         var caughtError: Error?
 

diff --git a/Tests/SwiftDependencyUpdaterLibraryTests/SubCommands/GitHubCommandTests.swift b/Tests/SwiftDependencyUpdaterLibraryTests/SubCommands/GitHubCommandTests.swift
@@ -266,16 +266,4 @@ class GitHubCommandTests: XCTestCase {
             enforceOrder: true)
     }
 
-    func createEmptySwiftPackage() -> URL {
-        let folder = emptyFolderURL()
-        let packageSwift = temporaryFileURL(in: folder, name: "Package.swift")
-        createFile(at: packageSwift, content: TestUtils.emptyPackageSwiftFileContent)
-        let packageResolved = temporaryFileURL(in: folder, name: "Package.resolved")
-        createFile(at: packageResolved, content: TestUtils.emptyPackageResolvedFileContent)
-        let sourceFile = temporaryFileURL(in: folder.appendingPathComponent("Sources/Name"), name: "Name.swift")
-        createFile(at: sourceFile, content: "")
-
-        return folder
-    }
-
 }
diff --git a/Tests/SwiftDependencyUpdaterLibraryTests/SubCommands/ListCommandTests.swift b/Tests/SwiftDependencyUpdaterLibraryTests/SubCommands/ListCommandTests.swift
@@ -55,16 +55,4 @@ class ListCommandTests: XCTestCase {
         XCTAssertEqual(result.output, "No dependencies found.")
     }
 
-    func createEmptySwiftPackage() -> URL {
-        let folder = emptyFolderURL()
-        let packageSwift = temporaryFileURL(in: folder, name: "Package.swift")
-        createFile(at: packageSwift, content: TestUtils.emptyPackageSwiftFileContent)
-        let packageResolved = temporaryFileURL(in: folder, name: "Package.resolved")
-        createFile(at: packageResolved, content: TestUtils.emptyPackageResolvedFileContent)
-        let sourceFile = temporaryFileURL(in: folder.appendingPathComponent("Sources/Name"), name: "Name.swift")
-        createFile(at: sourceFile, content: "")
-
-        return folder
-    }
-
 }
diff --git a/Tests/SwiftDependencyUpdaterLibraryTests/SubCommands/UpdateCommandTests.swift b/Tests/SwiftDependencyUpdaterLibraryTests/SubCommands/UpdateCommandTests.swift
@@ -55,16 +55,4 @@ class UpdateCommandTests: XCTestCase {
         XCTAssertEqual(result.output, "Everything is already up-to-date!")
     }
 
-    func createEmptySwiftPackage() -> URL {
-        let folder = emptyFolderURL()
-        let packageSwift = temporaryFileURL(in: folder, name: "Package.swift")
-        createFile(at: packageSwift, content: TestUtils.emptyPackageSwiftFileContent)
-        let packageResolved = temporaryFileURL(in: folder, name: "Package.resolved")
-        createFile(at: packageResolved, content: TestUtils.emptyPackageResolvedFileContent)
-        let sourceFile = temporaryFileURL(in: folder.appendingPathComponent("Sources/Name"), name: "Name.swift")
-        createFile(at: sourceFile, content: "")
-
-        return folder
-    }
-
 }
diff --git a/Tests/SwiftDependencyUpdaterLibraryTests/SwiftPackageUpdateTests.swift b/Tests/SwiftDependencyUpdaterLibraryTests/SwiftPackageUpdateTests.swift
@@ -28,4 +28,17 @@ class SwiftPackageUpdateTests: XCTestCase {
         Rainbow.enabled = originalValue
     }
 
+    func testCheckUpdatesEmptyFolder() {
+        let folder = emptyFolderURL()
+        assert(
+            try SwiftPackageUpdate.checkUpdates(in: folder),
+            throws: SwiftPackageUpdateError.loadingFailed("error: root manifest not found")
+        )
+    }
+
+    func testCheckUpdatesEmptySwiftPackage() {
+        let folder = createEmptySwiftPackage()
+        XCTAssert(try! SwiftPackageUpdate.checkUpdates(in: folder).isEmpty)
+    }
+
 }