diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoader.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoader.java index 1738c8511..ebda195ac 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoader.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoader.java @@ -20,6 +20,7 @@ public abstract class LibraryLoader { private static volatile LibraryLoader loader = DEFAULT; private static boolean loaded; + private static boolean handleLoadError = false; /** * Set the library loader that loads the shared library. @@ -30,10 +31,17 @@ public abstract class LibraryLoader { loader = libraryLoader; } + /** + * Catch UnsatisfiedLinkErrors on load + */ + public static void enableErrorHandling(boolean value) { + handleLoadError = value; + } + /** * Loads "libmaplibre.so" native shared library. *

- * Catches UnsatisfiedLinkErrors and prints a warning to logcat. + * Catches UnsatisfiedLinkErrors (if enabled) and prints a warning to logcat. *

*/ public static synchronized void load() { @@ -47,6 +55,10 @@ public abstract class LibraryLoader { String message = "Failed to load native shared library."; Logger.e(TAG, message, error); MapStrictMode.strictModeViolation(message, error); + + if (!handleLoadError) { + throw error; + } } } diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/BaseTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/BaseTest.kt new file mode 100644 index 000000000..dd89a20d3 --- /dev/null +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/BaseTest.kt @@ -0,0 +1,13 @@ +package org.maplibre.android + +import org.junit.BeforeClass + +open class BaseTest { + companion object { + @JvmStatic + @BeforeClass + fun setup() { + LibraryLoader.enableErrorHandling(true) + } + } +} diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreTest.kt index ef8783a21..d783f67ea 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreTest.kt @@ -20,7 +20,7 @@ import org.mockito.ArgumentMatchers import org.mockito.Mockito import java.io.File -class MapLibreTest { +class MapLibreTest : BaseTest() { private var context: Context? = null private var appContext: Context? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt index 305e4b9d6..71f8b586d 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt @@ -4,10 +4,11 @@ import org.maplibre.android.maps.MapLibreMap import org.junit.Assert import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.InjectMocks import org.mockito.Mockito -class AnnotationTest { +class AnnotationTest : BaseTest() { @InjectMocks private val maplibreMap = Mockito.mock(MapLibreMap::class.java) private var annotation: Annotation? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/IconTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/IconTest.kt index 934bd6485..fa630b35a 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/IconTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/IconTest.kt @@ -4,11 +4,12 @@ import android.graphics.Bitmap import org.junit.Assert import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.Mock import org.mockito.Mockito import org.mockito.MockitoAnnotations -class IconTest { +class IconTest : BaseTest() { @Mock var bitmap: Bitmap? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt index 31744e653..98da00c0f 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt @@ -7,10 +7,11 @@ import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.Projection import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.InjectMocks import org.mockito.Mockito -class InfoWindowTest { +class InfoWindowTest : BaseTest() { @InjectMocks var mMapView = Mockito.mock(MapView::class.java) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/MarkerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/MarkerTest.kt index 8b8817c11..5e2ed29dd 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/MarkerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/MarkerTest.kt @@ -6,9 +6,10 @@ import org.maplibre.android.geometry.LatLng import org.maplibre.android.utils.MockParcel import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.Mockito -class MarkerTest { +class MarkerTest : BaseTest() { @Test fun testSanity() { val markerOptions = MarkerOptions() diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolygonTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolygonTest.kt index 841c3c19f..317e56477 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolygonTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolygonTest.kt @@ -3,8 +3,9 @@ package org.maplibre.android.annotations import org.maplibre.android.geometry.LatLng import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest -class PolygonTest { +class PolygonTest : BaseTest() { @Test fun testSanity() { val polygonOptions = PolygonOptions() diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolylineTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolylineTest.kt index 5017b4b62..53808bf6c 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolylineTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolylineTest.kt @@ -3,8 +3,9 @@ package org.maplibre.android.annotations import org.maplibre.android.geometry.LatLng import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest -class PolylineTest { +class PolylineTest : BaseTest() { @Test fun testSanity() { val polylineOptions = PolylineOptions() diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt index 35197cc51..6335b7c56 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt @@ -3,11 +3,12 @@ package org.maplibre.android.attribution import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) -class AttributionParseTest { +class AttributionParseTest : BaseTest() { @Test @Throws(Exception::class) fun testParseAttributionStringSatellite() { diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt index 2d14df3c5..9fb17a7fe 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt @@ -9,11 +9,12 @@ import org.maplibre.android.geometry.LatLng import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.Mockito import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class CameraPositionTest { +class CameraPositionTest : BaseTest() { @Test fun testSanity() { val latLng = LatLng(1.0, 2.0) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt index 9fde939f5..d639516c4 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt @@ -10,8 +10,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.rules.ExpectedException +import org.maplibre.android.BaseTest -class LatLngBoundsTest { +class LatLngBoundsTest : BaseTest() { private var latLngBounds: LatLngBounds? = null @Before diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt index 7d07075de..2186e3f2e 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt @@ -3,8 +3,9 @@ package org.maplibre.android.geometry import org.maplibre.android.utils.MockParcel import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest -class LatLngSpanTest { +class LatLngSpanTest : BaseTest() { @Test fun testSanity() { val latLngSpan = LatLngSpan(0.0, 0.0) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngTest.kt index df9f346a8..961f4fdfb 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngTest.kt @@ -6,9 +6,10 @@ import org.junit.Assert import org.junit.Rule import org.junit.Test import org.junit.rules.ExpectedException +import org.maplibre.android.BaseTest import org.mockito.Mockito -class LatLngTest { +class LatLngTest : BaseTest() { @Test fun testSanity() { val latLng = LatLng(0.0, 0.0) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt index 683211f06..5544dd665 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt @@ -3,8 +3,9 @@ package org.maplibre.android.geometry import org.maplibre.android.utils.MockParcel import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest -class ProjectedMetersTest { +class ProjectedMetersTest : BaseTest() { @Test fun testSanity() { val projectedMeters = ProjectedMeters(0.0, 0.0) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt index e98fc89fb..ef12e5a6e 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt @@ -3,8 +3,9 @@ package org.maplibre.android.geometry import org.maplibre.android.utils.MockParcel import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest -class VisibleRegionTest { +class VisibleRegionTest : BaseTest() { @Test fun testSanity() { val region = VisibleRegion(FAR_LEFT, FAR_RIGHT, NEAR_LEFT, NEAR_RIGHT, BOUNDS) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/CompassEngineTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/CompassEngineTest.kt index c69e41d1a..438aa67f2 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/CompassEngineTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/CompassEngineTest.kt @@ -8,13 +8,14 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.ArgumentMatchers import org.mockito.Mock import org.mockito.Mockito import org.mockito.junit.MockitoJUnitRunner @RunWith(MockitoJUnitRunner::class) -class CompassEngineTest { +class CompassEngineTest : BaseTest() { private var compassEngine: LocationComponentCompassEngine? = null @Mock diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt index 36104e874..fdf41b922 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt @@ -15,8 +15,9 @@ import io.mockk.* import org.junit.Assert import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest -class IndicatorLocationLayerRendererTest { +class IndicatorLocationLayerRendererTest : BaseTest() { private val style: Style = mockk(relaxUnitFun = true) private val layerSourceProvider: LayerSourceProvider = mockk(relaxUnitFun = true) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt index 5a0cce63f..86ebb3dd2 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt @@ -18,13 +18,14 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.maplibre.android.location.LocationComponentConstants.DEFAULT_TRACKING_PADDING_ANIM_DURATION import org.mockito.Mockito import org.robolectric.RobolectricTestRunner import org.maplibre.testUtils.Assert as MapLibreAssert @RunWith(RobolectricTestRunner::class) -class LocationAnimatorCoordinatorTest { +class LocationAnimatorCoordinatorTest : BaseTest() { private lateinit var locationAnimatorCoordinator: LocationAnimatorCoordinator private val cameraPosition: CameraPosition = CameraPosition.DEFAULT diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt index bc4dfad78..1e5ffbe13 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt @@ -19,11 +19,12 @@ import org.maplibre.android.maps.Transform import org.maplibre.android.maps.UiSettings import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers import org.mockito.Mockito -class LocationCameraControllerTest { +class LocationCameraControllerTest : BaseTest() { @Test fun setCameraMode_mapTransitionsAreCancelled() { val maplibreMap = Mockito.mock(MapLibreMap::class.java) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt index 4b8c5566b..ee170bb06 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt @@ -13,13 +13,14 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.ExpectedException import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.Mock import org.mockito.Mockito import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoJUnitRunner @RunWith(MockitoJUnitRunner::class) -class LocationComponentActivationOptionsTest { +class LocationComponentActivationOptionsTest : BaseTest() { @Mock private val context: Context? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt index 1bfedf99a..b2e134368 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt @@ -10,12 +10,13 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.ExpectedException import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.Mock import org.mockito.Mockito import org.mockito.junit.MockitoJUnitRunner @RunWith(MockitoJUnitRunner::class) -class LocationComponentOptionsTest { +class LocationComponentOptionsTest : BaseTest() { @Mock private val context: Context? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt index ee398ff38..1b18d9dcb 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt @@ -9,10 +9,11 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.junit.MockitoJUnitRunner @RunWith(MockitoJUnitRunner::class) -class LocationComponentPositionManagerTest { +class LocationComponentPositionManagerTest : BaseTest() { private lateinit var style: Style private lateinit var layer: Layer diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentTest.kt index 7c86829b8..3660b81e5 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentTest.kt @@ -17,6 +17,7 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.ArgumentCaptor import org.mockito.Mock import org.mockito.Mockito.* @@ -24,7 +25,7 @@ import org.mockito.MockitoAnnotations import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class LocationComponentTest { +class LocationComponentTest : BaseTest() { private lateinit var locationComponent: LocationComponent @Mock diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt index fdd31bfaa..721b3e4c1 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt @@ -13,10 +13,11 @@ import org.maplibre.android.style.sources.GeoJsonSource import org.junit.Assert import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.ArgumentMatchers import org.mockito.Mockito -class LocationLayerControllerTest { +class LocationLayerControllerTest : BaseTest() { private val maplibreMap = Mockito.mock(MapLibreMap::class.java) private val style = Mockito.mock( Style::class.java diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt index b87e7145e..6d3b2c309 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt @@ -6,10 +6,11 @@ import io.mockk.mockk import io.mockk.verify import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class MapLibreAnimatorTest { +class MapLibreAnimatorTest : BaseTest() { @Test fun fps_unlimited() { diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt index 5d0f8e470..ee5740315 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt @@ -13,6 +13,7 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers import org.mockito.Mock @@ -23,7 +24,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference @RunWith(MockitoJUnitRunner::class) -class AndroidLocationEngineImplTest { +class AndroidLocationEngineImplTest : BaseTest() { @Mock private val locationManagerMock: LocationManager? = null private var engine: LocationEngine? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt index 1998177ce..c72843558 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt @@ -5,13 +5,14 @@ import org.assertj.core.api.Assertions.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.maplibre.android.location.engine.AndroidLocationEngineImpl.AndroidLocationEngineCallbackTransport import org.mockito.Mock import org.mockito.Mockito.* import org.mockito.junit.MockitoJUnitRunner @RunWith(MockitoJUnitRunner::class) -class LocationEngineProxyTest { +class LocationEngineProxyTest : BaseTest() { @Mock private val callback: LocationEngineCallback? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt index 123fd8e1f..f743b7b5e 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt @@ -3,10 +3,11 @@ package org.maplibre.android.location.engine import org.assertj.core.api.Assertions.* import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.junit.MockitoJUnitRunner @RunWith(MockitoJUnitRunner::class) -class LocationEngineRequestTest { +class LocationEngineRequestTest : BaseTest() { @Test fun checkDefaultValues() { val request = LocationEngineRequest.Builder(1000L).build() diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt index ec62e7460..dd9942e4e 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt @@ -7,12 +7,13 @@ import android.os.Bundle import org.assertj.core.api.Assertions.* import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.Mockito.* import org.mockito.junit.MockitoJUnitRunner import java.util.Collections @RunWith(MockitoJUnitRunner::class) -class LocationEngineResultTest { +class LocationEngineResultTest : BaseTest(){ @Test fun checkNullIntent() { val result = LocationEngineResult.extractResult(null) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt index 5bfa3122a..ad6b8e939 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt @@ -9,6 +9,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.maplibre.android.location.engine.AndroidLocationEngineImpl.AndroidLocationEngineCallbackTransport import org.mockito.Mock import org.mockito.Mockito.* @@ -19,7 +20,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference @RunWith(MockitoJUnitRunner::class) -class LocationEngineTest { +class LocationEngineTest : BaseTest() { @Mock private val locationEngineImpl: LocationEngineImpl? = null private var engine: LocationEngine? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt index 84a77514f..6398ab8e1 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt @@ -11,6 +11,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.ArgumentMatchers import org.mockito.Mockito.* import org.mockito.junit.MockitoJUnitRunner @@ -18,7 +19,7 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @RunWith(MockitoJUnitRunner::class) -class MapLibreFusedLocationEngineImplAdditionalTest2 { +class MapLibreFusedLocationEngineImplAdditionalTest2 : BaseTest() { private val engines = ArrayList>() private var mockLocationManager: LocationManager? = null private var location = Location(PROVIDER) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt index f7383e5f9..42340afb2 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt @@ -13,6 +13,7 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers.* import org.mockito.Mock @@ -23,7 +24,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference @RunWith(MockitoJUnitRunner::class) -class MapLibreFusedLocationEngineImplTest { +class MapLibreFusedLocationEngineImplTest : BaseTest() { @Mock private val locationManagerMock: LocationManager? = null private var engine: LocationEngine? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/log/LoggerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/log/LoggerTest.kt index a506d1aca..57afcc0e3 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/log/LoggerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/log/LoggerTest.kt @@ -5,10 +5,11 @@ import io.mockk.verify import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class LoggerTest { +class LoggerTest : BaseTest() { private val logger: LoggerDefinition = mockk(relaxed = true) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt index 77986855e..5d59e8a13 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt @@ -8,12 +8,13 @@ import org.maplibre.android.annotations.MarkerOptions import org.maplibre.android.geometry.LatLng import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest import org.maplibre.android.annotations.PolygonOptions import org.maplibre.android.annotations.PolylineOptions import org.mockito.ArgumentMatchers import org.mockito.Mockito -class AnnotationManagerTest { +class AnnotationManagerTest : BaseTest() { private val aNativeMapView: NativeMap = Mockito.mock(NativeMapView::class.java) private val aMapView = Mockito.mock(MapView::class.java) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt index 5d265be37..2933c93f3 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt @@ -5,12 +5,13 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.InjectMocks import org.mockito.Mockito import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class AttributionDialogManagerTest { +class AttributionDialogManagerTest : BaseTest() { @InjectMocks var context = Mockito.mock( Context::class.java diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt index 8731b9f23..62018d521 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt @@ -7,6 +7,7 @@ import org.maplibre.android.maps.MapView.* import org.junit.Assert import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.ArgumentMatchers import org.mockito.Mock import org.mockito.Mockito @@ -15,7 +16,7 @@ import org.mockito.MockitoAnnotations /** * Tests integration of MapChangeDispatcher and see if events are correctly forwarded. */ -class MapChangeReceiverTest { +class MapChangeReceiverTest : BaseTest() { private var mapChangeEventManager: MapChangeReceiver? = null @Mock diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt index 803d9fffe..3eba3f912 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt @@ -11,10 +11,11 @@ import io.mockk.verify import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class MapLibreMapOptionsAttrsTest { +class MapLibreMapOptionsAttrsTest : BaseTest() { @RelaxedMockK private lateinit var options: MapLibreMapOptions diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt index d846005b8..98aefc852 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt @@ -8,12 +8,13 @@ import org.maplibre.android.geometry.LatLng import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import java.util.* @RunWith(RobolectricTestRunner::class) -class MapLibreMapOptionsTest { +class MapLibreMapOptionsTest : BaseTest() { @Test fun testSanity() { Assert.assertNotNull("should not be null", diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt index a84cb1542..8985465a2 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt @@ -15,12 +15,13 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.Mock import org.mockito.MockitoAnnotations import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class MapLibreMapTest { +class MapLibreMapTest : BaseTest() { private lateinit var maplibreMap: MapLibreMap diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt index c6b9be584..f8ead7e13 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt @@ -9,9 +9,10 @@ import org.maplibre.android.geometry.LatLng import org.maplibre.android.maps.MapLibreMap.* import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.Mockito -class MapTouchListenersTest { +class MapTouchListenersTest : BaseTest() { private var mapGestureDetector: MapGestureDetector? = null private var latLng: LatLng? = null private var pointF: PointF? = null diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt index beb6570f2..33838eeaf 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt @@ -13,10 +13,11 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class StyleBuilderTest { +class StyleBuilderTest : BaseTest() { @Test fun testFromUrl() { diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleTest.kt index 785fbabdc..214fcb781 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleTest.kt @@ -19,12 +19,13 @@ import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.mockito.Mock import org.mockito.MockitoAnnotations import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class StyleTest { +class StyleTest : BaseTest() { private lateinit var maplibreMap: MapLibreMap diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/TransformTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/TransformTest.kt index 2bd07c5eb..75acdd8c6 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/TransformTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/TransformTest.kt @@ -8,12 +8,13 @@ import io.mockk.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.shadows.ShadowLooper @RunWith(RobolectricTestRunner::class) -class TransformTest { +class TransformTest : BaseTest() { private lateinit var mapView: MapView private lateinit var nativeMapView: NativeMap diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt index ddced1a7f..4d60096b1 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt @@ -11,10 +11,11 @@ import org.maplibre.android.maps.widgets.CompassView import org.junit.Assert import org.junit.Before import org.junit.Test +import org.maplibre.android.BaseTest import org.mockito.InjectMocks import org.mockito.Mockito -class UiSettingsTest { +class UiSettingsTest : BaseTest() { @InjectMocks var mapview = Mockito.mock(MapView::class.java) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt index f4b4de760..5394e3657 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt @@ -9,10 +9,11 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class HttpRequestUrlTest { +class HttpRequestUrlTest : BaseTest() { @Before fun setUp() { diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt index 7377762e1..c4e014de3 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt @@ -7,10 +7,11 @@ import okhttp3.Call import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) -class HttpRequestUtilTest { +class HttpRequestUtilTest : BaseTest() { @Test fun replaceHttpClient() { diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt index f4cadc19e..c2799eaeb 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt @@ -10,6 +10,7 @@ import org.maplibre.android.utils.ColorUtils import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith +import org.maplibre.android.BaseTest import org.robolectric.RobolectricTestRunner import java.util.* @@ -17,7 +18,7 @@ import java.util.* * Expression unit tests that validate the expression output with the expected Object[]array representation. */ @RunWith(RobolectricTestRunner::class) -class ExpressionTest { +class ExpressionTest : BaseTest() { @Test fun testPropertyValueIsExpression() { val property: PropertyValue<*> = PropertyFactory.lineWidth(Expression.get("width")) diff --git a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt index 91f129d1d..64cbfce86 100644 --- a/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt +++ b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt @@ -3,8 +3,9 @@ package org.maplibre.android.utils import android.graphics.Color import org.junit.Assert import org.junit.Test +import org.maplibre.android.BaseTest -class ColorUtilsTest { +class ColorUtilsTest : BaseTest() { @Test fun rgbaToColor_decimalComponent() {