Refactor FXIOS-10145 - Update how we are tearing down our tests

BrowserKit/Tests/CommonTests/LoggerTests/CrashManagerTests.swift

@@ -15,9 +15,9 @@ final class CrashManagerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         sentryWrapper = nil
         setupAppInformation(buildChannel: .other)
+        super.tearDown()
     }
 
     // MARK: - Setup

BrowserKit/Tests/CommonTests/LoggerTests/LoggerFileManagerTests.swift

@@ -16,9 +16,9 @@ final class LoggerFileManagerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         subject = nil
         fileManager = nil
+        super.tearDown()
     }
 
     func testExpectedLogDestination() throws {

BrowserKit/Tests/CommonTests/LoggerTests/LoggerTests.swift

@@ -17,10 +17,10 @@ final class LoggerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         beaverBuilder = nil
         crashManager = nil
         cleanUp()
+        super.tearDown()
     }
 
     // MARK: - Log

BrowserKit/Tests/ContentBlockingGeneratorTests/ContentBlockerGeneratorTests.swift

@@ -16,9 +16,9 @@ final class ContentBlockerGeneratorTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.fileManager = nil
         self.parserData = nil
+        super.tearDown()
     }
 
     func testGenerator_whenEmptyFiles_generateNothing() {

BrowserKit/Tests/ContentBlockingGeneratorTests/ContentBlockerParserTests.swift

@@ -14,8 +14,8 @@ final class ContentBlockerParserTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.parserData = nil
+        super.tearDown()
     }
 
     func testParsingAdsFile() throws {

BrowserKit/Tests/ReduxTests/ReduxIntegrationTests.swift

@@ -20,8 +20,8 @@ final class ReduxIntegrationTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         fakeViewController = nil
+        super.tearDown()
     }
 
     func testDispatchStore_IncreaseCounter() {

BrowserKit/Tests/SiteImageViewTests/FaviconURLProcessing/FaviconURLCacheTests.swift

@@ -16,9 +16,9 @@ class FaviconURLCacheTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockFileManager = nil
         subject = nil
+        super.tearDown()
     }
 
     func testGetURLFromCacheWithEmptyCache() async {

BrowserKit/Tests/SiteImageViewTests/FaviconURLProcessing/FaviconURLFetcherTests.swift

@@ -16,9 +16,9 @@ class FaviconURLFetcherTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         networkMock = nil
         subject = nil
+        super.tearDown()
     }
 
     func testGetFaviconWithExistingIcon() async {

BrowserKit/Tests/SiteImageViewTests/FaviconURLProcessing/URLCacheFileManagerTests.swift

@@ -17,9 +17,9 @@ class URLCacheFileManagerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockFileManager = nil
         subject = nil
+        super.tearDown()
     }
 
     func testGetURLCache() async {

BrowserKit/Tests/SiteImageViewTests/ImageProcessing/FaviconFetcherTests.swift

@@ -16,8 +16,8 @@ final class FaviconFetcherTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.mockImageDownloader = nil
+        super.tearDown()
     }
 
     func testReturnsFailure_onAnyError() async {

BrowserKit/Tests/SiteImageViewTests/ImageProcessing/HeroImageFetcherTests.swift

@@ -15,8 +15,8 @@ final class HeroImageFetcherTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.metadataProvider = nil
+        super.tearDown()
     }
 
     func testHeroImageLoading_whenError_throwsError() async {

BrowserKit/Tests/SiteImageViewTests/ImageProcessing/ImageHandlerTests.swift

@@ -24,11 +24,11 @@ final class ImageHandlerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.heroImageFetcher = nil
         self.siteImageCache = nil
         self.faviconFetcher = nil
         self.letterImageGenerator = nil
+        super.tearDown()
     }
 
     // MARK: - Favicon

BrowserKit/Tests/SiteImageViewTests/ImageProcessing/SiteImageCacheTests.swift

@@ -15,8 +15,8 @@ final class SiteImageCacheTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.imageCache = nil
+        super.tearDown()
     }
 
     // MARK: - Get from cache

BrowserKit/Tests/SiteImageViewTests/SiteImageHandlerTests.swift

@@ -16,9 +16,9 @@ final class SiteImageHandlerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.urlHandler = nil
         self.imageHandler = nil
+        super.tearDown()
     }
 
     // MARK: - Favicon

BrowserKit/Tests/SiteImageViewTests/SiteImageViewTests.swift

@@ -14,8 +14,8 @@ final class SiteImageViewTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.imageFetcher = nil
+        super.tearDown()
     }
 
     func testFaviconSetup() {

BrowserKit/Tests/TabDataStoreTests/TabDataStoreTests.swift

@@ -17,8 +17,8 @@ final class TabDataStoreTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockFileManager = nil
+        super.tearDown()
     }
 
     // MARK: - Saving Data

BrowserKit/Tests/TabDataStoreTests/TabSessionStoreTests.swift

@@ -15,8 +15,8 @@ final class TabSessionStoreTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockFileManager = nil
+        super.tearDown()
     }
 
     // MARK: Save

BrowserKit/Tests/WebEngineTests/AdsTelemetryContentScriptTests.swift

