Merge branch 'main' into dependabot/github_actions/actions/setup-node-5

Author: kikoso

README.md

@@ -29,14 +29,14 @@ You no longer need to specify the Maps SDK for Android or its Utility Library as
 
 ```groovy
 dependencies {
-    implementation 'com.google.maps.android:maps-compose:6.9.0'
+    implementation 'com.google.maps.android:maps-compose:6.10.0'
 
     // Optionally, you can include the Compose utils library for Clustering,
     // Street View metadata checks, etc.
-    implementation 'com.google.maps.android:maps-compose-utils:6.9.0'
+    implementation 'com.google.maps.android:maps-compose-utils:6.10.0'
 
     // Optionally, you can include the widgets library for ScaleBar, etc.
-    implementation 'com.google.maps.android:maps-compose-widgets:6.9.0'
+    implementation 'com.google.maps.android:maps-compose-widgets:6.10.0'
 }
 ```
 

build.gradle.kts

@@ -34,7 +34,7 @@ val projectArtifactId by extra { project: Project ->
 
 allprojects {
     group = "com.google.maps.android"
-    version = "6.9.0"
+    version = "6.10.0"
     val projectArtifactId by extra { project.name }
 }
 

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 activitycompose = "1.10.1"
-agp = "8.12.1"
+agp = "8.13.0"
 androidCore = "1.7.0"
 androidx-core = "1.17.0"
 androidxtest = "1.7.0"
@@ -19,7 +19,9 @@ mapsktx = "5.2.0"
 org-jacoco-core = "0.8.13"
 screenshot = "0.0.1-alpha11"
 constraintlayout = "2.2.1"
-material = "1.12.0"
+material = "1.13.0"
+robolectric = "4.16"
+truth = "1.4.4"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -53,6 +55,8 @@ test-junit = { module = "junit:junit", version.ref = "junit" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 screenshot-validation-api = { group = "com.android.tools.screenshot", name = "screenshot-validation-api", version.ref = "screenshot" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+truth = { module = "com.google.truth:truth", version.ref = "truth" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

maps-app/build.gradle.kts

@@ -81,6 +81,13 @@ dependencies {
     androidTestImplementation(libs.test.junit)
     androidTestImplementation(libs.androidx.test.compose.ui)
     androidTestImplementation(libs.kotlinx.coroutines.test)
+    androidTestImplementation(libs.truth)
+
+    testImplementation(libs.test.junit)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.truth)
+    testImplementation(libs.kotlinx.coroutines.test)
 
     screenshotTestImplementation(libs.androidx.compose.ui.tooling)
 

maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt

@@ -14,6 +14,7 @@
 
 package com.google.maps.android.compose
 
+import android.content.Context
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.Text
@@ -25,9 +26,14 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import androidx.test.platform.app.InstrumentationRegistry
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
-import org.junit.Assert.*
+import com.google.common.truth.Truth.assertThat
+import com.google.maps.android.compose.LatLngSubject.Companion.assertThat
+import com.google.maps.android.compose.internal.GoogleMapsInitializer
+import com.google.maps.android.compose.internal.InitializationState
+import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -46,6 +52,15 @@ class GoogleMapViewTests {
     private fun initMap(content: @Composable () -> Unit = {}) {
         check(hasValidApiKey) { "Maps API key not specified" }
         val countDownLatch = CountDownLatch(1)
+
+        val appContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        runBlocking {
+            GoogleMapsInitializer.initialize(appContext)
+        }
+
+        assertThat(GoogleMapsInitializer.state.value).isEqualTo(InitializationState.SUCCESS)
+
         composeTestRule.setContent {
             GoogleMapView(
                 modifier = Modifier.fillMaxSize(),
@@ -59,7 +74,7 @@ class GoogleMapViewTests {
             }
         }
         val mapLoaded = countDownLatch.await(30, TimeUnit.SECONDS)
-        assertTrue("Map loaded", mapLoaded)
+        assertThat(mapLoaded).isTrue()
     }
 
     @Before
@@ -75,32 +90,32 @@ class GoogleMapViewTests {
     @Test
     fun testStartingCameraPosition() {
         initMap()
-        startingPosition.assertEquals(cameraPositionState.position.target)
+        assertThat(cameraPositionState.position.target).isEqualTo(startingPosition)
     }
 
     @Test
     fun testRightInitialColorScheme() {
         initMap()
-        mapColorScheme.assertEquals(ComposeMapColorScheme.FOLLOW_SYSTEM)
+        assertThat(mapColorScheme).isEqualTo(ComposeMapColorScheme.FOLLOW_SYSTEM)
     }
 
     @Test
-    fun testRighColorSchemeAfterChangingIt() {
+    fun testRightColorSchemeAfterChangingIt() {
         mapColorScheme = ComposeMapColorScheme.DARK
         initMap()
-        mapColorScheme.assertEquals(ComposeMapColorScheme.DARK)
+        assertThat(mapColorScheme).isEqualTo(ComposeMapColorScheme.DARK)
     }
 
     @Test
     fun testCameraReportsMoving() {
         initMap()
-        assertEquals(CameraMoveStartedReason.NO_MOVEMENT_YET, cameraPositionState.cameraMoveStartedReason)
+        assertThat(cameraPositionState.cameraMoveStartedReason).isEqualTo(CameraMoveStartedReason.NO_MOVEMENT_YET)
         zoom(shouldAnimate = true, zoomIn = true) {
             composeTestRule.waitUntil(timeout2) {
                 cameraPositionState.isMoving
             }
-            assertTrue(cameraPositionState.isMoving)
-            assertEquals(CameraMoveStartedReason.DEVELOPER_ANIMATION, cameraPositionState.cameraMoveStartedReason)
+            assertThat(cameraPositionState.isMoving).isTrue()
+            assertThat(cameraPositionState.cameraMoveStartedReason).isEqualTo(CameraMoveStartedReason.DEVELOPER_ANIMATION)
         }
     }
 
@@ -114,7 +129,7 @@ class GoogleMapViewTests {
             composeTestRule.waitUntil(timeout5) {
                 !cameraPositionState.isMoving
             }
-            assertFalse(cameraPositionState.isMoving)
+            assertThat(cameraPositionState.isMoving).isFalse()
         }
     }
 
@@ -128,11 +143,7 @@ class GoogleMapViewTests {
             composeTestRule.waitUntil(timeout3) {
                 !cameraPositionState.isMoving
             }
-            assertEquals(
-                startingZoom + 1f,
-                cameraPositionState.position.zoom,
-                assertRoundingError.toFloat()
-            )
+            assertThat(cameraPositionState.position.zoom).isWithin(assertRoundingError.toFloat()).of(startingZoom + 1f)
         }
     }
 
@@ -146,11 +157,7 @@ class GoogleMapViewTests {
             composeTestRule.waitUntil(timeout3) {
                 !cameraPositionState.isMoving
             }
-            assertEquals(
-                startingZoom + 1f,
-                cameraPositionState.position.zoom,
-                assertRoundingError.toFloat()
-            )
+            assertThat(cameraPositionState.position.zoom).isWithin(assertRoundingError.toFloat()).of(startingZoom + 1f)
         }
     }
 
@@ -164,11 +171,7 @@ class GoogleMapViewTests {
             composeTestRule.waitUntil(timeout3) {
                 !cameraPositionState.isMoving
             }
-            assertEquals(
-                startingZoom - 1f,
-                cameraPositionState.position.zoom,
-                assertRoundingError.toFloat()
-            )
+            assertThat(cameraPositionState.position.zoom).isWithin(assertRoundingError.toFloat()).of(startingZoom - 1f)
         }
     }
 
@@ -182,11 +185,7 @@ class GoogleMapViewTests {
             composeTestRule.waitUntil(timeout3) {
                 !cameraPositionState.isMoving
             }
-            assertEquals(
-                startingZoom - 1f,
-                cameraPositionState.position.zoom,
-                assertRoundingError.toFloat()
-            )
+            assertThat(cameraPositionState.position.zoom).isWithin(assertRoundingError.toFloat()).of(startingZoom - 1f)
         }
     }
 
@@ -195,10 +194,10 @@ class GoogleMapViewTests {
         initMap()
         composeTestRule.runOnUiThread {
             val projection = cameraPositionState.projection
-            assertNotNull(projection)
-            assertTrue(
+            assertThat(projection).isNotNull()
+            assertThat(
                 projection!!.visibleRegion.latLngBounds.contains(startingPosition)
-            )
+            ).isTrue()
         }
     }
 
@@ -207,11 +206,11 @@ class GoogleMapViewTests {
         initMap()
         composeTestRule.runOnUiThread {
             val projection = cameraPositionState.projection
-            assertNotNull(projection)
+            assertThat(projection).isNotNull()
             val latLng = LatLng(23.4, 25.6)
-            assertFalse(
+            assertThat(
                 projection!!.visibleRegion.latLngBounds.contains(latLng)
-            )
+            ).isFalse()
         }
     }
 
@@ -295,15 +294,15 @@ class GoogleMapViewTests {
             markerState = rememberUpdatedMarkerState(position = positionState.value)
         }
 
-        assertEquals(testPoint0, markerState.position)
+        assertThat(markerState.position).isEqualTo(testPoint0)
 
         positionState.value = testPoint1
         composeTestRule.waitForIdle()
-        assertEquals(testPoint1, markerState.position)
+        assertThat(markerState.position).isEqualTo(testPoint1)
 
         positionState.value = testPoint2
         composeTestRule.waitForIdle()
-        assertEquals(testPoint2, markerState.position)
+        assertThat(markerState.position).isEqualTo(testPoint2)
     }
 
     private fun zoom(
@@ -322,4 +321,4 @@ class GoogleMapViewTests {
 
         assertionBlock()
     }
-}
+}

maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapsInitializerTest.kt

@@ -0,0 +1,74 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.maps.android.compose
+
+import android.content.Context
+import android.os.StrictMode
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.google.common.truth.Truth.assertThat
+import com.google.maps.android.compose.internal.GoogleMapsInitializer
+import com.google.maps.android.compose.internal.InitializationState
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class GoogleMapsInitializerTest {
+
+    @After
+    fun tearDown() = runTest {
+        GoogleMapsInitializer.reset()
+    }
+
+    @Test
+    fun testInitializationSuccess() = runTest {
+        // In an instrumentation test environment, Google Play services are available.
+        // Therefore, we expect the initialization to succeed.
+
+        val context: Context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        // Note: we need to establish the Strict Mode settings here as there are violations outside
+        // of our control if we try to set them in setUp
+        val threadPolicy = StrictMode.getThreadPolicy()
+        val vmPolicy = StrictMode.getVmPolicy()
+
+        StrictMode.setThreadPolicy(
+            StrictMode.ThreadPolicy.Builder()
+                .detectDiskReads()
+                .detectAll()
+                .penaltyLog()
+                .penaltyDeath()
+                .build()
+        )
+        StrictMode.setVmPolicy(
+            StrictMode.VmPolicy.Builder()
+                .detectAll()
+                .detectLeakedClosableObjects()
+                .penaltyLog()
+                .penaltyDeath()
+                .build()
+        )
+
+        GoogleMapsInitializer.initialize(context)
+
+        StrictMode.setThreadPolicy(threadPolicy)
+        StrictMode.setVmPolicy(vmPolicy)
+
+        assertThat(GoogleMapsInitializer.state.value).isEqualTo(InitializationState.SUCCESS)
+    }
+}