Merge pull request #680 from Esri/v.next

Merge `v.next` into `main`
Esri · Apr 12, 2024 · 7b35539 · 7b35539
2 parents a01f570 + 7b7a5ea
commit 7b35539
Show file tree

Hide file tree

Showing 32 changed files with 7 additions and 148 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/Package.swift b/Package.swift
@@ -30,8 +30,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/Esri/arcgis-maps-sdk-swift", .upToNextMinor(from: "200.4.0")),
-        .package(url: "https://github.com/Esri/Dejavu", .upToNextMinor(from: "1.0.0"))
+        .package(url: "https://github.com/Esri/arcgis-maps-sdk-swift", .upToNextMinor(from: "200.4.0"))
     ],
     targets: [
         .target(
@@ -45,7 +44,7 @@ let package = Package(
         ),
         .testTarget(
             name: "ArcGISToolkitTests",
-            dependencies: ["ArcGISToolkit", "Dejavu"]
+            dependencies: ["ArcGISToolkit"]
         )
     ]
 )
diff --git a/Tests/ArcGISToolkitTests/BookmarksTests.swift b/Tests/ArcGISToolkitTests/BookmarksTests.swift
@@ -17,7 +17,7 @@ import SwiftUI
 import XCTest
 @testable import ArcGISToolkit
 
