Remove sharedInstance from TextContextManager (#18512)

mokagio · web-flow · commit 735cf3fdd8a7 · 2022-05-06T11:24:07.000+10:00
diff --git a/WordPress/WordPressTest/ApproveCommentActionTests.swift b/WordPress/WordPressTest/ApproveCommentActionTests.swift
@@ -3,10 +3,16 @@ import XCTest
 
 final class ApproveCommentActionTests: XCTestCase {
     private class TestableApproveComment: ApproveComment {
-        let service = MockNotificationActionsService(managedObjectContext: TestContextManager.sharedInstance().mainContext)
+        let service: MockNotificationActionsService
+
         override var actionsService: NotificationActionsService? {
             return service
         }
+
+        init(on: Bool, coreDataStack: CoreDataStack) {
+            service = MockNotificationActionsService(managedObjectContext: coreDataStack.mainContext)
+            super.init(on: on)
+        }
     }
 
     private class MockNotificationActionsService: NotificationActionsService {
@@ -26,6 +32,7 @@ final class ApproveCommentActionTests: XCTestCase {
 
     private var action: ApproveComment?
     private let utility = NotificationUtility()
+    private var contextManager: TestContextManager!
 
     private struct Constants {
         static let initialStatus: Bool = false
@@ -34,7 +41,8 @@ final class ApproveCommentActionTests: XCTestCase {
     override func setUp() {
         super.setUp()
         utility.setUp()
-        action = TestableApproveComment(on: Constants.initialStatus)
+        contextManager = TestContextManager()
+        action = TestableApproveComment(on: Constants.initialStatus, coreDataStack: contextManager)
         makeNetworkAvailable()
     }
 
diff --git a/WordPress/WordPressTest/Classes/Stores/ActivityStoreTests.swift b/WordPress/WordPressTest/Classes/Stores/ActivityStoreTests.swift
@@ -9,17 +9,20 @@ class ActivityStoreTests: XCTestCase {
     private var store: ActivityStore!
     private var activityServiceMock: ActivityServiceRemoteMock!
     private var backupServiceMock: JetpackBackupServiceMock!
+    private var contextManager: TestContextManager!
 
     override func setUp() {
         super.setUp()
 
+        contextManager = TestContextManager()
         dispatcher = ActionDispatcher()
         activityServiceMock = ActivityServiceRemoteMock()
-        backupServiceMock = JetpackBackupServiceMock()
+        backupServiceMock = JetpackBackupServiceMock(managedObjectContext: contextManager.mainContext)
         store = ActivityStore(dispatcher: dispatcher, activityServiceRemote: activityServiceMock, backupService: backupServiceMock)
     }
 
     override func tearDown() {
+        ContextManager.overrideSharedInstance(nil)
         dispatcher = nil
         store = nil
 
@@ -248,10 +251,6 @@ extension ActivityGroup {
 class JetpackBackupServiceMock: JetpackBackupService {
     var didCallGetAllBackupStatusWithSite: JetpackSiteRef?
 
-    init() {
-        super.init(managedObjectContext: TestContextManager.sharedInstance().mainContext)
-    }
-
     override func getAllBackupStatus(for site: JetpackSiteRef, success: @escaping ([JetpackBackup]) -> Void, failure: @escaping (Error) -> Void) {
         didCallGetAllBackupStatusWithSite = site
 
diff --git a/WordPress/WordPressTest/ContextManagerMock.m b/WordPress/WordPressTest/ContextManagerMock.m
@@ -14,18 +14,6 @@ @implementation ContextManagerMock
 @synthesize mainContext = _mainContext;
 @synthesize managedObjectModel = _managedObjectModel;
 
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        // Override the shared ContextManager
-        [ContextManager internalSharedInstance];
-        [ContextManager overrideSharedInstance:self];
-    }
-
-    return self;
-}
-
 - (NSManagedObjectModel *)managedObjectModel
 {
     return _managedObjectModel ?: [super managedObjectModel];
diff --git a/WordPress/WordPressTest/EditCommentActionTests.swift b/WordPress/WordPressTest/EditCommentActionTests.swift
@@ -3,10 +3,16 @@ import XCTest
 
 final class EditCommentActionTests: XCTestCase {
     private class TestableEditComment: EditComment {
-        let service = MockNotificationActionsService(managedObjectContext: TestContextManager.sharedInstance().mainContext)
+        let service: MockNotificationActionsService
+
         override var actionsService: NotificationActionsService? {
             return service
         }
+
+        init(on: Bool, coreDataStack: CoreDataStack) {
+            service = MockNotificationActionsService(managedObjectContext: coreDataStack.mainContext)
+            super.init(on: on)
+        }
     }
 
     private class MockNotificationActionsService: NotificationActionsService {
@@ -20,6 +26,7 @@ final class EditCommentActionTests: XCTestCase {
 
     private var action: EditComment?
     private let utility = NotificationUtility()
+    private var contextManager: TestContextManager!
 
     private struct Constants {
         static let initialStatus: Bool = false
@@ -28,12 +35,14 @@ final class EditCommentActionTests: XCTestCase {
     override func setUp() {
         super.setUp()
         utility.setUp()
-        action = TestableEditComment(on: Constants.initialStatus)
+        contextManager = TestContextManager()
+        action = TestableEditComment(on: Constants.initialStatus, coreDataStack: contextManager)
     }
 
     override func tearDown() {
         action = nil
         utility.tearDown()
+        ContextManager.overrideSharedInstance(nil)
         super.tearDown()
     }
 
diff --git a/WordPress/WordPressTest/LikeCommentActionTests.swift b/WordPress/WordPressTest/LikeCommentActionTests.swift
@@ -3,10 +3,16 @@ import XCTest
 
 final class LikeCommentActionTests: XCTestCase {
     private class TestableLikeComment: LikeComment {
-        let service = MockNotificationActionsService(managedObjectContext: TestContextManager.sharedInstance().mainContext)
+        let service: MockNotificationActionsService
+
         override var actionsService: NotificationActionsService? {
             return service
         }
+
+        init(on: Bool, coreDataStack: CoreDataStack) {
+            service = MockNotificationActionsService(managedObjectContext: coreDataStack.mainContext)
+            super.init(on: on)
+        }
     }
 
     private class MockNotificationActionsService: NotificationActionsService {
@@ -26,6 +32,7 @@ final class LikeCommentActionTests: XCTestCase {
 
     private var action: LikeComment?
     private let utility = NotificationUtility()
+    private var contextManager: TestContextManager!
 
     private struct Constants {
         static let initialStatus: Bool = false
@@ -34,7 +41,8 @@ final class LikeCommentActionTests: XCTestCase {
     override func setUp() {
         super.setUp()
         utility.setUp()
-        action = TestableLikeComment(on: Constants.initialStatus)
+        contextManager = TestContextManager()
+        action = TestableLikeComment(on: Constants.initialStatus, coreDataStack: contextManager)
         makeNetworkAvailable()
     }
 
diff --git a/WordPress/WordPressTest/MarkAsSpamActionTests.swift b/WordPress/WordPressTest/MarkAsSpamActionTests.swift
@@ -3,10 +3,16 @@ import XCTest
 
 final class MarkAsSpamActionTests: XCTestCase {
     private class TestableMarkAsSpam: MarkAsSpam {
-        let service = MockNotificationActionsService(managedObjectContext: TestContextManager.sharedInstance().mainContext)
+        let service: MockNotificationActionsService
+
         override var actionsService: NotificationActionsService? {
             return service
         }
+
+        init(on: Bool, coreDataStack: CoreDataStack) {
+            service = MockNotificationActionsService(managedObjectContext: coreDataStack.mainContext)
+            super.init(on: on)
+        }
     }
 
     private class MockNotificationActionsService: NotificationActionsService {
@@ -17,6 +23,7 @@ final class MarkAsSpamActionTests: XCTestCase {
 
     private var action: MarkAsSpam?
     let utility = NotificationUtility()
+    private var testContextManager: TestContextManager!
 
     private struct Constants {
         static let initialStatus: Bool = false
@@ -25,7 +32,8 @@ final class MarkAsSpamActionTests: XCTestCase {
     override func setUp() {
         super.setUp()
         utility.setUp()
-        action = TestableMarkAsSpam(on: Constants.initialStatus)
+        testContextManager = TestContextManager()
+        action = TestableMarkAsSpam(on: Constants.initialStatus, coreDataStack: testContextManager)
         makeNetworkAvailable()
     }
 
diff --git a/WordPress/WordPressTest/Menus/Controllers/MenuItemsViewControllerTests.swift b/WordPress/WordPressTest/Menus/Controllers/MenuItemsViewControllerTests.swift
@@ -11,7 +11,7 @@ class MenuItemsViewControllerTests: XCTestCase {
 
     override func tearDownWithError() throws {
         context = nil
-        TestContextManager.overrideSharedInstance(nil)
+        ContextManager.overrideSharedInstance(nil)
         try super.tearDownWithError()
     }
 
diff --git a/WordPress/WordPressTest/Menus/MenuItemTests.swift b/WordPress/WordPressTest/Menus/MenuItemTests.swift
@@ -3,16 +3,18 @@ import Foundation
 
 class MenuItemTests: XCTestCase {
 
-    private var context: NSManagedObjectContext!
+    private var contextManager: TestContextManager!
+    private var context: NSManagedObjectContext! {
+        contextManager.mainContext
+    }
 
-    override func setUpWithError() throws {
-        context = TestContextManager().mainContext
+    override func setUp() {
+        contextManager = TestContextManager()
     }
 
-    override func tearDownWithError() throws {
-        TestContextManager.overrideSharedInstance(nil)
+    override func tearDown() {
+        ContextManager.overrideSharedInstance(nil)
         context.reset()
-        context = nil
     }
 
     /// Tests detection of descendants.
diff --git a/WordPress/WordPressTest/Pages/Controllers/PageListViewControllerTests.swift b/WordPress/WordPressTest/Pages/Controllers/PageListViewControllerTests.swift
@@ -6,16 +6,18 @@ import Nimble
 
 class PageListViewControllerTests: XCTestCase {
 
-    private var context: NSManagedObjectContext!
+    private var contextManager: TestContextManager!
+    private var context: NSManagedObjectContext! {
+        contextManager.mainContext
+    }
 
     override func setUp() {
-        context = TestContextManager().mainContext
+        contextManager = TestContextManager()
         super.setUp()
     }
 
     override func tearDown() {
-        context = nil
-        TestContextManager.overrideSharedInstance(nil)
+        ContextManager.overrideSharedInstance(nil)
         super.tearDown()
     }
 
diff --git a/WordPress/WordPressTest/ReaderPostTest.m b/WordPress/WordPressTest/ReaderPostTest.m
@@ -4,13 +4,28 @@
 @import WordPressShared;
 
 @interface ReaderPostTest : XCTestCase
+
+@property (nonatomic, strong) id<CoreDataStack> coreDataStack;
+
 @end
 
 @implementation ReaderPostTest
 
+@synthesize coreDataStack = coreDataStack;
+
+- (void)setUp
+{
+    self.coreDataStack = [[TestContextManager alloc] init];
+}
+
+- (void)tearDown
+{
+    self.coreDataStack = nil;
+}
+
 - (void)testSiteIconForDisplay
 {
-    NSManagedObjectContext *context = [[TestContextManager sharedInstance] mainContext];
+    NSManagedObjectContext *context = [self.coreDataStack mainContext];
     ReaderPost *post = [NSEntityDescription insertNewObjectForEntityForName:@"ReaderPost"
                                          inManagedObjectContext:context];
 
@@ -33,7 +48,7 @@ - (void)testSiteIconForDisplay
 
 - (void)testDisplayDate
 {
-    NSManagedObjectContext *context = [[TestContextManager sharedInstance] mainContext];
+    NSManagedObjectContext *context = [self.coreDataStack mainContext];
     ReaderPost *post = [NSEntityDescription insertNewObjectForEntityForName:@"ReaderPost"
                                                      inManagedObjectContext:context];
 
diff --git a/WordPress/WordPressTest/ReaderSelectInterestsCoordinatorTests.swift b/WordPress/WordPressTest/ReaderSelectInterestsCoordinatorTests.swift
@@ -2,9 +2,19 @@ import XCTest
 @testable import WordPress
 
 class ReaderSelectInterestsCoordinatorTests: XCTestCase {
+    private var contextManager: TestContextManager!
+
+    override func setUp() {
+        contextManager = TestContextManager()
+    }
+
+    override func tearDown() {
+        ContextManager.overrideSharedInstance(nil)
+    }
+
     func testisFollowingInterestsReturnsFalse() {
         let store = EphemeralKeyValueDatabase()
-        let service = MockFollowedInterestsService(populateItems: false)
+        let service = MockFollowedInterestsService(populateItems: false, coreDataStack: contextManager)
         let coordinator = ReaderSelectInterestsCoordinator(service: service, store: store, userId: 1)
 
         service.success = true
@@ -22,7 +32,7 @@ class ReaderSelectInterestsCoordinatorTests: XCTestCase {
 
     func testisFollowingInterestsReturnsTrue() {
         let store = EphemeralKeyValueDatabase()
-        let service = MockFollowedInterestsService(populateItems: true)
+        let service = MockFollowedInterestsService(populateItems: true, coreDataStack: contextManager)
         let coordinator = ReaderSelectInterestsCoordinator(service: service, store: store, userId: 1)
 
         let successExpectation = expectation(description: "Fetching of interests succeeds")
@@ -42,7 +52,7 @@ class ReaderSelectInterestsCoordinatorTests: XCTestCase {
 
     func testSaveInterestsTriggersSuccess() {
         let store = EphemeralKeyValueDatabase()
-        let service = MockFollowedInterestsService(populateItems: false)
+        let service = MockFollowedInterestsService(populateItems: false, coreDataStack: contextManager)
         let coordinator = ReaderSelectInterestsCoordinator(service: service, store: store, userId: nil)
 
         let successExpectation = expectation(description: "Saving of interests callback returns true")
@@ -58,7 +68,7 @@ class ReaderSelectInterestsCoordinatorTests: XCTestCase {
 
     func testSaveInterestsTriggersFailure() {
         let store = EphemeralKeyValueDatabase()
-        let service = MockFollowedInterestsService(populateItems: false)
+        let service = MockFollowedInterestsService(populateItems: false, coreDataStack: contextManager)
         let coordinator = ReaderSelectInterestsCoordinator(service: service, store: store, userId: nil)
 
         service.success = false
@@ -86,14 +96,13 @@ class MockFollowedInterestsService: ReaderFollowedInterestsService {
 
     private let failureError = NSError(domain: "org.wordpress.reader-tests", code: 1, userInfo: nil)
 
-    private var testContextManager: CoreDataStack?
-    private var context: NSManagedObjectContext!
-
-    init(populateItems: Bool) {
-
-        testContextManager = TestContextManager.sharedInstance()
-        context = testContextManager?.mainContext
+    private var coreDataStack: CoreDataStack?
+    private var context: NSManagedObjectContext! {
+        coreDataStack?.mainContext
+    }
 
+    init(populateItems: Bool, coreDataStack: CoreDataStack) {
+        self.coreDataStack = coreDataStack
         self.populateItems = populateItems
     }
 
diff --git a/WordPress/WordPressTest/ReaderStreamViewControllerTests.swift b/WordPress/WordPressTest/ReaderStreamViewControllerTests.swift
@@ -3,10 +3,19 @@ import XCTest
 @testable import WordPress
 
 class ReaderStreamViewControllerTests: XCTestCase {
+    private var contextManager: TestContextManager!
+
+    override func setUp() {
+        contextManager = TestContextManager()
+    }
+
+    override func tearDown() {
+        ContextManager.overrideSharedInstance(nil)
+    }
 
     // Tests that a ReaderStreamViewController is returned
     func testControllerWithTopic() {
-        let context = TestContextManager.sharedInstance().mainContext
+        let context = contextManager.mainContext
         let topic = NSEntityDescription.insertNewObject(forEntityName: "ReaderTagTopic", into: context) as! ReaderTagTopic
         topic.path = "foo"
 
diff --git a/WordPress/WordPressTest/ReaderTopicServiceTest.swift b/WordPress/WordPressTest/ReaderTopicServiceTest.swift
diff --git a/WordPress/WordPressTest/ReplyToCommentActionTests.swift b/WordPress/WordPressTest/ReplyToCommentActionTests.swift
diff --git a/WordPress/WordPressTest/TestContextManager.h b/WordPress/WordPressTest/TestContextManager.h
diff --git a/WordPress/WordPressTest/TestContextManager.m b/WordPress/WordPressTest/TestContextManager.m
diff --git a/WordPress/WordPressTest/TrashCommentActionTests.swift b/WordPress/WordPressTest/TrashCommentActionTests.swift
diff --git a/WordPress/WordPressTest/ViewRelated/Post/Controllers/PostListViewControllerTests.swift b/WordPress/WordPressTest/ViewRelated/Post/Controllers/PostListViewControllerTests.swift

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class MenuItemsViewControllerTests: XCTestCase {`
`11`	`11`
`12`	`12`	`override func tearDownWithError() throws {`
`13`	`13`	`context = nil`
`14`		`- TestContextManager.overrideSharedInstance(nil)`
	`14`	`+ ContextManager.overrideSharedInstance(nil)`
`15`	`15`	`try super.tearDownWithError()`
`16`	`16`	`}`
`17`	`17`