diff --git a/.gitignore b/.gitignore index fbb342503..df7a7a0f5 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ compile_commands.json /platform/android/site node_modules .cxx +.env # Node binaries. /lib diff --git a/platform/android/.gitignore b/platform/android/.gitignore new file mode 100644 index 000000000..14c4f869c --- /dev/null +++ b/platform/android/.gitignore @@ -0,0 +1 @@ +MapLibreAndroid/src/vulkanDebug diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt index 8288b1f7e..b023f4e82 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt @@ -20,7 +20,6 @@ class FragmentBackStackTest : BaseIntegrationTest() { var activityRule: ActivityTestRule = ActivityTestRule(FragmentBackStackActivity::class.java) @Test - @Ignore("https://github.com/maplibre/maplibre-native/issues/2469") @LargeTest fun backPressedOnBackStackResumed() { device.waitForIdle() diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt index 1fafaca62..db51f74a0 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt @@ -13,7 +13,6 @@ import org.junit.runner.RunWith /** * Regression test that validates MapFragment integration with a ViewPager */ -@Ignore("https://github.com/maplibre/maplibre-native/issues/2316") @RunWith(AndroidJUnit4ClassRunner::class) class ViewPagerScrollTest : BaseIntegrationTest() { diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt index aab867c63..e0888e0d6 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt @@ -13,7 +13,6 @@ import org.junit.Assert.assertTrue import org.junit.Ignore import org.junit.Test -@Ignore("https://github.com/maplibre/maplibre-native/issues/2468") class VisibleRegionTest : BaseTest() { override fun getActivityClass(): Class<*> { diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt index 5192727c8..d742ed86b 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt @@ -17,7 +17,6 @@ import java.util.concurrent.TimeoutException /** * Integration test that validates downloading an offline region from a point geometry at zoomlevel 17 */ -@Ignore("https://github.com/maplibre/maplibre-native/issues/2318") @RunWith(AndroidJUnit4ClassRunner::class) class OfflineDownloadTest : OfflineRegion.OfflineRegionObserver { diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt index 6d1323a72..31d1287d8 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt @@ -22,7 +22,6 @@ import java.util.concurrent.TimeoutException /** * Integration test that validates if a snapshotter creation */ -@Ignore("https://github.com/maplibre/maplibre-native/issues/2317") @RunWith(AndroidJUnit4ClassRunner::class) class MapSnapshotterTest { @@ -41,7 +40,7 @@ class MapSnapshotterTest { val options = MapSnapshotter.Options(512, 512) .withPixelRatio(1.0f) .withStyleBuilder( - Style.Builder().fromUri(TestStyles.getPredefinedStyleWithFallback("Satellite Hybrid")) + Style.Builder().fromUri(TestStyles.OPENFREEMAP_BRIGHT) .withLayerAbove(bg, "country-label") ) .withCameraPosition( diff --git a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java index ac73b61fc..23ff088ef 100644 --- a/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java +++ b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java @@ -2,7 +2,6 @@ package org.maplibre.android.testapp.geometry; import static org.junit.Assert.assertEquals; -import org.junit.Ignore; import org.maplibre.android.camera.CameraUpdateFactory; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.geometry.LatLngBounds; @@ -16,7 +15,6 @@ import org.junit.Test; /** * Instrumentation test to validate integration of LatLngBounds */ -@Ignore("https://github.com/maplibre/maplibre-native/issues/2319") public class LatLngBoundsTest extends BaseTest { private static final double MAP_BEARING = 50;