Fix unit tests compilation issues

Author: crazytonyli

Modules/Tests/WordPressCoreTests/MockWordPressClientAPI.swift

@@ -82,7 +82,10 @@ final class MockWordPressClientAPI: WordPressClientAPI, @unchecked Sendable {
         fatalError("Not implemented")
     }
 
-    func uploadMedia(params: MediaCreateParams, fulfilling progress: Progress) async throws -> MediaRequestCreateResponse {
+    func uploadMedia(
+        params: MediaCreateParams,
+        fulfilling progress: Progress
+    ) async throws -> MediaRequestCreateResponse {
         fatalError("Not implemented")
     }
 }
@@ -118,7 +121,9 @@ final class MockUsersRequestExecutor: UsersRequestExecutor {
         super.init(unsafeFromHandle: handle)
     }
 
-    override func retrieveMeWithEditContextCancellation(context: RequestContext?) async throws -> UsersRequestRetrieveMeWithEditContextResponse {
+    override func retrieveMeWithEditContextCancellation(
+        context: RequestContext?
+    ) async throws -> UsersRequestRetrieveMeWithEditContextResponse {
         let mockUser = UserWithEditContext(
             id: UserId(1),
             username: "testuser",
@@ -134,7 +139,7 @@ final class MockUsersRequestExecutor: UsersRequestExecutor {
             slug: "testuser",
             registeredDate: "2024-01-01T00:00:00",
             roles: [],
-            capabilities: [:],
+            capabilities: UserCapabilitiesMap(map: [:]),
             extraCapabilities: [:],
             avatarUrls: nil
         )
@@ -156,7 +161,10 @@ final class MockThemesRequestExecutor: ThemesRequestExecutor {
         super.init(unsafeFromHandle: handle)
     }
 
-    override func listWithEditContextCancellation(params: ThemeListParams, context: RequestContext?) async throws -> ThemesRequestListWithEditContextResponse {
+    override func listWithEditContextCancellation(
+        params: ThemeListParams,
+        context: RequestContext?
+    ) async throws -> ThemesRequestListWithEditContextResponse {
         let mockTheme = ThemeWithEditContext(
             stylesheet: ThemeStylesheet(value: "twentytwentyfour"),
             template: "twentytwentyfour",
@@ -196,7 +204,9 @@ final class MockSiteSettingsRequestExecutor: SiteSettingsRequestExecutor {
         super.init(unsafeFromHandle: handle)
     }
 
-    override func retrieveWithEditContextCancellation(context: RequestContext?) async throws -> SiteSettingsRequestRetrieveWithEditContextResponse {
+    override func retrieveWithEditContextCancellation(
+        context: RequestContext?
+    ) async throws -> SiteSettingsRequestRetrieveWithEditContextResponse {
         let mockSettings = SiteSettingsWithEditContext(
             title: "Test Site",
             description: "A test site",
@@ -217,7 +227,8 @@ final class MockSiteSettingsRequestExecutor: SiteSettingsRequestExecutor {
             defaultPingStatus: .open,
             defaultCommentStatus: .open,
             siteLogo: nil,
-            siteIcon: 0
+            siteIcon: 0,
+            additionalFields: AnyJson(noHandle: AnyJson.NoHandle())
         )
         let mockHeaderMap = WpNetworkHeaderMap(noHandle: WpNetworkHeaderMap.NoHandle())
         return SiteSettingsRequestRetrieveWithEditContextResponse(data: mockSettings, headerMap: mockHeaderMap)

Tests/KeystoneTests/Tests/Features/Posts/CustomPostEditorServiceTests.swift

@@ -196,7 +196,7 @@ private func makeService(
         api: api,
         siteURL: URL(string: "https://example.com")!
     )
-    let wpService = try api.createSelfHostedService(cache: .bootstrap())
+    let wpService = try api.createService(cache: .bootstrap())
 
     return CustomPostEditorService(
         blog: blog,
@@ -219,7 +219,7 @@ private func makePostTypeDetails() -> PostTypeDetailsWithEditContext {
         slug: "test_post_type",
         supports: PostTypeSupportsMap(map: [
             .title: .bool(true),
-            .editor: .bool(true),
+            .editor: .bool(true)
         ]),
         hasArchive: .bool(false),
         taxonomies: [],
@@ -232,17 +232,40 @@ private func makePostTypeDetails() -> PostTypeDetailsWithEditContext {
 
 private func makePostTypeLabels() -> PostTypeLabels {
     PostTypeLabels(
-        name: "", singularName: "", addNew: "", addNewItem: "",
-        editItem: "", newItem: "", viewItem: "", viewItems: "",
-        searchItems: "", notFound: "", notFoundInTrash: "",
-        parentItemColon: nil, allItems: "", archives: "",
-        attributes: "", insertIntoItem: "", uploadedToThisItem: "",
-        featuredImage: "", setFeaturedImage: "", removeFeaturedImage: "",
-        useFeaturedImage: "", filterItemsList: "", filterByDate: "",
-        itemsListNavigation: "", itemsList: "", itemPublished: "",
-        itemPublishedPrivately: "", itemRevertedToDraft: "",
-        itemTrashed: "", itemScheduled: "", itemUpdated: "",
-        itemLink: "", itemLinkDescription: "", menuName: "",
+        name: "",
+        singularName: "",
+        addNew: "",
+        addNewItem: "",
+        editItem: "",
+        newItem: "",
+        viewItem: "",
+        viewItems: "",
+        searchItems: "",
+        notFound: "",
+        notFoundInTrash: "",
+        parentItemColon: nil,
+        allItems: "",
+        archives: "",
+        attributes: "",
+        insertIntoItem: "",
+        uploadedToThisItem: "",
+        featuredImage: "",
+        setFeaturedImage: "",
+        removeFeaturedImage: "",
+        useFeaturedImage: "",
+        filterItemsList: "",
+        filterByDate: "",
+        itemsListNavigation: "",
+        itemsList: "",
+        itemPublished: "",
+        itemPublishedPrivately: "",
+        itemRevertedToDraft: "",
+        itemTrashed: "",
+        itemScheduled: "",
+        itemUpdated: "",
+        itemLink: "",
+        itemLinkDescription: "",
+        menuName: "",
         nameAdminBar: ""
     )
 }

Tests/KeystoneTests/Tests/Services/BlogServiceRemoteCoreRESTSettingsTests.swift

@@ -1,5 +1,6 @@
 import Testing
 import WordPressAPI
+import WordPressAPIInternal
 @testable import WordPress
 @testable import WordPressKit
 
@@ -19,15 +20,27 @@ struct BlogServiceRemoteCoreRESTSettingsTests {
         postsPerPage: UInt64 = 10
     ) -> SiteSettingsWithEditContext {
         SiteSettingsWithEditContext(
-            title: title, description: description, url: "", email: "",
-            timezone: timezone, dateFormat: dateFormat, timeFormat: timeFormat,
-            startOfWeek: startOfWeek, language: "", useSmilies: false,
-            defaultCategory: defaultCategory, defaultPostFormat: defaultPostFormat,
-            postsPerPage: postsPerPage, showOnFront: "posts",
-            pageOnFront: 0, pageForPosts: 0,
+            title: title,
+            description: description,
+            url: "",
+            email: "",
+            timezone: timezone,
+            dateFormat: dateFormat,
+            timeFormat: timeFormat,
+            startOfWeek: startOfWeek,
+            language: "",
+            useSmilies: false,
+            defaultCategory: defaultCategory,
+            defaultPostFormat: defaultPostFormat,
+            postsPerPage: postsPerPage,
+            showOnFront: "posts",
+            pageOnFront: 0,
+            pageForPosts: 0,
             defaultPingStatus: .closed,
             defaultCommentStatus: .closed,
-            siteLogo: nil, siteIcon: 0
+            siteLogo: nil,
+            siteIcon: 0,
+            additionalFields: AnyJson(noHandle: AnyJson.NoHandle())
         )
     }