From f93105d2bf114b85e9a927fc78bd72ac7c739c20 Mon Sep 17 00:00:00 2001
From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com>
Date: Sun, 30 Aug 2020 17:18:19 -0700
Subject: [PATCH] Cleanup

---
 Mastodon/README.md                                       | 3 ---
 Mastodon/Sources/Mastodon/Entities/Status.swift          | 2 +-
 .../Mastodon/Networking/Mastodon API/APIClient.swift     | 2 +-
 .../Mastodon/Networking/Mastodon API/APIDecoder.swift    | 2 +-
 .../Mastodon/Networking/Mastodon API/APIEncoder.swift    | 2 +-
 Mastodon/Tests/LinuxMain.swift                           | 7 -------
 Mastodon/Tests/MastodonTests/MastodonTests.swift         | 5 -----
 Mastodon/Tests/MastodonTests/XCTestManifests.swift       | 9 ---------
 Tests/View Models/AddIdentityViewModelTests.swift        | 1 +
 9 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 Mastodon/README.md
 delete mode 100644 Mastodon/Tests/LinuxMain.swift
 delete mode 100644 Mastodon/Tests/MastodonTests/XCTestManifests.swift

diff --git a/Mastodon/README.md b/Mastodon/README.md
deleted file mode 100644
index cd977ae..0000000
--- a/Mastodon/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Mastodon
-
-A description of this package.
diff --git a/Mastodon/Sources/Mastodon/Entities/Status.swift b/Mastodon/Sources/Mastodon/Entities/Status.swift
index cbfbc42..35b7bc8 100644
--- a/Mastodon/Sources/Mastodon/Entities/Status.swift
+++ b/Mastodon/Sources/Mastodon/Entities/Status.swift
@@ -2,7 +2,7 @@
 
 import Foundation
 
-public class Status: Codable, Identifiable {
+public final class Status: Codable, Identifiable {
     public enum Visibility: String, Codable, Unknowable {
         case `public`
         case unlisted
diff --git a/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIClient.swift b/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIClient.swift
index 6e53704..68882b9 100644
--- a/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIClient.swift	
+++ b/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIClient.swift	
@@ -3,7 +3,7 @@
 import Foundation
 import Combine
 
-public class APIClient: HTTPClient {
+public final class APIClient: HTTPClient {
     public var instanceURL: URL?
     public var accessToken: String?
 
diff --git a/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIDecoder.swift b/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIDecoder.swift
index 3cf070f..61860f0 100644
--- a/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIDecoder.swift	
+++ b/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIDecoder.swift	
@@ -2,7 +2,7 @@
 
 import Foundation
 
-public class APIDecoder: JSONDecoder {
+public final class APIDecoder: JSONDecoder {
     public override init() {
         super.init()
 
diff --git a/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIEncoder.swift b/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIEncoder.swift
index 54b3198..c0c338f 100644
--- a/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIEncoder.swift	
+++ b/Mastodon/Sources/Mastodon/Networking/Mastodon API/APIEncoder.swift	
@@ -2,7 +2,7 @@
 
 import Foundation
 
-public class APIEncoder: JSONEncoder {
+public final class APIEncoder: JSONEncoder {
     public override init() {
         super.init()
 
diff --git a/Mastodon/Tests/LinuxMain.swift b/Mastodon/Tests/LinuxMain.swift
deleted file mode 100644
index cd710a3..0000000
--- a/Mastodon/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-import XCTest
-
-import MastodonTests
-
-var tests = [XCTestCaseEntry]()
-tests += MastodonTests.allTests()
-XCTMain(tests)
diff --git a/Mastodon/Tests/MastodonTests/MastodonTests.swift b/Mastodon/Tests/MastodonTests/MastodonTests.swift
index 714b3d2..1ed1f53 100644
--- a/Mastodon/Tests/MastodonTests/MastodonTests.swift
+++ b/Mastodon/Tests/MastodonTests/MastodonTests.swift
@@ -6,10 +6,5 @@ final class MastodonTests: XCTestCase {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
         // results.
-        XCTAssertEqual(Mastodon().text, "Hello, World!")
     }
-
-    static var allTests = [
-        ("testExample", testExample)
-    ]
 }
diff --git a/Mastodon/Tests/MastodonTests/XCTestManifests.swift b/Mastodon/Tests/MastodonTests/XCTestManifests.swift
deleted file mode 100644
index 49c001d..0000000
--- a/Mastodon/Tests/MastodonTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-public func allTests() -> [XCTestCaseEntry] {
-    return [
-        testCase(MastodonTests.allTests)
-    ]
-}
-#endif
diff --git a/Tests/View Models/AddIdentityViewModelTests.swift b/Tests/View Models/AddIdentityViewModelTests.swift
index a2b8afa..2371c56 100644
--- a/Tests/View Models/AddIdentityViewModelTests.swift	
+++ b/Tests/View Models/AddIdentityViewModelTests.swift	
@@ -3,6 +3,7 @@
 import XCTest
 import Combine
 import CombineExpectations
+import Mastodon
 @testable import Metatext
 
 class AddIdentityViewModelTests: XCTestCase {