From 09d6dbb729b5960a18b79ca99e30703356d7ac24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Wed, 19 Dec 2018 16:03:10 +0100 Subject: [android] reworked instrumentation test activity to use a local style again (cherry picked from commit 723fbbc) --- .../testapp/utils/OnMapReadyIdlingResource.java | 3 ++- .../src/main/assets/streets.json | 4 ++-- .../testapp/activity/espresso/EspressoTestActivity.java | 17 +---------------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java index 1bcab3932e..7696447289 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java @@ -5,6 +5,7 @@ import android.os.Handler; import android.os.Looper; import android.support.annotation.WorkerThread; import android.support.test.espresso.IdlingResource; + import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; @@ -35,7 +36,7 @@ public class OnMapReadyIdlingResource implements IdlingResource { private void initMap(MapboxMap mapboxMap) { this.mapboxMap = mapboxMap; - mapboxMap.setStyle(Style.MAPBOX_STREETS); + mapboxMap.setStyle(new Style.Builder().fromUrl("asset://streets.json")); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json index a7ec419347..5ab289344a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json @@ -49,8 +49,8 @@ "ios": "4.4.0" } }, - "center": [-122.4241, 37.78], - "zoom": 9, + "center": [0.0, 0.0], + "zoom": 0, "bearing": 0, "pitch": 0, "sources": { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java index d7e3b8eccf..251913dcfb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/espresso/EspressoTestActivity.java @@ -1,19 +1,16 @@ package com.mapbox.mapboxsdk.testapp.activity.espresso; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.testapp.R; /** * Base activity for instrumentation testing. */ -public class EspressoTestActivity extends AppCompatActivity implements OnMapReadyCallback { +public class EspressoTestActivity extends AppCompatActivity { public MapView mapView; protected MapboxMap mapboxMap; @@ -26,18 +23,6 @@ public class EspressoTestActivity extends AppCompatActivity implements OnMapRead // Initialize map as normal mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); - mapView.getMapAsync(this); - } - - @Override - public void onMapReady(@NonNull final MapboxMap map) { - map.setStyle(new Style.Builder().fromUrl("asset://streets.json"), - style -> mapboxMap = map - ); - } - - public MapboxMap getMapboxMap() { - return mapboxMap; } @Override -- cgit v1.2.1