-final class BookmarksTests: DejavuTestCase {
+final class BookmarksTests: XCTestCase {
     /// Asserts that the list properly handles a selection when provided a modifier.
     func testSelectBookmarkWithModifier() {
         let expectation = XCTestExpectation(

diff --git a/Tests/ArcGISToolkitTests/FloorFilterViewModelTests.swift b/Tests/ArcGISToolkitTests/FloorFilterViewModelTests.swift
@@ -19,7 +19,7 @@ import XCTest
 @testable import ArcGISToolkit
 
 @MainActor
-final class FloorFilterViewModelTests: DejavuTestCase {
+final class FloorFilterViewModelTests: XCTestCase {
     /// Confirms that the selected site/facility/level properties and the viewpoint are correctly updated.
     func testAutoSelectAlways() async throws {
         let floorManager = try await floorManager(

diff --git a/Tests/ArcGISToolkitTests/LocatorSearchSourceTests.swift b/Tests/ArcGISToolkitTests/LocatorSearchSourceTests.swift
@@ -16,7 +16,7 @@ import XCTest
 import ArcGIS
 import ArcGISToolkit
 
-final class LocatorSearchSourceTests: DejavuTestCase {
+final class LocatorSearchSourceTests: XCTestCase {
     func testMaximumResults() async throws {
         let locator = LocatorSearchSource()
         locator.maximumResults = 4

diff --git a/Tests/ArcGISToolkitTests/SearchViewModelTests.swift b/Tests/ArcGISToolkitTests/SearchViewModelTests.swift
@@ -17,7 +17,7 @@ import ArcGIS
 @testable import ArcGISToolkit
 
 @MainActor
-class SearchViewModelTests: DejavuTestCase {
+class SearchViewModelTests: XCTestCase {
     func testAcceptSuggestion() async throws {
         let model = SearchViewModel(sources: [LocatorSearchSource()])
         model.currentQuery = "Magers & Quinn Booksellers"

diff --git a/Tests/ArcGISToolkitTests/SmartLocatorSearchSourceTests.swift b/Tests/ArcGISToolkitTests/SmartLocatorSearchSourceTests.swift
@@ -16,7 +16,7 @@ import XCTest
 import ArcGIS
 import ArcGISToolkit
 
-final class SmartLocatorSearchSourceTests: DejavuTestCase {
+final class SmartLocatorSearchSourceTests: XCTestCase {
     func testRepeatSearchResultThreshold() async throws {
         let locator = SmartLocatorSearchSource()
 

diff --git a/...t Support/Data/Network Mocking/BookmarksTests/testSelectBookmarkWithModifierAndMap.sqlite b/...t Support/Data/Network Mocking/BookmarksTests/testSelectBookmarkWithModifierAndMap.sqlite
diff --git a/...s/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testAutoSelectAlways.sqlite b/...s/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testAutoSelectAlways.sqlite
diff --git a/...ort/Data/Network Mocking/FloorFilterViewModelTests/testAutoSelectAlwaysNotClearing.sqlite b/...ort/Data/Network Mocking/FloorFilterViewModelTests/testAutoSelectAlwaysNotClearing.sqlite
diff --git a/...ts/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testAutoSelectNever.sqlite b/...ts/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testAutoSelectNever.sqlite
diff --git a/...ata/Network Mocking/FloorFilterViewModelTests/testInitWithFloorManagerAndViewpoint.sqlite b/...ata/Network Mocking/FloorFilterViewModelTests/testInitWithFloorManagerAndViewpoint.sqlite
diff --git a/...ts/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testLevelVisibility.sqlite b/...ts/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testLevelVisibility.sqlite
diff --git a/...Test Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectedProperties.sqlite b/...Test Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectedProperties.sqlite
diff --git a/...est Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectionOfFacility.sqlite b/...est Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectionOfFacility.sqlite
diff --git a/...s/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectionOfLevel.sqlite b/...s/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectionOfLevel.sqlite
diff --git a/...ts/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectionOfSite.sqlite b/...ts/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testSelectionOfSite.sqlite
diff --git a/...s/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testViewpointUpdates.sqlite b/...s/Test Support/Data/Network Mocking/FloorFilterViewModelTests/testViewpointUpdates.sqlite
diff --git a/...ests/Test Support/Data/Network Mocking/LocatorSearchSourceTests/testMaximumResults.sqlite b/...ests/Test Support/Data/Network Mocking/LocatorSearchSourceTests/testMaximumResults.sqlite
diff --git a/.../Test Support/Data/Network Mocking/LocatorSearchSourceTests/testMaximumSuggestions.sqlite b/.../Test Support/Data/Network Mocking/LocatorSearchSourceTests/testMaximumSuggestions.sqlite
diff --git a/...tTests/Test Support/Data/Network Mocking/SearchViewModelTests/testAcceptSuggestion.sqlite b/...tTests/Test Support/Data/Network Mocking/SearchViewModelTests/testAcceptSuggestion.sqlite
diff --git a/...olkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testCommitSearch.sqlite b/...olkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testCommitSearch.sqlite
diff --git a/...olkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testCurrentQuery.sqlite b/...olkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testCurrentQuery.sqlite
diff --git a/...ts/Test Support/Data/Network Mocking/SearchViewModelTests/testIsEligibleForRequery.sqlite b/...ts/Test Support/Data/Network Mocking/SearchViewModelTests/testIsEligibleForRequery.sqlite
diff --git a/...SToolkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testQueryArea.sqlite b/...SToolkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testQueryArea.sqlite
diff --git a/...oolkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testQueryCenter.sqlite b/...oolkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testQueryCenter.sqlite
diff --git a/...olkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testRepeatSearch.sqlite b/...olkitTests/Test Support/Data/Network Mocking/SearchViewModelTests/testRepeatSearch.sqlite
diff --git a/...tTests/Test Support/Data/Network Mocking/SearchViewModelTests/testSearchResultMode.sqlite b/...tTests/Test Support/Data/Network Mocking/SearchViewModelTests/testSearchResultMode.sqlite
diff --git a/...Tests/Test Support/Data/Network Mocking/SearchViewModelTests/testUpdateSuggestions.sqlite b/...Tests/Test Support/Data/Network Mocking/SearchViewModelTests/testUpdateSuggestions.sqlite
diff --git a/...Data/Network Mocking/SmartLocatorSearchSourceTests/testRepeatSearchResultThreshold.sqlite b/...Data/Network Mocking/SmartLocatorSearchSourceTests/testRepeatSearchResultThreshold.sqlite
diff --git a/...ata/Network Mocking/SmartLocatorSearchSourceTests/testRepeatSuggestResultThreshold.sqlite b/...ata/Network Mocking/SmartLocatorSearchSourceTests/testRepeatSuggestResultThreshold.sqlite
diff --git a/Tests/ArcGISToolkitTests/Test Support/DejavuTestCase.swift b/Tests/ArcGISToolkitTests/Test Support/DejavuTestCase.swift