merged two method and tests updates

Author: Ayan-10

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

@@ -486,22 +486,30 @@ public void onResume() {
         if (isResumed() && ((MainActivity)getActivity()).activeFragment == ActiveFragment.NEARBY) {
             if(!isPermissionDenied && !applicationKvStore.getBoolean("doNotAskForLocationPermission", false)){
                 if (!locationManager.isGPSProviderEnabled()) {
-                    startMapWithoutGPS();
+                    startMapWithCondition("Without GPS");
                 } else {
                     startTheMap();
                 }
             }else{
-                startMapWithoutPermission();
+                startMapWithCondition("Without Permission");
             }
         }
     }
 
     /**
-     * Starts the map without GPS
-     * By default it points to 51.50550,-0.07520 this coordinates
+     * Starts the map without GPS and without permission
+     * By default it points to 51.50550,-0.07520 coordinates, other than that it points to the
+     * last known location which can be get by the key "LastLocation" from applicationKvStore
+     *
+     * @param condition : for which condition the map should start
      */
-    private void startMapWithoutGPS() {
+    private void startMapWithCondition(final String condition) {
         mapView.onStart();
+
+        if (condition.equals("Without Permission")) {
+            applicationKvStore.putBoolean("doNotAskForLocationPermission", true);
+        }
+
         final CameraPosition position;
         if (applicationKvStore.getString("LastLocation")!=null) {
             final String[] locationLatLng
@@ -531,33 +539,6 @@ private void startMapWithoutGPS() {
         }
     }
 
-    private void startMapWithoutPermission() {
-        mapView.onStart();
-
-        applicationKvStore.putBoolean("doNotAskForLocationPermission", true);
-        final CameraPosition position;
-        if(applicationKvStore.getString("LastLocation")!=null) { // Checking for last searched location
-            String[] locationLatLng = applicationKvStore.getString("LastLocation").split(",");
-            lastKnownLocation = new fr.free.nrw.commons.location.LatLng(Double.valueOf(locationLatLng[0]), Double.valueOf(locationLatLng[1]), 1f);
-            position = new CameraPosition.Builder()
-                .target(LocationUtils.commonsLatLngToMapBoxLatLng(lastKnownLocation))
-                .zoom(ZOOM_LEVEL)
-                .build();
-        }else {
-            lastKnownLocation = new fr.free.nrw.commons.location.LatLng(51.50550,-0.07520,1f);
-            position = new CameraPosition.Builder()
-                .target(LocationUtils.commonsLatLngToMapBoxLatLng(lastKnownLocation))
-                .zoom(ZOOM_OUT)
-                .build();
-        }
-        if(mapBox != null){
-            mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
-            addOnCameraMoveListener();
-            presenter.onMapReady();
-            removeCurrentLocationMarker();
-        }
-    }
-
     private void registerNetworkReceiver() {
         if (getActivity() != null) {
             getActivity().registerReceiver(broadcastReceiver, intentFilter);

app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt

@@ -54,10 +54,11 @@ class NearbyParentFragmentUnitTest {
     @Throws(Exception::class)
     fun `Start map without gps test when last location known`() {
         val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(
-            "startMapWithoutGPS"
+            "startMapWithCondition",
+            String::class.java
         )
         method.isAccessible = true
-        method.invoke(fragment)
+        method.invoke(fragment, "Without GPS")
         verify(mapView, times(1)).onStart()
         verify(applicationKvStore, times(1)).getString("LastLocation")
         verify(presenter, times(1)).onMapReady()
@@ -77,10 +78,11 @@ class NearbyParentFragmentUnitTest {
     fun `Start map without gps test when last location unknown`() {
         `when`(applicationKvStore.getString("LastLocation")).thenReturn("23.76,56.876")
         val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(
-            "startMapWithoutGPS"
+            "startMapWithCondition",
+            String::class.java
         )
         method.isAccessible = true
-        method.invoke(fragment)
+        method.invoke(fragment, "Without GPS")
         verify(mapView, times(1)).onStart()
         verify(applicationKvStore, times(2)).getString("LastLocation")
         verify(presenter, times(1)).onMapReady()
@@ -94,4 +96,55 @@ class NearbyParentFragmentUnitTest {
         verify(mapBox, times(1))
             .moveCamera(CameraUpdateFactory.newCameraPosition(position))
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun `Start map without location permission test when last location known`() {
+        val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(
+            "startMapWithCondition",
+            String::class.java
+        )
+        method.isAccessible = true
+        method.invoke(fragment, "Without Permission")
+        verify(mapView, times(1)).onStart()
+        verify(applicationKvStore, times(1)).getString("LastLocation")
+        verify(applicationKvStore, times(1))
+            .putBoolean("doNotAskForLocationPermission", true)
+        verify(presenter, times(1)).onMapReady()
+        val position = CameraPosition.Builder()
+            .target(LatLng(
+                51.50550,
+                -0.07520, 0.0
+            ))
+            .zoom(0.0)
+            .build()
+        verify(mapBox, times(1))
+            .moveCamera(CameraUpdateFactory.newCameraPosition(position))
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `Start map without location permission test when last location unknown`() {
+        `when`(applicationKvStore.getString("LastLocation")).thenReturn("23.76,56.876")
+        val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(
+            "startMapWithCondition",
+            String::class.java
+        )
+        method.isAccessible = true
+        method.invoke(fragment, "Without Permission")
+        verify(mapView, times(1)).onStart()
+        verify(applicationKvStore, times(2)).getString("LastLocation")
+        verify(applicationKvStore, times(1))
+            .putBoolean("doNotAskForLocationPermission", true)
+        verify(presenter, times(1)).onMapReady()
+        val position = CameraPosition.Builder()
+            .target(LatLng(
+                23.76,
+                56.876, 0.0
+            ))
+            .zoom(14.0)
+            .build()
+        verify(mapBox, times(1))
+            .moveCamera(CameraUpdateFactory.newCameraPosition(position))
+    }
 }