-
Notifications
You must be signed in to change notification settings - Fork 173
feat: Introduce a robust Google Maps initializer #758
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7b23a41
feat: Introduce a robust Google Maps initializer
dkhawk cdac9aa
chore: address copyright header issues
dkhawk 6aefeda
refactor: Make GoogleMapsInitializer suspendable
dkhawk 06d200a
refactor(maps-compose): Make GoogleMapsInitializer fully suspending
dkhawk 69984e7
chore: Update Material, Robolectric, and Truth dependencies
dkhawk 0cd0f49
test: Add StrictMode check to GoogleMapsInitializerTest
dkhawk 3e6ba8c
test: Refactor GoogleMapViewTests to use Truth assertions
dkhawk e150f37
chore: add license headers to test files
dkhawk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapsInitializerTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| } | ||
| } | ||
56 changes: 56 additions & 0 deletions
56
maps-app/src/androidTest/java/com/google/maps/android/compose/LatLngSubject.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
|
|
||
| // 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 com.google.android.gms.maps.model.LatLng | ||
| import com.google.common.truth.FailureMetadata | ||
| import com.google.common.truth.Subject | ||
| import com.google.common.truth.Truth.assertAbout | ||
|
|
||
| /** | ||
| * A [Subject] for asserting facts about [LatLng] objects. | ||
| */ | ||
| class LatLngSubject( | ||
| failureMetadata: FailureMetadata, | ||
| private val actual: LatLng? | ||
| ) : Subject(failureMetadata, actual) { | ||
|
|
||
| /** | ||
| * Asserts that the subject is equal to the given [expected] value, with a given [tolerance]. | ||
| */ | ||
| fun isEqualTo(expected: LatLng, tolerance: Double = 1e-6) { | ||
| if (actual == null) { | ||
| failWithActual("expected", expected) | ||
| return | ||
| } | ||
|
|
||
| check("latitude").that(actual.latitude).isWithin(tolerance).of(expected.latitude) | ||
| check("longitude").that(actual.longitude).isWithin(tolerance).of(expected.longitude) | ||
| } | ||
|
|
||
| companion object { | ||
| /** | ||
| * A factory for creating [LatLngSubject] instances. | ||
| */ | ||
| fun assertThat(actual: LatLng?): LatLngSubject { | ||
| return assertAbout(latLngs()).that(actual) | ||
| } | ||
|
|
||
| private fun latLngs(): (failureMetadata: FailureMetadata, actual: LatLng?) -> LatLngSubject { | ||
| return ::LatLngSubject | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a random idea: since one of the motivations to do some work on the Maps Initializer was the positive we got on the StrictMode, wondering if it could make sense to test this with the StrictMode activated:
@Before fun setUp() { StrictMode.setThreadPolicy( StrictMode.ThreadPolicy.Builder() .detectDiskReads() .detectAll() .penaltyLog() .build() ) StrictMode.setVmPolicy( StrictMode.VmPolicy.Builder() .detectAll() .penaltyLog() .build() ) }There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good idea. Thanks for the suggestion!