[ios][tests] Remove multiple tilestores usage from tests, cleanup between tests.

GitOrigin-RevId: 32d18b02133cab313f28e21852e560fabdce1ec3

Author: tatiana-yan

Tests/MapboxMapsTests/Integration Tests/MapViewIntegrationTestCase.swift

@@ -17,17 +17,6 @@ internal class MapViewIntegrationTestCase: IntegrationTestCase {
 
         dataPathURL = try temporaryCacheDirectory()
 
-        // allow multiple tilestore folders
-        let ss = SettingsServiceFactory.getInstance(storageType: SettingsServiceStorageType.nonPersistent)
-        let result = ss.set(key: "com.mapbox.common.tilestore.allow_multiple", value: true)
-        switch result {
-        case .success:
-            print("Allowed multiple tilestores")
-
-        case .failure(let error):
-            print("Error allowing multiple tilestores: \(String(describing: error.errorDescription))")
-        }
-
         guard let window = window,
               let rootView = rootViewController?.view else {
             XCTFail("No valid UIWindow or root view controller")

Tests/MapboxMapsTests/Integration Tests/OfflineManagerIntegrationTests.swift

@@ -19,11 +19,10 @@ final class OfflineManagerIntegrationTestCase: IntegrationTestCase {
     func setupTileStoreAndOfflineManager() throws {
         tileRegionId = "tile-region-\(name)"
 
-        // TileStore
-        tileStorePathURL = try temporaryCacheDirectory()
-
-        // Cache the created tile store
-        tileStore = TileStore.shared(for: tileStorePathURL)
+        tileStore = TileStore.default
+        let ss = SettingsServiceFactory.getInstance(storageType: SettingsServiceStorageType.nonPersistent)
+        let pathResult = ss.getForKey("com.mapbox.common.tilestore.location")
+        tileStorePathURL = pathResult.isValue() ? (pathResult.value as? String).flatMap({ URL(string: $0) }) : nil
 
         MapboxMapsOptions.dataPath = tileStorePathURL
         MapboxMapsOptions.tileStore = tileStore
@@ -45,19 +44,33 @@ final class OfflineManagerIntegrationTestCase: IntegrationTestCase {
     }
 
     override func tearDownWithError() throws {
+        // Remove tile region before releasing the tile store to prevent
+        // stale regions from leaking into subsequent tests.
+        if let tileStore = tileStore, !tileRegionId.isEmpty {
+            let removeExpectation = expectation(description: "Remove tile region")
+            tileStore.removeTileRegion(forId: tileRegionId)
+            // Force eviction of tile data, then restore default quota
+            tileStore.setOptionForKey(TileStoreOptions.diskQuota, value: 0)
+            tileStore.allTileRegions { _ in
+                removeExpectation.fulfill()
+            }
+            wait(for: [removeExpectation], timeout: 10.0)
+            tileStore.setOptionForKey(TileStoreOptions.diskQuota, value: NSNull())
+        }
+
         tileRegionLoadOptions = nil
         offlineManager = nil
         tileStore = nil
-        clearMapData()
-        try super.tearDownWithError()
-    }
 
-    private func clearMapData() {
-        let expectation = self.expectation(description: "Clear map data")
+        let clearDataExpectation = expectation(description: "Clear map data")
         MapboxMapsOptions.clearData { _ in
-            expectation.fulfill()
+            clearDataExpectation.fulfill()
         }
-        wait(for: [expectation], timeout: 10.0)
+        wait(for: [clearDataExpectation], timeout: 10.0)
+
+        tileStorePathURL = nil
+
+        try super.tearDownWithError()
     }
 
     // MARK: Test Cases

Tests/MapboxMapsTests/MigrationGuide/OfflineGuideIntegrationTests.swift

@@ -15,14 +15,32 @@ class OfflineGuideIntegrationTests: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
 
-        tileStorePathURL = try temporaryCacheDirectory()
-        tileStore = TileStore.shared(for: tileStorePathURL)
+        tileStore = TileStore.default
+        let ss = SettingsServiceFactory.getInstance(storageType: SettingsServiceStorageType.nonPersistent)
+        let pathResult = ss.getForKey("com.mapbox.common.tilestore.location")
+        tileStorePathURL = pathResult.isValue() ? (pathResult.value as? String).flatMap({ URL(string: $0) }) : nil
     }
 
     override func tearDownWithError() throws {
         try super.tearDownWithError()
 
+        // Remove all tile regions to prevent stale regions from leaking
+        // into subsequent tests.
+        let cleanupExpectation = expectation(description: "Tile regions cleanup")
+        tileStore.allTileRegions { result in
+            if case let .success(regions) = result {
+                for region in regions {
+                    self.tileStore.removeTileRegion(forId: region.id)
+                }
+            }
+            self.tileStore.setOptionForKey(TileStoreOptions.diskQuota, value: 0)
+            self.tileStore.setOptionForKey(TileStoreOptions.diskQuota, value: NSNull())
+            cleanupExpectation.fulfill()
+        }
+        wait(for: [cleanupExpectation], timeout: 10.0)
+
         tileStore = nil
+        MapboxMapsOptions.tileStore = nil
     }
 
     // Test StylePackLoadOptions

Tests/MapboxMapsTests/Style/AttributionTests.swift

@@ -5,6 +5,16 @@ import UIKit
 
 class AttributionTests: XCTestCase {
 
+    override func tearDownWithError() throws {
+        let clearDataExpectation = expectation(description: "Clear map data")
+        MapboxMapsOptions.clearData { _ in
+            clearDataExpectation.fulfill()
+        }
+        wait(for: [clearDataExpectation], timeout: 10.0)
+        MapboxMapsOptions.tileStore = nil
+        try super.tearDownWithError()
+    }
+
     func testActionableAttributionParsing() {
         let attributionsHTML = """
   <a href=\"https://www.mapbox.com/about/maps/\" target=\"_blank\" title=\"Mapbox\" aria-label=\"Mapbox\" role=\"listitem\">&copy; Mapbox</a>