Fix unit tests

kean · kean · commit 61dac1a717b5 · 2024-07-12T21:14:55.000-04:00
diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/WordPress/Classes/Utility/PushNotificationsManager.swift b/WordPress/Classes/Utility/PushNotificationsManager.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressShared
+import NSObject_SafeExpectations
 import UserNotifications
 import CocoaLumberjack
 
diff --git a/WordPress/WordPressTest/Classes/Stores/ActivityStoreTests.swift b/WordPress/WordPressTest/Classes/Stores/ActivityStoreTests.swift
@@ -1,8 +1,8 @@
 import WordPressFlux
 import XCTest
+import WordPressKit
 
 @testable import WordPress
-@testable import WordPressKit
 
 class ActivityStoreTests: CoreDataTestCase {
     private var dispatcher: ActionDispatcher!
diff --git a/WordPress/WordPressTest/MockWordPressComRestApi.swift b/WordPress/WordPressTest/MockWordPressComRestApi.swift
@@ -1,5 +1,5 @@
 import Foundation
-@testable import WordPressKit
+import WordPressKit
 
 class MockWordPressComRestApi: WordPressComRestApi {
     var getMethodCalled = false
diff --git a/WordPress/WordPressTest/SiteCreation/SiteCreatorTests.swift b/WordPress/WordPressTest/SiteCreation/SiteCreatorTests.swift
@@ -1,7 +1,7 @@
-
 import XCTest
+import WordPressKit
+
 @testable import WordPress
-@testable import WordPressKit
 
 // MARK: - SiteCreatorTests
 
diff --git a/WordPress/WordPressTest/StatsPeriodAsyncOperationTests.swift b/WordPress/WordPressTest/StatsPeriodAsyncOperationTests.swift
@@ -1,6 +1,7 @@
 import XCTest
+import WordPressKit
+
 @testable import WordPress
-@testable import WordPressKit
 
 class StatsPeriodAsyncOperationTests: XCTestCase {
     private let date = Date()
diff --git a/WordPress/WordPressTest/ViewRelated/Tools/Time Zone/TimeZoneFormatterTests.swift b/WordPress/WordPressTest/ViewRelated/Tools/Time Zone/TimeZoneFormatterTests.swift
@@ -1,6 +1,7 @@
 import XCTest
+import WordPressKit
+
 @testable import WordPress
-@testable import WordPressKit
 
 class TimeZoneFormatterTests: XCTestCase {
 
diff --git a/WordPress/WordPressTest/ViewRelated/Tools/Time Zone/TimeZoneSelectorViewModelTests.swift b/WordPress/WordPressTest/ViewRelated/Tools/Time Zone/TimeZoneSelectorViewModelTests.swift
@@ -1,7 +1,8 @@
 import Foundation
 import XCTest
+import WordPressKit
+
 @testable import WordPress
-@testable import WordPressKit
 
 class TimeZoneSelectorViewModelTests: CoreDataTestCase {
 
diff --git a/WordPress/WordPressTest/What's New/Data store/Announcement+Fixture.swift b/WordPress/WordPressTest/What's New/Data store/Announcement+Fixture.swift
@@ -1,4 +1,4 @@
-@testable import WordPressKit // Announcement is defined here
+import WordPressKit // Announcement is defined here
 
 extension Announcement {
 
diff --git a/WordPress/WordPressTest/What's New/Data store/AnnouncementsDataStoreTests.swift b/WordPress/WordPressTest/What's New/Data store/AnnouncementsDataStoreTests.swift
@@ -1,8 +1,9 @@
-@testable import WordPress
-@testable import WordPressKit
 import XCTest
+import WordPressKit
 import WordPressFlux
 
+@testable import WordPress
+
 struct MockAnnouncementsCache: AnnouncementsCache {
 
     var announcements: [Announcement]?
diff --git a/WordPress/WordPressTest/ZendeskUtilsTests+Plans.swift b/WordPress/WordPressTest/ZendeskUtilsTests+Plans.swift
@@ -1,8 +1,8 @@
 import XCTest
 import ZendeskCoreSDK
+import WordPressKit
 
 @testable import WordPress
-@testable import WordPressKit
 
 class ZendeskUtilsPlans: XCTestCase {
 
diff --git a/WordPressAuthenticator/Tests/Mocks/WordPressAuthenticatorDelegateSpy.swift b/WordPressAuthenticator/Tests/Mocks/WordPressAuthenticatorDelegateSpy.swift
@@ -1,5 +1,6 @@
 @testable import WordPressAuthenticator
 import WordPressKit
+import WordPressShared
 
 class WordPressAuthenticatorDelegateSpy: WordPressAuthenticatorDelegate {
     var dismissActionEnabled: Bool = true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@testable import WordPressKit // Announcement is defined here`
	`1`	`+import WordPressKit // Announcement is defined here`
`2`	`2`
`3`	`3`	`extension Announcement {`
`4`	`4`