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

Fix Android feature state instrumentation tests (#4405)

Browse Source
This commit is contained in:
Bart Louwers
2026-07-17 13:00:57 +02:00
committed by GitHub
parent 93d484456a
commit cdde840e67
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java
View File

@@ -23,6 +23,7 @@ import org.hamcrest.Matcher;
import org.junit.Test;
import org.junit.runner.RunWith;
import android.graphics.PointF;
import android.view.View;
import java.util.ArrayList;
@@ -34,6 +35,8 @@ import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* Tests for {@link GeoJsonSource}
@@ -134,10 +137,11 @@ public class GeoJsonSourceTests extends EspressoTest {
JsonObject state = new JsonObject();
state.addProperty("selected", true);
source.setFeatureState("feature-1", state);
assertTrue(source.setFeatureState("feature-1", state));
assertEquals(state, source.getFeatureState("feature-1"));
// The feature-state update is applied on a subsequent render pass, so
// poll until the filter re-evaluates rather than relying on a single
// poll until the paint property re-evaluates rather than relying on a single
// didBecomeIdle callback (which can be missed if the repaint completes
// before the listener is attached).
assertEquals(1, pollFeatureCount(uiController, maplibreMap, 1));
@@ -161,17 +165,20 @@ public class GeoJsonSourceTests extends EspressoTest {
GeoJsonSource source = maplibreMap.getStyle().getSourceAs("style-source");
JsonObject state = new JsonObject();
state.addProperty("selected", true);
source.setFeatureState("feature-1", state);
assertTrue(source.setFeatureState("feature-1", state));
assertEquals(1, pollFeatureCount(uiController, maplibreMap, 1));
source.removeFeatureState(null, "selected");
assertTrue(source.removeFeatureState(null, "selected"));
assertEquals(0, pollFeatureCount(uiController, maplibreMap, 0));
assertNull(source.getFeatureState("feature-1"));
});
}
private int queryFeatureCount(org.maplibre.android.maps.MapLibreMap maplibreMap) {
PointF queryPoint = maplibreMap.getProjection().toScreenLocation(new LatLng(0.0, 0.0));
queryPoint.offset(12, 0);
return maplibreMap.queryRenderedFeatures(
maplibreMap.getProjection().toScreenLocation(new LatLng(0.0, 0.0)), "selected-layer").size();
queryPoint, "selected-layer").size();
}
private int pollFeatureCount(androidx.test.espresso.UiController uiController,

8
platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_feature_state_style.json
View File

@@ -33,9 +33,13 @@
"id": "selected-layer",
"type": "circle",
"source": "style-source",
"filter": ["==", ["feature-state", "selected"], true],
"paint": {
"circle-radius": 12,
"circle-radius": [
"case",
["boolean", ["feature-state", "selected"], false],
24,
0
],
"circle-color": "#ff0000"
}
}