fixing tests

maplibre · May 14, 2024 · 6653538 · 6653538
1 parent bc75a5a
commit 6653538
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 11 deletions.
diff --git a/Tests/MapLibreSwiftUITests/MapViewCoordinator/MapViewCoordinatorCameraTests.swift b/Tests/MapLibreSwiftUITests/MapViewCoordinator/MapViewCoordinatorCameraTests.swift
@@ -40,8 +40,14 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
                        animated: .value(false))
             .called(count: 1)
 
+        // Due to the .frame == .zero workaround, min/max pitch setting is called twice, once to set the
+        // pitch, and then once to set the actual range.
         verify(maplibreMapView)
             .minimumPitch(newValue: .value(0))
+            .setterCalled(count: 2)
+
+        verify(maplibreMapView)
+            .maximumPitch(newValue: .value(0))
             .setterCalled(count: 1)
 
         verify(maplibreMapView)
@@ -70,10 +76,16 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
                        animated: .value(false))
             .called(count: 1)
 
+        // Due to the .frame == .zero workaround, min/max pitch setting is called twice, once to set the
+        // pitch, and then once to set the actual range.
         verify(maplibreMapView)
             .minimumPitch(newValue: .value(0))
+            .setterCalled(count: 2)
+
+        verify(maplibreMapView)
+            .maximumPitch(newValue: .value(0))
             .setterCalled(count: 1)
-
+        
         verify(maplibreMapView)
             .maximumPitch(newValue: .value(60))
             .setterCalled(count: 1)
@@ -99,10 +111,16 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
                        animated: .any)
             .called(count: 0)
 
+        // Due to the .frame == .zero workaround, min/max pitch setting is called twice, once to set the
+        // pitch, and then once to set the actual range.
         verify(maplibreMapView)
             .minimumPitch(newValue: .value(0))
+            .setterCalled(count: 2)
+
+        verify(maplibreMapView)
+            .maximumPitch(newValue: .value(0))
             .setterCalled(count: 1)
-
+        
         verify(maplibreMapView)
             .maximumPitch(newValue: .value(60))
             .setterCalled(count: 1)
@@ -128,10 +146,16 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
                        animated: .any)
             .called(count: 0)
 
+        // Due to the .frame == .zero workaround, min/max pitch setting is called twice, once to set the
+        // pitch, and then once to set the actual range.
         verify(maplibreMapView)
             .minimumPitch(newValue: .value(0))
+            .setterCalled(count: 2)
+
+        verify(maplibreMapView)
+            .maximumPitch(newValue: .value(0))
             .setterCalled(count: 1)
-
+        
         verify(maplibreMapView)
             .maximumPitch(newValue: .value(60))
             .setterCalled(count: 1)
@@ -157,10 +181,16 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
                        animated: .any)
             .called(count: 0)
 
+        // Due to the .frame == .zero workaround, min/max pitch setting is called twice, once to set the
+        // pitch, and then once to set the actual range.
         verify(maplibreMapView)
             .minimumPitch(newValue: .value(0))
+            .setterCalled(count: 2)
+
+        verify(maplibreMapView)
+            .maximumPitch(newValue: .value(0))
             .setterCalled(count: 1)
-
+        
         verify(maplibreMapView)
             .maximumPitch(newValue: .value(60))
             .setterCalled(count: 1)

diff --git a/...iftUITests/Models/MapCamera/__Snapshots__/CameraStateTests/testTrackingUserLocation.1.txt b/...iftUITests/Models/MapCamera/__Snapshots__/CameraStateTests/testTrackingUserLocation.1.txt
@@ -1 +1 @@
-CameraState.trackingUserLocation(zoom: (4.0, 0.0, MapLibreSwiftUI.CameraPitch.free, 12.0))
+CameraState.trackingUserLocation(zoom: (4.0, 0.0, MapLibreSwiftUI.CameraPitchRange.free, 12.0))
diff --git a/.../Models/MapCamera/__Snapshots__/CameraStateTests/testTrackingUserLocationWithCourse.1.txt b/.../Models/MapCamera/__Snapshots__/CameraStateTests/testTrackingUserLocationWithCourse.1.txt
@@ -1 +1 @@
-CameraState.trackingUserLocationWithCourse(zoom: (4.0, 0.0, MapLibreSwiftUI.CameraPitch.free))
+CameraState.trackingUserLocationWithCourse(zoom: (4.0, 0.0, MapLibreSwiftUI.CameraPitchRange.free))
diff --git a/...Models/MapCamera/__Snapshots__/CameraStateTests/testTrackingUserLocationWithHeading.1.txt b/...Models/MapCamera/__Snapshots__/CameraStateTests/testTrackingUserLocationWithHeading.1.txt
@@ -1 +1 @@
-CameraState.trackingUserLocationWithHeading(zoom: (4.0, 0.0, MapLibreSwiftUI.CameraPitch.free))
+CameraState.trackingUserLocationWithHeading(zoom: (4.0, 0.0, MapLibreSwiftUI.CameraPitchRange.free))
diff --git a/...ibreSwiftUITests/Models/MapCamera/__Snapshots__/MapViewCameraTests/testCenterCamera.1.txt b/...ibreSwiftUITests/Models/MapCamera/__Snapshots__/MapViewCameraTests/testCenterCamera.1.txt
@@ -7,5 +7,5 @@
         - longitude: 23.4
       - zoom: 5.0
       - pitch: 12.0
-      - pitchRange: CameraPitch.free
+      - pitchRange: CameraPitchRange.free
       - direction: 23.0
diff --git a/...s/Models/MapCamera/__Snapshots__/MapViewCameraTests/testTrackUserLocationWithCourse.1.txt b/...s/Models/MapCamera/__Snapshots__/MapViewCameraTests/testTrackUserLocationWithCourse.1.txt
@@ -5,7 +5,7 @@
     ▿ trackingUserLocationWithCourse: (3 elements)
       - zoom: 18.0
       - pitch: 0.0
-      ▿ pitchRange: CameraPitch
+      ▿ pitchRange: CameraPitchRange
         ▿ freeWithinRange: (2 elements)
           - minimum: 12.0
           - maximum: 34.0
diff --git a/.../Models/MapCamera/__Snapshots__/MapViewCameraTests/testTrackUserLocationWithHeading.1.txt b/.../Models/MapCamera/__Snapshots__/MapViewCameraTests/testTrackUserLocationWithHeading.1.txt
@@ -5,4 +5,4 @@
     ▿ trackingUserLocationWithHeading: (3 elements)
       - zoom: 10.0
       - pitch: 0.0
-      - pitchRange: CameraPitch.free
+      - pitchRange: CameraPitchRange.free
diff --git a/...tUITests/Models/MapCamera/__Snapshots__/MapViewCameraTests/testTrackingUserLocation.1.txt b/...tUITests/Models/MapCamera/__Snapshots__/MapViewCameraTests/testTrackingUserLocation.1.txt
@@ -5,7 +5,7 @@
     ▿ trackingUserLocation: (4 elements)
       - zoom: 10.0
       - pitch: 0.0
-      ▿ pitchRange: CameraPitch
+      ▿ pitchRange: CameraPitchRange
         ▿ freeWithinRange: (2 elements)
           - minimum: 12.0
           - maximum: 34.0