Skip to content

Commit 89909d2

Browse files
dkhawkdkhawk
authored
chore: remove wildcard imports and migrate tests to Truth (#378)
1 parent ca29c29 commit 89909d2

22 files changed

Lines changed: 141 additions & 125 deletions

File tree

‎app/src/main/java/com/google/maps/android/ktx/demo/MainActivity.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import android.widget.Toast
2626
import androidx.activity.viewModels
2727
import androidx.appcompat.app.AppCompatActivity
2828
import androidx.constraintlayout.widget.ConstraintLayout
29-
import androidx.core.graphics.Insets
3029
import androidx.core.view.ViewCompat
3130
import androidx.core.view.WindowCompat
3231
import androidx.core.view.WindowInsetsCompat
@@ -44,10 +43,14 @@ import com.google.maps.android.collections.GroundOverlayManager
4443
import com.google.maps.android.collections.MarkerManager
4544
import com.google.maps.android.collections.PolygonManager
4645
import com.google.maps.android.collections.PolylineManager
47-
import com.google.maps.android.data.Renderer.ImagesCache
4846
import com.google.maps.android.data.geojson.GeoJsonLineStringStyle
4947
import com.google.maps.android.data.geojson.GeoJsonPolygonStyle
50-
import com.google.maps.android.ktx.*
48+
import com.google.maps.android.ktx.awaitAnimateCamera
49+
import com.google.maps.android.ktx.awaitMap
50+
import com.google.maps.android.ktx.awaitMapLoad
51+
import com.google.maps.android.ktx.awaitSnapshot
52+
import com.google.maps.android.ktx.cameraIdleEvents
53+
import com.google.maps.android.ktx.cameraMoveStartedEvents
5154
import com.google.maps.android.ktx.demo.io.MyItemReader
5255
import com.google.maps.android.ktx.demo.model.CacheViewModel
5356
import com.google.maps.android.ktx.demo.model.MyItem

‎app/src/main/java/com/google/maps/android/ktx/demo/io/MyItemReader.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.google.maps.android.ktx.demo.model.MyItem
2121
import org.json.JSONArray
2222
import org.json.JSONException
2323
import java.io.InputStream
24-
import java.util.*
24+
import java.util.Scanner
2525

2626
/**
2727
* Helper class to read in cluster items from a resource

‎build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
33
import com.vanniktech.maven.publish.MavenPublishBaseExtension
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
6-
import org.gradle.kotlin.dsl.*
76
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
87
import org.gradle.api.tasks.testing.Test
8+
import org.gradle.kotlin.dsl.apply
9+
import org.gradle.kotlin.dsl.configure
10+
import org.gradle.kotlin.dsl.withType
911
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
1012

1113
class PublishingConventionPlugin : Plugin<Project> {

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ junit = "4.13.2"
2828
mockito = "5.21.0"
2929
mockitoInline = "5.2.0"
3030
mockitoKotlin = "2.2.0"
31+
truth = "1.4.5"
3132

3233
# --- Gradle Plugins ---
3334
# Versions for Gradle plugins used in the build process.
@@ -68,6 +69,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
6869
mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
6970
mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockitoInline" }
7071
mockito-kotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version.ref = "mockitoKotlin" }
72+
truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
7173

7274
# --- Gradle ---
7375
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }

‎maps-ktx/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ dependencies {
6868
testImplementation(libs.mockito.core)
6969
testImplementation(libs.mockito.kotlin)
7070
testImplementation(libs.mockito.inline)
71+
testImplementation(libs.truth)
7172
testImplementation(libs.kotlinx.coroutines.test)
7273
}
7374

‎maps-ktx/src/main/java/com/google/maps/android/ktx/GoogleMap.kt‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,27 @@ import androidx.annotation.IntDef
2323
import com.google.android.gms.maps.CameraUpdate
2424
import com.google.android.gms.maps.GoogleMap
2525
import com.google.android.gms.maps.GoogleMapOptions
26-
import com.google.android.gms.maps.model.*
27-
import com.google.maps.android.ktx.model.*
26+
import com.google.android.gms.maps.model.Circle
27+
import com.google.android.gms.maps.model.CircleOptions
28+
import com.google.android.gms.maps.model.GroundOverlay
29+
import com.google.android.gms.maps.model.GroundOverlayOptions
30+
import com.google.android.gms.maps.model.IndoorBuilding
31+
import com.google.android.gms.maps.model.LatLng
32+
import com.google.android.gms.maps.model.Marker
33+
import com.google.android.gms.maps.model.MarkerOptions
34+
import com.google.android.gms.maps.model.PointOfInterest
35+
import com.google.android.gms.maps.model.Polygon
36+
import com.google.android.gms.maps.model.PolygonOptions
37+
import com.google.android.gms.maps.model.Polyline
38+
import com.google.android.gms.maps.model.PolylineOptions
39+
import com.google.android.gms.maps.model.TileOverlay
40+
import com.google.android.gms.maps.model.TileOverlayOptions
41+
import com.google.maps.android.ktx.model.circleOptions
42+
import com.google.maps.android.ktx.model.groundOverlayOptions
43+
import com.google.maps.android.ktx.model.markerOptions
44+
import com.google.maps.android.ktx.model.polygonOptions
45+
import com.google.maps.android.ktx.model.polylineOptions
46+
import com.google.maps.android.ktx.model.tileOverlayOptions
2847
import kotlinx.coroutines.channels.awaitClose
2948
import kotlinx.coroutines.flow.Flow
3049
import kotlinx.coroutines.flow.callbackFlow

‎maps-ktx/src/test/java/com/google/maps/android/ktx/GoogleMapTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.mockito.Mock
2020
import org.mockito.Mockito.verify
2121
import org.mockito.Mockito
2222
import org.mockito.junit.MockitoJUnitRunner
23-
import org.junit.Assert.assertNotNull
23+
import com.google.common.truth.Truth.assertThat
2424
import org.junit.After
2525
import org.junit.Before
2626
import org.mockito.MockedStatic
@@ -65,7 +65,7 @@ public class GoogleMapTest {
6565
public fun testCameraIdleEvents(): Unit = runTest {
6666
val job = launch {
6767
val event = googleMap.cameraIdleEvents().first()
68-
assertNotNull(event)
68+
assertThat(event).isNotNull()
6969
}
7070
advanceUntilIdle()
7171
verify(googleMap).setOnCameraIdleListener(cameraIdleListener.capture())

‎maps-ktx/src/test/java/com/google/maps/android/ktx/model/CameraPositionTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.google.maps.android.ktx.model
1919

2020
import com.google.android.gms.maps.model.LatLng
21-
import org.junit.Assert.assertEquals
21+
import com.google.common.truth.Truth.assertThat
2222
import org.junit.Test
2323

2424
internal class CameraPositionTest {
@@ -31,9 +31,9 @@ internal class CameraPositionTest {
3131
tilt(1f)
3232
zoom(12f)
3333
}
34-
assertEquals(1f, cameraPosition.bearing, 1e-6f)
35-
assertEquals(LatLng(1.0, 2.0), cameraPosition.target)
36-
assertEquals(1f, cameraPosition.tilt, 1e-6f)
37-
assertEquals(12f, cameraPosition.zoom, 1e-6f)
34+
assertThat(cameraPosition.bearing).isWithin(1e-6f).of(1f)
35+
assertThat(cameraPosition.target).isEqualTo(LatLng(1.0, 2.0))
36+
assertThat(cameraPosition.tilt).isWithin(1e-6f).of(1f)
37+
assertThat(cameraPosition.zoom).isWithin(1e-6f).of(12f)
3838
}
3939
}

‎maps-ktx/src/test/java/com/google/maps/android/ktx/model/CircleOptionsTest.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
package com.google.maps.android.ktx.model
1919

2020
import com.google.android.gms.maps.model.LatLng
21-
import org.junit.Assert.assertEquals
22-
import org.junit.Assert.assertTrue
21+
import com.google.common.truth.Truth.assertThat
2322
import org.junit.Test
2423

2524
internal class CircleOptionsTest {
@@ -36,13 +35,13 @@ internal class CircleOptionsTest {
3635
visible(true)
3736
zIndex(1f)
3837
}
39-
assertEquals(LatLng(0.0, 0.0), circleOptions.center)
40-
assertTrue(circleOptions.isClickable)
41-
assertEquals(0, circleOptions.fillColor)
42-
assertEquals(1.23, circleOptions.radius, 1e-6)
43-
assertEquals(1, circleOptions.strokeColor)
44-
assertEquals(2f, circleOptions.strokeWidth)
45-
assertTrue(circleOptions.isVisible)
46-
assertEquals(1f, circleOptions.zIndex, 1e-6f)
38+
assertThat(circleOptions.center).isEqualTo(LatLng(0.0, 0.0))
39+
assertThat(circleOptions.isClickable).isTrue()
40+
assertThat(circleOptions.fillColor).isEqualTo(0)
41+
assertThat(circleOptions.radius).isWithin(1e-6).of(1.23)
42+
assertThat(circleOptions.strokeColor).isEqualTo(1)
43+
assertThat(circleOptions.strokeWidth).isEqualTo(2f)
44+
assertThat(circleOptions.isVisible).isTrue()
45+
assertThat(circleOptions.zIndex).isWithin(1e-6f).of(1f)
4746
}
4847
}

‎maps-ktx/src/test/java/com/google/maps/android/ktx/model/GroundOverlayOptionsTest.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
package com.google.maps.android.ktx.model
1919

2020
import com.google.android.gms.maps.model.BitmapDescriptor
21+
import com.google.common.truth.Truth.assertThat
2122
import com.nhaarman.mockitokotlin2.mock
22-
import org.junit.Assert.assertEquals
23-
import org.junit.Assert.assertTrue
2423
import org.junit.Test
2524

2625
internal class GroundOverlayOptionsTest {
@@ -35,10 +34,10 @@ internal class GroundOverlayOptionsTest {
3534
transparency(0.5f)
3635
visible(true)
3736
}
38-
assertEquals(descriptor, groundOverlayOptions.image)
39-
assertEquals(1f, groundOverlayOptions.bearing, 1e-6f)
40-
assertTrue(groundOverlayOptions.isClickable)
41-
assertEquals(0.5f, groundOverlayOptions.transparency, 1e-6f)
42-
assertTrue(groundOverlayOptions.isVisible)
37+
assertThat(groundOverlayOptions.image).isEqualTo(descriptor)
38+
assertThat(groundOverlayOptions.bearing).isWithin(1e-6f).of(1f)
39+
assertThat(groundOverlayOptions.isClickable).isTrue()
40+
assertThat(groundOverlayOptions.transparency).isWithin(1e-6f).of(0.5f)
41+
assertThat(groundOverlayOptions.isVisible).isTrue()
4342
}
4443
}

0 commit comments

Comments
 (0)