From 1bc8dee806dc8a972e8d48443f2803c8189b0315 Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Fri, 8 Dec 2017 14:31:00 -0600 Subject: [PATCH 1/3] Fixed NPE while rapidly switching between list and map, during data loading. --- .../java/fr/free/nrw/commons/nearby/NearbyListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java index 817571668..81bc496f2 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java @@ -60,7 +60,7 @@ public class NearbyListFragment extends DaggerFragment { Bundle bundle = this.getArguments(); if (bundle != null) { - String gsonPlaceList = bundle.getString("PlaceList"); + String gsonPlaceList = bundle.getString("PlaceList", "[]"); placeList = gson.fromJson(gsonPlaceList, LIST_TYPE); String gsonLatLng = bundle.getString("CurLatLng"); From 223df26c552b7748900946f48a1d082b60ede5e5 Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Fri, 8 Dec 2017 15:07:42 -0600 Subject: [PATCH 2/3] Fixed failing test --- .../java/fr/free/nrw/commons/nearby/NearbyActivityTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyActivityTest.java b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyActivityTest.java index eb1cff52b..a3fcb0484 100644 --- a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyActivityTest.java +++ b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyActivityTest.java @@ -1,6 +1,8 @@ package fr.free.nrw.commons.nearby; import android.app.Activity; +import android.location.LocationManager; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,8 +10,11 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowLocationManager; import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.TestCommonsApplication; @@ -33,6 +38,7 @@ public class NearbyActivityTest { TestCommonsApplication application = (TestCommonsApplication) RuntimeEnvironment.application; when(application.getLocationServiceManager().getLastLocation()).thenReturn(ST_LOUIS_MO_LAT_LNG); + when(application.getLocationServiceManager().isProviderEnabled()).thenReturn(true); activityController = Robolectric.buildActivity(NearbyActivity.class); nearbyActivity = activityController.get(); From 1d8422b900d7c76b3ddd195eb7743df804155fa5 Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Fri, 8 Dec 2017 15:38:27 -0600 Subject: [PATCH 3/3] Fixed broken android (integration) test. --- .../java/fr/free/nrw/commons/upload/FileUtilsTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java b/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java index 9ca8c67a9..d2db4614f 100644 --- a/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java +++ b/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java @@ -7,6 +7,8 @@ import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +import fr.free.nrw.commons.BuildConfig; + import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -14,7 +16,7 @@ import static org.junit.Assert.assertThat; public class FileUtilsTest { @Test public void isSelfOwned() throws Exception { - Uri uri = Uri.parse("content://fr.free.nrw.commons.provider/document/1"); + Uri uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".provider/document/1"); boolean selfOwned = FileUtils.isSelfOwned(InstrumentationRegistry.getTargetContext(), uri); assertThat(selfOwned, is(true)); }