Move remaining tests to CoreAPITests/

Author: mokagio

Package.swift

@@ -42,7 +42,7 @@ let package = Package(
             ],
             path: "Tests/CoreAPITests",
             resources: [
-                // .process("Stubs") // Relative to path
+                .process("Stubs") // Relative to path
             ]
         ),
     ]

Sources/CoreAPI/WordPressComRestApiErrorDomain.swift

@@ -0,0 +1,30 @@
+import Foundation
+
+/// Error domain of `NSError` instances that are converted from `WordPressComRestApiEndpointError`
+/// and `WordPressAPIError<WordPressComRestApiEndpointError>` instances.
+///
+/// See `extension WordPressComRestApiEndpointError: CustomNSError` for context.
+let WordPressComRestApiErrorDomain = "WordPressKit.WordPressComRestApiError"
+
+// WordPressComRestApiErrorDomain is accessible only in Swift and, since it's a global, cannot be made @objc.
+// As a workaround, here is a builder to init NSError with that domain and a method to check the domain.
+@objc
+public extension NSError {
+
+    @objc
+    static func wordPressComRestApiError(
+        code: Int,
+        userInfo: [String: Any]?
+    ) -> NSError {
+        NSError(
+            domain: WordPressComRestApiErrorDomain,
+            code: code,
+            userInfo: userInfo
+        )
+    }
+
+    @objc
+    func hasWordPressComRestApiErrorDomain() -> Bool {
+        domain == WordPressComRestApiErrorDomain
+    }
+}

Sources/WordPressKit/Services/MediaServiceRemoteREST.m

@@ -244,7 +244,8 @@ - (NSError *)processMediaUploadErrors:(NSArray *)errorList {
             errorMessage = errorInfo[@"message"];
         }
         NSDictionary *errorDictionary = @{NSLocalizedDescriptionKey: errorMessage};
-        error = [NSError errorWithDomain:WordPressComRestApiErrorDomain code:WordPressComRestApiErrorCodeUploadFailed userInfo:errorDictionary];
+        error = [NSError wordPressComRestApiErrorWithCode:WordPressComRestApiErrorCodeUploadFailed
+                                                 userInfo:errorDictionary];
     }
     return error;
 }
@@ -296,9 +297,8 @@ - (void)deleteMedia:(RemoteMedia *)media
                                    }
                                } else {
                                    if (failure) {
-                                       NSError *error = [NSError errorWithDomain:WordPressComRestApiErrorDomain
-                                                                            code:WordPressComRestApiErrorCodeUnknown
-                                                                        userInfo:nil];
+                                       NSError *error = [NSError wordPressComRestApiErrorWithCode:WordPressComRestApiErrorCodeUnknown
+                                                                                         userInfo:nil];
                                        failure(error);
                                    }
                                }
@@ -369,9 +369,8 @@ -(void)getVideoPressToken:(NSString *)videoPressID
                                    }
                                } else {
                                    if (failure) {
-                                       NSError *error = [NSError errorWithDomain:WordPressComRestApiErrorDomain
-                                                                            code:WordPressComRestApiErrorCodeUnknown
-                                                                        userInfo:nil];
+                                       NSError *error = [NSError wordPressComRestApiErrorWithCode:WordPressComRestApiErrorCodeUnknown
+                                                                                         userInfo:nil];
                                        failure(error);
                                    }
                                }

Sources/WordPressKit/Services/WordPressComServiceRemote.m

@@ -179,10 +179,9 @@ - (void)createWPComBlogWithUrl:(NSString *)blogUrl
             NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
             userInfo[WordPressComRestApi.ErrorKeyErrorMessage] = localizedErrorMessage;
             userInfo[NSLocalizedDescriptionKey] = localizedErrorMessage;
-            NSError *errorWithLocalizedMessage = [[NSError alloc] initWithDomain:WordPressComRestApiErrorDomain
-                                                                            code:WordPressComRestApiErrorCodeUnknown
-                                                                        userInfo:userInfo];
-            
+            NSError *errorWithLocalizedMessage = [NSError wordPressComRestApiErrorWithCode:WordPressComRestApiErrorCodeUnknown
+                                                                                  userInfo:userInfo];
+
             failure(errorWithLocalizedMessage);
         } else {
             success(responseObject);
@@ -229,7 +228,7 @@ - (void)createWPComBlogWithUrl:(NSString *)blogUrl
 
 - (NSError *)errorWithLocalizedMessage:(NSError *)error {
     NSError *errorWithLocalizedMessage = error;
-    if ([error.domain isEqualToString:WordPressComRestApiErrorDomain] &&
+    if ([error hasWordPressComRestApiErrorDomain] &&
         [error.userInfo objectForKey:WordPressComRestApi.ErrorKeyErrorCode] != nil) {
 
         NSString *localizedErrorMessage = [self errorMessageForError:error];

Sources/WordPressKit/Utility/Constants.h

@@ -1,48 +1,5 @@
 import Foundation
 
-extension String.Encoding {
-    /// See: https://www.iana.org/assignments/character-sets/character-sets.xhtml
-    init?(ianaCharsetName: String) {
-        let encoding: CFStringEncoding = CFStringConvertIANACharSetNameToEncoding(ianaCharsetName as CFString)
-        guard encoding != kCFStringEncodingInvalidId,
-              let builtInEncoding = CFStringBuiltInEncodings(rawValue: encoding)
-        else {
-            return nil
-        }
-
-        switch builtInEncoding {
-        case .macRoman:
-            self = .macOSRoman
-        case .windowsLatin1:
-            self = .windowsCP1252
-        case .isoLatin1:
-            self = .isoLatin1
-        case .nextStepLatin:
-            self = .nextstep
-        case .ASCII:
-            self = .ascii
-        case .unicode:
-            self = .unicode
-        case .UTF8:
-            self = .utf8
-        case .nonLossyASCII:
-            self = .nonLossyASCII
-        case .UTF16BE:
-            self = .utf16BigEndian
-        case .UTF16LE:
-            self = .utf16LittleEndian
-        case .UTF32:
-            self = .utf32
-        case .UTF32BE:
-            self = .utf32BigEndian
-        case .UTF32LE:
-            self = .utf32LittleEndian
-        @unknown default:
-            return nil
-        }
-    }
-}
-
 extension HTTPURLResponse {
 
     /// Return parameter value in a header field.

Sources/WordPressKit/Utility/Constants.m

@@ -53,4 +53,3 @@ FOUNDATION_EXPORT const unsigned char WordPressKitVersionString[];
 #import <WordPressKit/NSString+MD5.h>
 
 #import <WordPressKit/WPKitLogging.h>
-#import <WordPressKit/Constants.h>

Sources/WordPressKit/Utility/HTTPProtocolHelpers.swift

@@ -1,5 +1,9 @@
 import XCTest
+#if SWIFT_PACKAGE
+@testable import CoreAPI
+#else
 @testable import WordPressKit
+#endif
 
 final class AppTransportSecuritySettingsTests: XCTestCase {
 

Sources/WordPressKit/WordPressKit.h

@@ -1,5 +1,8 @@
-import Foundation
+#if SWIFT_PACKAGE
+@testable import CoreAPI
+#else
 @testable import WordPressKit
+#endif
 
 class FakeInfoDictionaryObjectProvider: InfoDictionaryObjectProvider {
     private let appTransportSecurity: [String: Any]?