From 2ce70f7335445155b6cde9066b01eb24c1101b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Mon, 25 Feb 2019 14:29:18 +0100
Subject: [android] verify no native method is called when saving state

---
 .../java/com/mapbox/mapboxsdk/maps/MapView.java    |  2 +-
 .../mapbox/mapboxsdk/maps/SupportMapFragment.java  |  4 ++--
 .../com/mapbox/mapboxsdk/maps/MapboxMapTest.kt     | 26 +++++++++-------------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 9d8dbce289..6c25379183 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -500,7 +500,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    */
   @UiThread
   public void onLowMemory() {
-    if (nativeMapView != null) {
+    if (nativeMapView != null && !destroyed) {
       nativeMapView.onLowMemory();
     }
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
index cda59380a9..e3155c417b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -161,7 +161,7 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
   @Override
   public void onSaveInstanceState(@NonNull Bundle outState) {
     super.onSaveInstanceState(outState);
-    if (map != null && !map.isDestroyed()) {
+    if (map != null) {
       map.onSaveInstanceState(outState);
     }
   }
@@ -181,7 +181,7 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
   @Override
   public void onLowMemory() {
     super.onLowMemory();
-    if (map != null && !map.isDestroyed()) {
+    if (map != null) {
       map.onLowMemory();
     }
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
index 2426c42f53..a0873e97ff 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
@@ -5,10 +5,7 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
 import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.geometry.LatLngBounds
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.spyk
-import io.mockk.verify
+import io.mockk.*
 import junit.framework.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -27,19 +24,11 @@ class MapboxMapTest {
     @Before
     fun setup() {
         val cameraChangeDispatcher = spyk<CameraChangeDispatcher>()
-        nativeMapView = mockk()
-        transform = mockk()
-        mapboxMap = MapboxMap(nativeMapView, transform, null, null, null, cameraChangeDispatcher)
-        every { nativeMapView.styleUrl = any() } answers {}
-        every { nativeMapView.transitionOptions = any() } answers {}
+        nativeMapView = mockk(relaxed = true)
+        transform = mockk(relaxed = true)
+        mapboxMap = MapboxMap(nativeMapView, transform, mockk(relaxed = true), null, null, cameraChangeDispatcher)
         every { nativeMapView.isDestroyed } returns false
-        every { nativeMapView.setOnFpsChangedListener(any()) } answers {}
-        every { nativeMapView.prefetchTiles = any() } answers {}
         every { nativeMapView.nativePtr } returns 5
-        every { nativeMapView.setLatLngBounds(any()) } answers {}
-        every { transform.minZoom = any() } answers {}
-        every { transform.maxZoom = any() } answers {}
-        every { transform.moveCamera(any(), any(), any()) } answers {}
         mapboxMap.injectLocationComponent(spyk())
         mapboxMap.setStyle(Style.MAPBOX_STREETS)
         mapboxMap.onFinishLoadingStyle()
@@ -108,4 +97,11 @@ class MapboxMapTest {
     fun testGetNativeMapPtr() {
         assertEquals(5, mapboxMap.nativeMapPtr)
     }
+
+  @Test
+  fun testNativeMapIsNotCalledOnStateSave() {
+    clearMocks(nativeMapView)
+    mapboxMap.onSaveInstanceState(mockk(relaxed = true))
+    verify { nativeMapView wasNot Called }
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.1