From 7fee74ba02512d66fdee4129a0252bd0ba21803f Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 15 Jun 2017 12:03:44 +0200 Subject: [PATCH] [android] - update activity test generation with newest classes, make FillExtrusionActivity conform to generated activity test setup. --- .../testapp/activity/style/FillExtrusionActivity.java | 9 +++++---- platform/android/scripts/generate-test-code.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java index 9a7790c6e53..52ba8d7c7b4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java @@ -26,6 +26,7 @@ public class FillExtrusionActivity extends AppCompatActivity { private MapView mapView; + private MapboxMap mapboxMap; @Override public void onCreate(Bundle savedInstanceState) { @@ -36,8 +37,8 @@ public void onCreate(Bundle savedInstanceState) { mapView.onCreate(savedInstanceState); mapView.getMapAsync(new OnMapReadyCallback() { @Override - public void onMapReady(@NonNull - final MapboxMap map) { + public void onMapReady(@NonNull final MapboxMap map) { + mapboxMap = map; Polygon domTower = Polygon.fromCoordinates(new double[][][] { new double[][] { new double[] { @@ -66,7 +67,7 @@ public void onMapReady(@NonNull GeoJsonSource source = new GeoJsonSource("extrusion-source", domTower); map.addSource(source); - map.addLayer( + mapboxMap.addLayer( new FillExtrusionLayer("extrusion-layer", source.getId()) .withProperties( fillExtrusionHeight(40f), @@ -75,7 +76,7 @@ public void onMapReady(@NonNull ) ); - map.animateCamera( + mapboxMap.animateCamera( CameraUpdateFactory.newCameraPosition( new CameraPosition.Builder() .target(new LatLng(52.09071040847704, 5.12112557888031)) diff --git a/platform/android/scripts/generate-test-code.js b/platform/android/scripts/generate-test-code.js index b054e4a2e7d..01a294a3016 100644 --- a/platform/android/scripts/generate-test-code.js +++ b/platform/android/scripts/generate-test-code.js @@ -14,7 +14,7 @@ global.camelize = function (str) { } -const excludeActivities = ["DeleteRegionActivity","RealTimeGeoJsonActivity","UpdateMetadataActivity","CarDrivingActivity","MyLocationTrackingModeActivity","MyLocationToggleActivity","MyLocationTintActivity","MyLocationDrawableActivity","DoubleMapActivity", "LocationPickerActivity","GeoJsonClusteringActivity","RuntimeStyleTestActivity", "AnimatedMarkerActivity", "ViewPagerActivity","MapFragmentActivity","SupportMapFragmentActivity","SnapshotActivity","NavigationDrawerActivity", "QueryRenderedFeaturesBoxHighlightActivity", "MultiMapActivity", "MapInDialogActivity", "SimpleMapActivity"]; +const excludeActivities = ["BaseLocationActivity","MockLocationEngine","DeleteRegionActivity","RealTimeGeoJsonActivity","UpdateMetadataActivity","CarDrivingActivity","MyLocationTrackingModeActivity","MyLocationToggleActivity","MyLocationTintActivity","MyLocationDrawableActivity","DoubleMapActivity", "LocationPickerActivity","GeoJsonClusteringActivity","RuntimeStyleTestActivity", "AnimatedMarkerActivity", "ViewPagerActivity","MapFragmentActivity","SupportMapFragmentActivity","SnapshotActivity","NavigationDrawerActivity", "QueryRenderedFeaturesBoxHighlightActivity", "MultiMapActivity", "MapInDialogActivity", "SimpleMapActivity"]; const appBasePath = 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity'; const testBasePath = 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen'; const subPackages = fs.readdirSync(appBasePath);