Fix swiftlint issues

crazytonyli · crazytonyli · commit cffdcaf9bca0 · 2025-09-01T11:42:35.000+12:00
diff --git a/Tests/WordPressKitTests/CoreAPITests/WordPressComRestApiTests.swift b/Tests/WordPressKitTests/CoreAPITests/WordPressComRestApiTests.swift
@@ -6,10 +6,12 @@ import OHHTTPStubsSwift
 
 class WordPressComRestApiTests: XCTestCase {
 
+    // swiftlint:disable operator_usage_whitespace
     let scheme                          = "https"
     let host                            = "public-api.wordpress.com"
     let wordPressMediaRoutePath         = "/rest/v1.1/sites/0/media/"
     let wordPressMediaNewEndpointPath   = "/rest/v1.1/sites/0/media/new"
+    // swiftlint:enable operator_usage_whitespace
 
     override func setUp() {
         super.setUp()
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/AccountServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/AccountServiceRemoteRESTTests.swift
@@ -5,6 +5,7 @@ class AccountServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
 
     // MARK: - Constants
 
+    // swiftlint:disable operator_usage_whitespace
     let siteID   = 321
     let username = "jimthetester"
     let email    = "jimthetester@thetestemail.org"
@@ -41,6 +42,7 @@ class AccountServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
     let requestLinkInvalidSecretFailureMockFilename = "auth-send-login-email-invalid-secret-failure.json"
     let requestVerificationEmailSuccessMockFilename = "auth-send-verification-email-success.json"
     let requestVerificationAlreadyVerifiedFailureMockFilename = "auth-send-verification-email-already-verified-failure.json"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/AccountSettingsRemoteTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/AccountSettingsRemoteTests.swift
@@ -5,6 +5,7 @@ class AccountSettingsRemoteTests: RemoteTestCase, RESTTestable {
 
     // MARK: - Constants
 
+    // swiftlint:disable operator_usage_whitespace
     let siteID   = 321
     let username = "jimthetester"
     let email    = "jimthetester@thetestemail.org"
@@ -36,6 +37,7 @@ class AccountSettingsRemoteTests: RemoteTestCase, RESTTestable {
     let updateSettingsChangeDisplayNameSuccessMockFilename         = "me-settings-change-display-name-success.json"
     let updateSettingsChangeDisplayNameBadJsonFailureMockFilename  = "me-settings-change-display-name-bad-json-failure.json"
     let updateSettingsInvalidInputFailureMockFilename              = "me-settings-change-invalid-input-failure.json"
+    // swiftlint:enable operator_usage_whitespace
 
     let closeAccountSuccessFilename = "me-settings-close-account-success.json"
     let closeAccountFailureFilename = "me-settings-close-account-failure.json"
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/CommentServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/CommentServiceRemoteRESTTests.swift
@@ -81,7 +81,7 @@ final class CommentServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
         remote.getCommentWithID(NSNumber(value: commentId),
                                 success: { comment in
 
-            guard let comment = comment else {
+            guard let comment else {
                 XCTFail("Failed to retrieve mock site comment")
                 return
             }
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/CommentServiceRemoteXMLRPCTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/CommentServiceRemoteXMLRPCTests.swift
@@ -72,7 +72,7 @@ class CommentServiceRemoteXMLRPCTests: RemoteTestCase, XMLRPCTestable {
             remoteInstance.getCommentWithID(NSNumber(value: 1),
                                             success: { comment in
 
-                guard let comment = comment else {
+                guard let comment else {
                     XCTFail("Failed to retrieve mock site comment")
                     return
                 }
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/DomainsServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/DomainsServiceRemoteRESTTests.swift
@@ -11,6 +11,7 @@ class DomainsServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
 
     let siteID = 12345
 
+    // swiftlint:disable operator_usage_whitespace
     let domainServiceAllDomainsMockFilename     = "domain-service-all-domain-types.json"
     let domainServiceAuthFailureMockFilename    = "site-export-auth-failure.json"
     let domainServiceBadJsonFailureMockFilename = "domain-service-bad-json.json"
@@ -22,6 +23,7 @@ class DomainsServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
     let getDomainContactInformationSuccess      = "domain-contact-information-response-success.json"
     let domainServiceInvalidQuery               = "domain-service-invalid-query.json"
     let allDomainsMockFilename                  = "get-all-domains-response.json"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/DynamicMockProvider.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/DynamicMockProvider.swift
@@ -21,19 +21,19 @@ internal extension DynamicMockProvider {
         let host = "https://"
         let tlds = [".com", ".org", ".blog", ".co.nz", ".co.uk", ".edu", ".gov"]
 
-        return host + randomString(length: length) + tlds[Int.random(in: 0 ..< (tlds.count-1))]
+        return host + randomString(length: length) + tlds[Int.random(in: 0 ..< (tlds.count - 1))]
     }
 
     static func randomURLAsString(withLength length: Int, subDirectories: [String]?, file: String?) -> String {
         var urlString = randomURLAsString(length: length)
 
-        if let subDirectories = subDirectories {
+        if let subDirectories {
             for directory in subDirectories {
                 urlString += "/\(directory)"
             }
         }
 
-        if let file = file {
+        if let file {
             urlString += "/\(file)"
         }
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/IPLocationRemoteTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/IPLocationRemoteTests.swift
@@ -67,7 +67,7 @@ final class MockURLProtocol: URLProtocol {
             let (response, data) = try handler(request)
             client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)
 
-            if let data = data {
+            if let data {
                 client?.urlProtocol(self, didLoad: data)
             }
             client?.urlProtocolDidFinishLoading(self)
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/Models/Stats/V2/Insights/StatsDotComFollowersInsightTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/Models/Stats/V2/Insights/StatsDotComFollowersInsightTests.swift
@@ -98,7 +98,7 @@ private extension StatsDotComFollowersInsightTests {
     func getFollowerDictionary(id: String? = nil, name: String? = nil, subscribedDate: Date? = nil, avatarUrl: String? = nil) -> [String: AnyObject] {
         var dateString: String?
 
-        if let subscribedDate = subscribedDate {
+        if let subscribedDate {
             let dateFormatter = ISO8601DateFormatter()
             dateString = dateFormatter.string(from: subscribedDate)
         }
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/NotificationSyncServiceRemoteTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/NotificationSyncServiceRemoteTests.swift
@@ -8,6 +8,7 @@ class NotificationSyncServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     // MARK: - Constants
 
+    // swiftlint:disable operator_usage_whitespace
     let notificationsEndpoint       = "notifications/"
     let notificationsReadEndpoint   = "notifications/read"
     let notificationsSeenEndpoint   = "notifications/seen"
@@ -16,6 +17,7 @@ class NotificationSyncServiceRemoteTests: RemoteTestCase, RESTTestable {
     let notificationServiceLoadHashMockFilename     = "notifications-load-hash.json"
     let notificationServiceMarkReadMockFilename     = "notifications-mark-as-read.json"
     let notificationServiceLastSeenMockFilename     = "notifications-last-seen.json"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
@@ -41,7 +43,7 @@ class NotificationSyncServiceRemoteTests: RemoteTestCase, RESTTestable {
         let expect = expectation(description: "Load all notifications success")
         stubRemoteResponse(notificationsEndpoint, filename: notificationServiceLoadAllMockFilename, contentType: .ApplicationJSON)
         remote.loadNotes { error, notes in
-            guard let notes = notes, let note = notes.first else {
+            guard let notes, let note = notes.first else {
                 XCTFail()
                 return
             }
@@ -89,7 +91,7 @@ class NotificationSyncServiceRemoteTests: RemoteTestCase, RESTTestable {
         let expect = expectation(description: "Load notification hashes success")
         stubRemoteResponse(notificationsEndpoint, filename: notificationServiceLoadHashMockFilename, contentType: .ApplicationJSON)
         remote.loadHashes { error, notes in
-            guard let notes = notes else {
+            guard let notes else {
                 XCTFail()
                 return
             }
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/PeopleServiceRemoteTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/PeopleServiceRemoteTests.swift
@@ -6,6 +6,7 @@ class PeopleServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     // MARK: - Constants
 
+    // swiftlint:disable operator_usage_whitespace
     let siteID          = 321
     let userID          = 1111
     let validUsername   = "jimthetester"
@@ -58,6 +59,7 @@ class PeopleServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     let emailFollowersAuthFailureMockFilename       = "site-email-followers-get-auth-failure.json"
     let emailFollowersFailureMockFilename           = "site-email-followers-get-failure.json"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift
@@ -6,6 +6,7 @@ class PlanServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     // MARK: - Constants
 
+    // swiftlint:disable operator_usage_whitespace
     let siteID   = 321
 
     let getPlansBadJsonFailureMockFilename               = "site-plans-bad-json-failure.json"
@@ -15,6 +16,7 @@ class PlanServiceRemoteTests: RemoteTestCase, RESTTestable {
     let getWpcomPlansSuccessMockFilename                 = "plans-mobile-success.json"
     let getPlansMeSitesSuccessMockFilename               = "plans-me-sites-success.json"
     let getZendeskMetadataSuccessMockFilename            = "site-zendesk-metadata-success.json"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/PluginDirectoryTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/PluginDirectoryTests.swift
@@ -26,7 +26,7 @@ class PluginDirectoryTests: XCTestCase {
     }
 
     func testPluginDirectoryEntryDecodingRenameXmlrpc() {
-        let data =  try! MockPluginDirectoryProvider.getPluginDirectoryMockData(with: "plugin-directory-rename-xml-rpc", sender: type(of: self))
+        let data = try! MockPluginDirectoryProvider.getPluginDirectoryMockData(with: "plugin-directory-rename-xml-rpc", sender: type(of: self))
         let endpoint = PluginDirectoryGetInformationEndpoint(slug: "rename-xml-rpc")
 
         do {
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/PostServiceRemoteXMLRPCTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/PostServiceRemoteXMLRPCTests.swift
@@ -12,6 +12,7 @@ class PostServiceRemoteXMLRPCTests: RemoteTestCase, XMLRPCTestable {
     let postIsSticky: NSNumber = 1
     let postParentId: NSNumber = 2
 
+    // swiftlint:disable operator_usage_whitespace
     let getPostSuccessMockFilename              = "xmlrpc-wp-getpost-success.xml"
     let getPostBadXMLFailureFilename            = "xmlrpc-wp-getpost-bad-xml-failure.xml"
     let getPostBadPostIdFailureFilename         = "xmlrpc-wp-getpost-invalid-id-failure.xml"
@@ -22,6 +23,7 @@ class PostServiceRemoteXMLRPCTests: RemoteTestCase, XMLRPCTestable {
     let updatePostBadResponseXMLMockFilename    = "xmlrpc-metaweblog-editpost-bad-xml-failure.xml"
     let updatePostBadFormatMockFilename         = "xmlrpc-metaweblog-editpost-change-format-failure.xml"
     let updatePostChangeTypeFailureFilename     = "xmlrpc-metaweblog-editpost-change-type-failure.xml"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/ReaderPostServiceRemote+CardsTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/ReaderPostServiceRemote+CardsTests.swift
@@ -158,7 +158,7 @@ class ReaderPostServiceRemoteCardTests: RemoteTestCase, RESTTestable {
         readerPostServiceRemote.fetchCards(for: ["cats"], sortingOption: .date, success: { cards, _ in
             let posts = cards.filter { $0.type == .post }
             for i in 1..<posts.count {
-                guard let firstPostDate = posts[i-1].post?.sortDate,
+                guard let firstPostDate = posts[i - 1].post?.sortDate,
                       let secondPostDate = posts[i].post?.sortDate,
                       firstPostDate > secondPostDate else {
                     XCTFail("Posts should be sorted by date, starting with most recent post")
@@ -310,7 +310,7 @@ class ReaderPostServiceRemoteCardTests: RemoteTestCase, RESTTestable {
         readerPostServiceRemote.fetchStreamCards(for: ["cats"], sortingOption: .date, success: { cards, _ in
             let posts = cards.filter { $0.type == .post }
             for i in 1..<posts.count {
-                guard let firstPostDate = posts[i-1].post?.sortDate,
+                guard let firstPostDate = posts[i - 1].post?.sortDate,
                       let secondPostDate = posts[i].post?.sortDate,
                       firstPostDate > secondPostDate else {
                     XCTFail("Posts should be sorted by date, starting with most recent post")
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/RemoteTestCase.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/RemoteTestCase.swift
@@ -13,11 +13,13 @@ class RemoteTestCase: XCTestCase {
     /// Response content types
     ///
     enum ResponseContentType: String {
+        // swiftlint:disable operator_usage_whitespace
         case ApplicationJSON = "application/json"
         case JavaScript      = "text/javascript;charset=utf-8"
         case ApplicationHTML = "application/html"
         case XML             = "text/xml"
         case NoContentType   = ""
+        // swiftlint:enable operator_usage_whitespace
     }
 
     // MARK: - Constants
@@ -187,7 +189,7 @@ extension RemoteTestCase {
     /// call is made instead of a cache hit.
     ///
     func clearDiskCache() {
-        let cacheDirectory =  FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first! as NSURL
+        let cacheDirectory = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first! as NSURL
 
         do {
             if let documentPath = cacheDirectory.path {
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/SiteManagementServiceRemoteTests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/SiteManagementServiceRemoteTests.swift
@@ -8,6 +8,7 @@ class SiteManagementServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     let siteID = 321
 
+    // swiftlint:disable operator_usage_whitespace
     let deleteSiteSuccessMockFilename                       = "site-delete-success.json"
     let deleteSiteAuthFailureMockFilename                   = "site-delete-auth-failure.json"
     let deleteSiteBadJsonFailureMockFilename                = "site-delete-bad-json-failure.json"
@@ -28,6 +29,7 @@ class SiteManagementServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     let markQuickStartAsCompletedSuccessMockFilename        = "site-quick-start-success.json"
     let markQuickStartAsCompletedFailureMockFilename        = "site-quick-start-failure.json"
+    // swiftlint:enable operator_usage_whitespace
 
     // MARK: - Properties
 
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift
@@ -6,7 +6,7 @@ class StatsRemoteV2Tests: RemoteTestCase, RESTTestable {
 
     // MARK: - Constants
 
-    let siteID   = 321
+    let siteID = 321
 
     let getStreakMockFilename = "stats-streak-result.json"
     let getSearchDataFilename = "stats-search-term-result.json"
diff --git a/Tests/WordPressKitTests/WordPressKitTests/Tests/XMLRPCTestable.swift b/Tests/WordPressKitTests/WordPressKitTests/Tests/XMLRPCTestable.swift
@@ -1,6 +1,7 @@
 @testable import WordPressKit
 
 enum XMLRPCTestableConstants {
+    // swiftlint:disable operator_usage_whitespace
     static let xmlRpcUrl        = "http://test.com/xmlrpc.php"
     static let xmlRpcUserName   = "username"
     static let xmlRpcPassword   = "password"
@@ -12,6 +13,7 @@ enum XMLRPCTestableConstants {
 
     static let xmlRpcBadAuthFailureFilename               = "xmlrpc-bad-username-password-error.xml"
     static let xmlRpcMalformedRequestXMLFailureFilename   = "xmlrpc-malformed-request-xml-error.xml"
+    // swiftlint:enable operator_usage_whitespace
 }
 
 /// Protocol to be used when testing XMLRPC Remotes

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ final class CommentServiceRemoteRESTTests: RemoteTestCase, RESTTestable {`
`81`	`81`	`remote.getCommentWithID(NSNumber(value: commentId),`
`82`	`82`	`success: { comment in`
`83`	`83`
`84`		`- guard let comment = comment else {`
	`84`	`+ guard let comment else {`
`85`	`85`	`XCTFail("Failed to retrieve mock site comment")`
`86`	`86`	`return`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class CommentServiceRemoteXMLRPCTests: RemoteTestCase, XMLRPCTestable {`
`72`	`72`	`remoteInstance.getCommentWithID(NSNumber(value: 1),`
`73`	`73`	`success: { comment in`
`74`	`74`
`75`		`- guard let comment = comment else {`
	`75`	`+ guard let comment else {`
`76`	`76`	`XCTFail("Failed to retrieve mock site comment")`
`77`	`77`	`return`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,19 +21,19 @@ internal extension DynamicMockProvider {`
`21`	`21`	`let host = "https://"`
`22`	`22`	`let tlds = [".com", ".org", ".blog", ".co.nz", ".co.uk", ".edu", ".gov"]`
`23`	`23`
`24`		`- return host + randomString(length: length) + tlds[Int.random(in: 0 ..< (tlds.count-1))]`
	`24`	`+ return host + randomString(length: length) + tlds[Int.random(in: 0 ..< (tlds.count - 1))]`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`static func randomURLAsString(withLength length: Int, subDirectories: [String]?, file: String?) -> String {`
`28`	`28`	`var urlString = randomURLAsString(length: length)`
`29`	`29`
`30`		`- if let subDirectories = subDirectories {`
	`30`	`+ if let subDirectories {`
`31`	`31`	`for directory in subDirectories {`
`32`	`32`	`urlString += "/\(directory)"`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- if let file = file {`
	`36`	`+ if let file {`
`37`	`37`	`urlString += "/\(file)"`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ final class MockURLProtocol: URLProtocol {`
`67`	`67`	`let (response, data) = try handler(request)`
`68`	`68`	`client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)`
`69`	`69`
`70`		`- if let data = data {`
	`70`	`+ if let data {`
`71`	`71`	`client?.urlProtocol(self, didLoad: data)`
`72`	`72`	`}`
`73`	`73`	`client?.urlProtocolDidFinishLoading(self)`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private extension StatsDotComFollowersInsightTests {`
`98`	`98`	`func getFollowerDictionary(id: String? = nil, name: String? = nil, subscribedDate: Date? = nil, avatarUrl: String? = nil) -> [String: AnyObject] {`
`99`	`99`	`var dateString: String?`
`100`	`100`
`101`		`- if let subscribedDate = subscribedDate {`
	`101`	`+ if let subscribedDate {`
`102`	`102`	`let dateFormatter = ISO8601DateFormatter()`
`103`	`103`	`dateString = dateFormatter.string(from: subscribedDate)`
`104`	`104`	`}`