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

Make sure Android Instrumentation Tests pass again (#3426)

Browse Source
This commit is contained in:
Bart Louwers
2025-04-25 00:57:24 +02:00
committed by GitHub
parent 159368138f
commit 4c60d85056
8 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/.idea/runConfigurations/Instrumentation_Tests.xml generated
View File

@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Instrumentation Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
<module name="MapLibre_Native_for_Android.MapLibreAndroidTestApp.androidTest" />
<module name="MapLibreAndroid.MapLibreAndroidTestApp.androidTest" />
<option name="TESTING_TYPE" value="0" />
<option name="METHOD_NAME" value="" />
<option name="CLASS_NAME" value="" />
@@ -13,7 +13,6 @@
<option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />

5
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreMapTest.kt
View File

@@ -10,6 +10,7 @@ import junit.framework.TestCase
import org.hamcrest.Matcher
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Ignore
import org.junit.Test
import org.maplibre.android.annotations.BaseMarkerOptions
import org.maplibre.android.annotations.Marker
@@ -143,6 +144,7 @@ class MapLibreMapTest : EspressoTest() {
@Test
@Deprecated("remove this test when removing deprecated annotations")
@Ignore("Needs to be investigated https://github.com/maplibre/maplibre-native/issues/3425")
fun testAddEmptyPolygon() {
validateTestSetup()
onView(ViewMatchers.withId(R.id.mapView)).perform(MapLibreMapAction { uiController: UiController?, view: View? ->
@@ -209,9 +211,10 @@ class MapLibreMapTest : EspressoTest() {
@Test
@Deprecated("remove this test when removing deprecated annotations")
@Ignore("Needs to be investigated https://github.com/maplibre/maplibre-native/issues/3425")
fun testAddEmptyPolyline() {
validateTestSetup()
onView(ViewMatchers.withId(R.id.mapView)).perform(MapLibreMapAction { uiController: UiController?, view: View? ->
onView(ViewMatchers.withId(R.id.mapView)).perform(MapLibreMapAction { _: UiController?, _: View? ->
val polylineOptions = PolylineOptions()
val polyline = maplibreMap.addPolyline(polylineOptions)
assertTrue("Polyline should be ignored", !maplibreMap.polylines.contains(polyline))

2
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/EspressoTest.kt
View File

@@ -20,7 +20,7 @@ open class EspressoTest : BaseTest() {
@UiThread
override fun initMap(maplibreMap: MapLibreMap) {
maplibreMap.setStyle(Style.Builder().fromUri(TestStyles.VERSATILES))
maplibreMap.setStyle(Style.Builder().fromUri(TestStyles.OPENFREEMAP_LIBERY))
super.initMap(maplibreMap)
}
}

12
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.List;
import java.util.Objects;
import timber.log.Timber;
@@ -79,8 +80,10 @@ public class RuntimeStyleTests extends EspressoTest {
onView(withId(R.id.mapView)).perform(new BaseViewAction() {
@Override
public void perform(UiController uiController, View view) {
List<Layer> layers = maplibreMap.getStyle().getLayers();
Source source = maplibreMap.getStyle().getSources().get(0);
List<Layer> layers = Objects.requireNonNull(maplibreMap.getStyle()).getLayers();
Source source = maplibreMap.getStyle().getSources().stream()
.filter(s -> s.getId().equals("openmaptiles")).findAny().get();
// Test inserting with invalid above-id
try {
@@ -134,8 +137,9 @@ public class RuntimeStyleTests extends EspressoTest {
onView(withId(R.id.mapView)).perform(new BaseViewAction() {
@Override
public void perform(UiController uiController, View view) {
List<Layer> layers = maplibreMap.getStyle().getLayers();
Source source = maplibreMap.getStyle().getSources().get(0);
List<Layer> layers = Objects.requireNonNull(maplibreMap.getStyle()).getLayers();
Source source = maplibreMap.getStyle().getSources().stream()
.filter(s -> s.getId().equals("openmaptiles")).findAny().get();
// Test inserting out of range
try {

2
platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt
View File

@@ -73,7 +73,7 @@ class LatLngBoundsActivity : AppCompatActivity() {
private fun loadStyle(featureCollection: FeatureCollection) {
maplibreMap.setStyle(
Style.Builder()
.fromUri(TestStyles.VERSATILES)
.fromUri(TestStyles.OPENFREEMAP_LIBERY)
.withLayer(
SymbolLayer("symbol", "symbol")
.withProperties(

3
platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt
View File

@@ -75,8 +75,7 @@ class MapSnapshotterActivity : AppCompatActivity() {
TestStyles.PROTOMAPS_LIGHT,
TestStyles.PROTOMAPS_DARK,
TestStyles.PROTOMAPS_WHITE,
TestStyles.PROTOMAPS_GRAYSCALE,
TestStyles.VERSATILES
TestStyles.PROTOMAPS_GRAYSCALE
)
val builder = Style.Builder().fromUri(
styles[(row * grid.rowCount + column) % styles.size]

2
platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DataDrivenStyleActivity.kt
View File

@@ -42,7 +42,7 @@ class DataDrivenStyleActivity : AppCompatActivity() {
mapView.getMapAsync {
// Store for later
maplibreMap = it
it.setStyle(TestStyles.VERSATILES) { style: Style? ->
it.setStyle(TestStyles.OPENFREEMAP_BRIGHT) { style: Style? ->
// Add a parks layer
addParksLayer()

4
platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/styles/TestStyles.kt
View File

@@ -5,8 +5,6 @@ import org.maplibre.android.maps.Style
object TestStyles {
const val DEMOTILES = "https://demotiles.maplibre.org/style.json"
const val VERSATILES = "https://tiles.versatiles.org/assets/styles/colorful.json"
const val AMERICANA = "https://americanamap.org/style.json"
const val OPENFREEMAP_LIBERY = "https://tiles.openfreemap.org/styles/liberty"
@@ -33,7 +31,7 @@ object TestStyles {
val style = Style.getPredefinedStyle(name)
return style
} catch (e: Exception) {
return VERSATILES
return OPENFREEMAP_LIBERY
}
}
}