@@ -14,8 +14,8 @@ final class AdsTelemetryContentScriptTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         adsTelemetryDelegate = nil
+        super.tearDown()
     }
 
     func testDidReceiveMessageGivenEmptyMessageThenNoDelegateCalled() {

BrowserKit/Tests/WebEngineTests/FindInPageContentScriptTests.swift

@@ -14,8 +14,8 @@ final class FindInPageContentScriptTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         findInPageDelegate = nil
+        super.tearDown()
     }
 
     func testDidReceiveMessageGivenEmptyMessageThenNoDelegateCalled() {

BrowserKit/Tests/WebEngineTests/MetadataFetcherHelperTests.swift

@@ -14,8 +14,8 @@ final class MetadataFetcherHelperTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         metadataDelegate = nil
+        super.tearDown()
     }
 
     func testFetchFromSessionGivenNotWebpageURLThenPageMetadataNil() {

BrowserKit/Tests/WebEngineTests/WKContentScriptManagerTests.swift

@@ -14,8 +14,8 @@ final class WKContentScriptManagerTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         script = nil
+        super.tearDown()
     }
 
     func testAddContentGivenAddedTwiceThenOnlyAddOnce() {

BrowserKit/Tests/WebEngineTests/WKEngineSessionTests.swift

@@ -27,14 +27,14 @@ final class WKEngineSessionTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         configurationProvider = nil
         webViewProvider = nil
         contentScriptManager = nil
         userScriptManager = nil
         engineSessionDelegate = nil
         findInPageDelegate = nil
         metadataFetcher = nil
+        super.tearDown()
     }
 
     // MARK: Load URL

BrowserKit/Tests/WebEngineTests/WKEngineTests.swift

@@ -14,8 +14,8 @@ final class WKEngineTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         userScriptManager = nil
+        super.tearDown()
     }
 
     func testCreateViewThenCreatesView() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Application/AppSendTabDelegateTests.swift

@@ -16,9 +16,9 @@ final class AppFxACommandsTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.applicationStateProvider = nil
         self.applicationHelper = nil
+        super.tearDown()
     }
 
     func testOpenSendTabs_inactiveState_doesntCallDeeplink() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Autofill/FormAutofillHelperTests.swift

@@ -78,7 +78,6 @@ class FormAutofillHelperTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         profile = nil
         DependencyHelperMock().reset()
         tab = nil
@@ -87,6 +86,7 @@ class FormAutofillHelperTests: XCTestCase {
         validPayloadCaptureMockWKMessage = nil
         secureFrameMock = nil
         secureWebviewMock = nil
+        super.tearDown()
     }
 
     // MARK: Parsing

firefox-ios/firefox-ios-tests/Tests/ClientTests/BreachAlertsTests.swift

@@ -68,8 +68,8 @@ class BreachAlertsTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         breachAlertsManager = nil
+        super.tearDown()
     }
 
     func testDataRequest() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewControllerStateTests.swift

@@ -14,8 +14,8 @@ final class BrowserViewControllerStateTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         DependencyHelperMock().reset()
+        super.tearDown()
     }
 
     func testAddNewTabAction() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/CanRemoveQuickActionBookmarkTests.swift

@@ -21,10 +21,10 @@ class CanRemoveQuickActionBookmarkTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         mockQuickActions = nil
         mockBookmarksHandler = nil
         subject = nil
+        super.tearDown()
     }
 
     func testWithoutBookmarks() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/ContextMenuHelperTests.swift

@@ -23,9 +23,9 @@ class ContextMenuHelperTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         profile = nil
         AppContainer.shared.reset()
+        super.tearDown()
     }
 
     func testHistoryHighlightsTelemetry() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/BaseCoordinatorTests.swift

@@ -16,9 +16,9 @@ final class BaseCoordinatorTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         navigationController = nil
         router = nil
+        super.tearDown()
     }
 
     func testAddChild() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/DefaultRouterTests.swift

@@ -14,8 +14,8 @@ final class DefaultRouterTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         navigationController = nil
+        super.tearDown()
     }
 
     func testInitialState() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/EnhancedTrackingProtectionCoordinatorTests.swift

@@ -28,14 +28,14 @@ final class EnhancedTrackingProtectionCoordinatorTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.routeBuilder = nil
         self.mockRouter = nil
         self.profile = nil
         self.tabManager = nil
         self.glean = nil
         self.delegate = nil
         AppContainer.shared.reset()
+        super.tearDown()
     }
 
     func testParentCoordinatorDelegate_calledWithPage() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/FakespotCoordinatorTests.swift

@@ -22,10 +22,10 @@ final class FakespotCoordinatorTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         self.profile = nil
         self.mockRouter = nil
         AppContainer.shared.reset()
+        super.tearDown()
     }
 
     func testInitialState() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/Launch/LaunchCoordinatorTests.swift

@@ -22,11 +22,11 @@ final class LaunchCoordinatorTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         profile = nil
         mockRouter = nil
         delegate = nil
         AppContainer.shared.reset()
+        super.tearDown()
     }
 
     func testInitialState() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/Launch/LaunchTypeTests.swift

@@ -15,8 +15,8 @@ final class LaunchTypeTests: XCTestCase {
     }
 
     override func tearDown() {
-        super.tearDown()
         AppContainer.shared.reset()
+        super.tearDown()
     }
 
     func testCanLaunch_surveyFromBrowserCoordinator() {