summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Liu <peng.liu@mapbox.com>2019-09-06 12:23:47 +0300
committerPeng Liu <peng.liu@mapbox.com>2019-09-06 12:23:47 +0300
commit3605f31a126eade8d1565e902cc4f7e826b9d45a (patch)
treed5deafa7476c0816fa4c4e2b0ac60f3996e26a40
parentd2368bef2ea79b996e3c91e804d059d4b4e1a888 (diff)
downloadqtlocation-mapboxgl-3605f31a126eade8d1565e902cc4f7e826b9d45a.tar.gz
[android] Include more generated sanity tests for Android test app.
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java4
-rw-r--r--platform/android/scripts/exclude-activity-gen.json59
2 files changed, 15 insertions, 48 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
index 45dac23611..a66b1256cd 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseTest.java
@@ -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,9 @@ 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);
diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json
index 0f5bb81b55..4ec8d2eb57 100644
--- a/platform/android/scripts/exclude-activity-gen.json
+++ b/platform/android/scripts/exclude-activity-gen.json
@@ -1,56 +1,19 @@
[
- "BaseLocationActivity",
- "MapSnapshotterMarkerActivity",
- "MapSnapshotterReuseActivity",
- "MapSnapshotterLocalStyleActivity",
- "LatLngBoundsActivity",
- "BottomSheetActivity",
- "MapSnapshotterActivity",
- "MockLocationEngine",
- "DeleteRegionActivity",
- "RealTimeGeoJsonActivity",
- "UpdateMetadataActivity",
- "CarDrivingActivity",
- "MyLocationTrackingModeActivity",
- "MyLocationToggleActivity",
- "MyLocationTintActivity",
- "MyLocationDrawableActivity",
- "DoubleMapActivity",
- "LocationPickerActivity",
- "GeoJsonClusteringActivity",
- "RuntimeStyleTestActivity",
- "AnimatedSymbolLayerActivity",
- "ViewPagerActivity",
+ "EspressoTestActivity",
+ "FragmentBackStackActivity",
"MapFragmentActivity",
- "SupportMapFragmentActivity",
- "SnapshotActivity",
- "NavigationDrawerActivity",
- "QueryRenderedFeaturesBoxHighlightActivity",
"MultiMapActivity",
- "MapInDialogActivity",
- "ManualZoomActivity",
- "MaxMinZoomActivity",
- "ScrollByActivity",
- "ZoomFunctionSymbolLayerActivity",
- "SymbolGeneratorActivity",
- "TextureViewTransparentBackgroundActivity",
- "SimpleMapActivity",
- "RenderTestActivity",
- "SymbolLayerActivity",
- "LocationFragmentActivity",
- "MergeOfflineRegionsActivity",
"NestedViewPagerActivity",
+ "SupportMapFragmentActivity",
+ "ViewPagerActivity",
+ "LocationFragmentActivity",
+ "BottomSheetActivity",
"DebugModeActivity",
- "TextureViewDebugModeActivity",
- "RuntimeStyleActivity",
- "GridSourceActivity",
- "AnimatedImageSourceActivity",
- "EspressoTestActivity",
+ "DoubleMapActivity",
+ "MapInDialogActivity",
"ChangeResourcesCachePathActivity",
- "EspressoTestActivity",
- "FragmentBackStackActivity",
- "ChildFragmentMapInDialogActivity",
- "PerformanceMeasurementActivity",
+ "DeleteRegionActivity",
"DownloadRegionActivity",
- "CacheManagementActivity"
+ "UpdateMetadataActivity",
+ "RenderTestActivity"
]