tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Fix MapSnapshotter regression and add activity sanity tests (#15580)

Browse Source 
* [android] Include more generated sanity tests for Android test app.

* [android] Add null check for camera position padding.

* [android] Skip map load tests if no mapView is found, include more generated sanity tests for Android test app.

* [android] Set mapboxMap to null during the mapView destroy process, fix failed sanity tests.

* [android] Add file source related activities to the sanity test exclude list.

* [android] Fixes according to @tobrun's review.

* [android] Add more activities to exclude list, keep MapSnapshotterActivity for regression test.
This commit is contained in:
Peng Liu
2019-09-12 18:17:45 +03:00
committed by GitHub
parent 1b35d39cc1
commit 69bc5244ea
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import android.support.annotation.CallSuper;
import android.support.annotation.UiThread;
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule;
import com.mapbox.mapboxsdk.AppCenter;
import com.mapbox.mapboxsdk.Mapbox;
@@ -35,6 +36,10 @@ public abstract class BaseTest extends AppCenter {
@Rule
public TestName testName = new TestName();
@Rule
public GrantPermissionRule grantLocationPermissionRule = GrantPermissionRule
.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
protected MapboxMap mapboxMap;
protected MapView mapView;
private final CountDownLatch latch = new CountDownLatch(1);
@@ -75,7 +80,12 @@ public abstract class BaseTest extends AppCenter {
try {
rule.runOnUiThread(() -> {
mapView = rule.getActivity().findViewById(R.id.mapView);
mapView.getMapAsync(this::initMap);
if (mapView != null) {
mapView.getMapAsync(this::initMap);
} else {
Timber.w("Skipping map load test since mapView is not found.");
latch.countDown();
}
});
} catch (Throwable throwable) {
throwable.printStackTrace();

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
View File

@@ -81,7 +81,9 @@ public class MapFragmentActivity extends AppCompatActivity implements MapFragmen
@Override
protected void onDestroy() {
super.onDestroy();
mapView.removeOnDidFinishRenderingFrameListener(this);
if (mapView != null) {
mapView.removeOnDidFinishRenderingFrameListener(this);
}
}
@Override

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
View File

@@ -116,7 +116,7 @@ class LocationFragmentActivity : AppCompatActivity() {
}
override fun onSuccess(result: LocationEngineResult?) {
mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(result?.lastLocation), 12.0))
if (!mapView.isDestroyed) mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(result?.lastLocation), 12.0))
}
override fun onFailure(exception: Exception) {

7
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolGeneratorActivity.java
View File

@@ -362,7 +362,12 @@ public class SymbolGeneratorActivity extends AppCompatActivity implements OnMapR
@Override
protected void onPostExecute(HashMap<String, Bitmap> bitmapHashMap) {
super.onPostExecute(bitmapHashMap);
mapboxMap.getStyle().addImagesAsync(bitmapHashMap);
mapboxMap.getStyle(new Style.OnStyleLoaded() {
@Override
public void onStyleLoaded(@NonNull Style style) {
style.addImagesAsync(bitmapHashMap);
}
});
}
}
}