Merge pull request #18527 from crazytonyli/delete-test-context-manager

Establish CoreDataStack mock usage pattern - Part II

Author: jkmassel

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -1542,7 +1542,6 @@
 		8BD36E062395CC4400EFFF1C /* MediaEditorOperation+DescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD36E052395CC4400EFFF1C /* MediaEditorOperation+DescriptionTests.swift */; };
 		8BD66ED42787530C00CCD95A /* PostsCardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD66ED32787530C00CCD95A /* PostsCardViewModel.swift */; };
 		8BD66ED52787530C00CCD95A /* PostsCardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD66ED32787530C00CCD95A /* PostsCardViewModel.swift */; };
-		8BD6E34A2477514E009AE97C /* TestContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD6E3492477514E009AE97C /* TestContextManager.m */; };
 		8BD8201924BCCE8600FF25FD /* ReaderWelcomeBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8BD8201824BCCE8600FF25FD /* ReaderWelcomeBanner.xib */; };
 		8BD8201B24BCDBFF00FF25FD /* ReaderWelcomeBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD8201A24BCDBFF00FF25FD /* ReaderWelcomeBanner.swift */; };
 		8BD8201D24BF9E5200FF25FD /* ReaderWelcomeBannerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD8201C24BF9E5200FF25FD /* ReaderWelcomeBannerTests.swift */; };
@@ -6311,8 +6310,6 @@
 		8BD36E012395CAEA00EFFF1C /* MediaEditorOperation+Description.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MediaEditorOperation+Description.swift"; sourceTree = "<group>"; };
 		8BD36E052395CC4400EFFF1C /* MediaEditorOperation+DescriptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MediaEditorOperation+DescriptionTests.swift"; sourceTree = "<group>"; };
 		8BD66ED32787530C00CCD95A /* PostsCardViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostsCardViewModel.swift; sourceTree = "<group>"; };
-		8BD6E3492477514E009AE97C /* TestContextManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestContextManager.m; sourceTree = "<group>"; };
-		8BD6E34B24775164009AE97C /* TestContextManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestContextManager.h; sourceTree = "<group>"; };
 		8BD8201724BC93B500FF25FD /* WordPress 98.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 98.xcdatamodel"; sourceTree = "<group>"; };
 		8BD8201824BCCE8600FF25FD /* ReaderWelcomeBanner.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReaderWelcomeBanner.xib; sourceTree = "<group>"; };
 		8BD8201A24BCDBFF00FF25FD /* ReaderWelcomeBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderWelcomeBanner.swift; sourceTree = "<group>"; };
@@ -14208,8 +14205,6 @@
 				4A17C1A3281A823E0001FFE5 /* NSManagedObject+Fixture.swift */,
 				93E9050519E6F3D8005513C9 /* ContextManagerMock.h */,
 				93E9050619E6F3D8005513C9 /* ContextManagerMock.m */,
-				8BD6E34B24775164009AE97C /* TestContextManager.h */,
-				8BD6E3492477514E009AE97C /* TestContextManager.m */,
 				933D1F451EA64108009FB462 /* TestingAppDelegate.h */,
 				933D1F461EA64108009FB462 /* TestingAppDelegate.m */,
 				933D1F6B1EA7A3AB009FB462 /* TestingMode.storyboard */,
@@ -19730,7 +19725,6 @@
 				E135965D1E7152D1006C6606 /* RecentSitesServiceTests.swift in Sources */,
 				D88A64AC208D9B09008AE9BC /* StockPhotosPageableTests.swift in Sources */,
 				40C403F82215D88100E8C894 /* TopViewedStatsTests.swift in Sources */,
-				8BD6E34A2477514E009AE97C /* TestContextManager.m in Sources */,
 				59ECF87B1CB7061D00E68F25 /* PostSharingControllerTests.swift in Sources */,
 				E157D5E01C690A6C00F04FB9 /* ImmuTableTestUtils.swift in Sources */,
 				40C403EE2215CE9500E8C894 /* SearchResultsStatsRecordValueTests.swift in Sources */,

WordPress/WordPressTest/AccountServiceTests.swift

@@ -3,13 +3,14 @@ import XCTest
 @testable import WordPress
 
 class AccountServiceTests: XCTestCase {
-    var contextManager: TestContextManager!
+    var contextManager: ContextManagerMock!
     var accountService: AccountService!
 
     override func setUp() {
         super.setUp()
 
-        contextManager = TestContextManager()
+        contextManager = ContextManagerMock()
+        contextManager.setUpAsSharedInstance()
         accountService = AccountService(managedObjectContext: contextManager.mainContext)
     }
 
@@ -18,8 +19,7 @@ class AccountServiceTests: XCTestCase {
 
         deleteTestAccounts()
 
-        ContextManager.overrideSharedInstance(nil)
-        contextManager.mainContext.reset()
+        contextManager.tearDown()
         contextManager = nil
         accountService = nil
     }

WordPress/WordPressTest/ActivityContentFactoryTests.swift

@@ -2,11 +2,9 @@ import XCTest
 @testable import WordPress
 
 final class ActivityContentFactoryTests: XCTestCase {
-    private let contextManager = TestContextManager()
 
     func testActivityContentFactoryReturnsExpectedImplementationOfFormattableContent() throws {
         let subject = ActivityContentFactory.content(from: [try mockBlock()], actionsParser: ActivityActionsParser()).first as? FormattableTextContent
-
         XCTAssertNotNil(subject)
     }
 

WordPress/WordPressTest/ActivityLogTestData.swift

@@ -1,7 +1,5 @@
 class ActivityLogTestData {
 
-    let contextManager = TestContextManager()
-
     let testPostID = 441
     let testSiteID = 137726971
 

WordPress/WordPressTest/Analytics/EditorAnalytics/PostEditorAnalyticsSessionTests.swift

@@ -14,12 +14,12 @@ class PostEditorAnalyticsSessionTests: XCTestCase {
         """
     }
 
-    private var contextManager: TestContextManager!
+    private var contextManager: ContextManagerMock!
     private var context: NSManagedObjectContext!
 
 
     override func setUp() {
-        contextManager = TestContextManager()
+        contextManager = ContextManagerMock()
         context = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
         context.parent = contextManager.mainContext
         TestAnalyticsTracker.setup()

WordPress/WordPressTest/ApproveCommentActionTests.swift

@@ -32,7 +32,7 @@ final class ApproveCommentActionTests: XCTestCase {
 
     private var action: ApproveComment?
     private let utility = NotificationUtility()
-    private var contextManager: TestContextManager!
+    private var contextManager: ContextManagerMock!
 
     private struct Constants {
         static let initialStatus: Bool = false
@@ -41,7 +41,7 @@ final class ApproveCommentActionTests: XCTestCase {
     override func setUp() {
         super.setUp()
         utility.setUp()
-        contextManager = TestContextManager()
+        contextManager = ContextManagerMock()
         action = TestableApproveComment(on: Constants.initialStatus, coreDataStack: contextManager)
         makeNetworkAvailable()
     }

WordPress/WordPressTest/AtomicAuthenticationServiceTests.swift

@@ -4,13 +4,13 @@ import XCTest
 @testable import WordPress
 
 class AtomicAuthenticationServiceTests: XCTestCase {
-    var contextManager: TestContextManager!
+    var contextManager: ContextManagerMock!
     var atomicService: AtomicAuthenticationService!
 
     override func setUp() {
         super.setUp()
 
-        contextManager = TestContextManager()
+        contextManager = ContextManagerMock()
 
         let api = WordPressComRestApi(oAuthToken: "")
         let remote = AtomicAuthenticationServiceRemote(wordPressComRestApi: api)
@@ -20,8 +20,6 @@ class AtomicAuthenticationServiceTests: XCTestCase {
     override func tearDown() {
         super.tearDown()
 
-        ContextManager.overrideSharedInstance(nil)
-        contextManager.mainContext.reset()
         contextManager = nil
         atomicService = nil
     }

WordPress/WordPressTest/Aztec/AztecPostViewController+MenuTests.swift

@@ -18,18 +18,17 @@ class AztecPostViewController_MenuTests: XCTestCase {
     }
 
     private var aztecPostViewController: Mock!
-    private var contextManager: TestContextManager!
+    private var contextManager: ContextManagerMock!
     private var context: NSManagedObjectContext!
 
     override func setUpWithError() throws {
         try super.setUpWithError()
-        contextManager = TestContextManager()
+        contextManager = ContextManagerMock()
         context = contextManager.newDerivedContext()
     }
 
     override func tearDownWithError() throws {
         try super.tearDownWithError()
-        contextManager = nil
         context = nil
     }
 

WordPress/WordPressTest/Aztec/AztecPostViewControllerAttachmentTests.swift

@@ -6,13 +6,13 @@ import Nimble
 
 class AztecPostViewControllerAttachmentTests: XCTestCase {
 
-    private var contextManager: TestContextManager!
+    private var contextManager: ContextManagerMock!
     private var context: NSManagedObjectContext!
 
     override func setUp() {
         super.setUp()
 
-        contextManager = TestContextManager()
+        contextManager = ContextManagerMock()
         context = contextManager.newDerivedContext()
     }
 

WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift

@@ -10,15 +10,16 @@ class BlockEditorSettingsServiceTests: XCTestCase {
     private let blockSettingsThemeJSONResponseFilename = "wp-block-editor-v1-settings-success-ThemeJSON"
 
     private var service: BlockEditorSettingsService!
-    private var contextManager: TestContextManager!
-    private var context: NSManagedObjectContext!
+    private var contextManager: ContextManagerMock!
+    private var context: NSManagedObjectContext {
+        contextManager.mainContext
+    }
     var mockRemoteApi: MockWordPressComRestApi!
     var gssOriginalValue: Bool!
     private var blog: Blog!
 
     override func setUp() {
-        contextManager = TestContextManager()
-        context = contextManager.mainContext
+        contextManager = ContextManagerMock()
         mockRemoteApi = MockWordPressComRestApi()
         blog = BlogBuilder(context)
             .with(wordPressVersion: "5.8")