Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ buildscript {
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.power.assert) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.hilt.android) apply false
alias(libs.plugins.secrets.gradle.plugin) apply false
Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ playServicesLocation = "21.4.0"
robolectric = "4.17"
secretsGradlePlugin = "2.0.1"
spotless = "8.10.3"
truth = "1.4.5"
volley = "1.2.1"
uiTestAndroid = "1.12.0"
uiToolingVersion = "1.12.0"
Expand Down Expand Up @@ -68,7 +67,6 @@ androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
dagger = { group = "com.google.dagger", name = "dagger", version.ref = "hiltVersion" }
dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
google-truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hiltVersion" }
hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hiltVersion" }
Expand Down Expand Up @@ -102,6 +100,7 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltVersion" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-power-assert = { id = "org.jetbrains.kotlin.plugin.power-assert", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
16 changes: 13 additions & 3 deletions places-compose-demo/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.power.assert)
alias(libs.plugins.hilt.android)
alias(libs.plugins.ksp)
alias(libs.plugins.secrets.gradle.plugin)
alias(libs.plugins.compose.compiler)
}

@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
powerAssert {
functions = listOf(
"kotlin.assert",
"kotlin.test.assertTrue",
"kotlin.test.assertEquals",
"kotlin.test.assertNull",
"kotlin.test.assertNotNull",
)
includedSourceSets = listOf("debugUnitTest", "releaseUnitTest", "debugAndroidTest")
}

hilt {
enableAggregatingTask = false
}
Expand Down Expand Up @@ -107,9 +120,6 @@ dependencies {
implementation(libs.hilt.android)
implementation(kotlin("reflect"))

// TODO: Kotlin power assert?
testImplementation(libs.google.truth)

// Google Maps Compose
implementation(libs.maps.compose)
implementation(libs.maps.compose.utils)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import com.google.android.libraries.places.compose.autocomplete.domain.mappers.t
import com.google.android.libraries.places.compose.autocomplete.models.geocoder.ReverseGeocodingResponse
import com.google.android.libraries.places.compose.demo.presentation.landmark.addresshandlers.toDisplayAddress
import com.google.android.libraries.places.compose.demo.presentation.landmark.addresshandlers.withResourceTestFile
import com.google.common.truth.Truth.assertThat
import kotlin.test.Test

internal class ToIndiaAddressTest {
Expand All @@ -29,18 +28,18 @@ internal class ToIndiaAddressTest {
) { geocodingResponse ->
val address = geocodingResponse.addresses.first()

assertThat(address.formattedAddress)
.isEqualTo(
assert(
address.formattedAddress ==
"93, White Wood St, Malibu Town, Sector 47, Gurugram, Haryana 122022, India",
)
)

val indiaDisplayAddress = address.toAddress("IN").toDisplayAddress() as IndiaDisplayAddress
assertThat(indiaDisplayAddress.aptSuiteUnit).isEqualTo("93")
assertThat(indiaDisplayAddress.streetAddress).isEqualTo("White Wood Street Malibu Town Sector 47")
assertThat(indiaDisplayAddress.city).isEqualTo("Gurugram")
assertThat(indiaDisplayAddress.state).isEqualTo("Haryana")
assertThat(indiaDisplayAddress.country).isEqualTo("India")
assertThat(indiaDisplayAddress.countryCode).isEqualTo("IN")
assert(indiaDisplayAddress.aptSuiteUnit == "93")
assert(indiaDisplayAddress.streetAddress == "White Wood Street Malibu Town Sector 47")
assert(indiaDisplayAddress.city == "Gurugram")
assert(indiaDisplayAddress.state == "Haryana")
assert(indiaDisplayAddress.country == "India")
assert(indiaDisplayAddress.countryCode == "IN")
}
}

Expand All @@ -52,22 +51,23 @@ internal class ToIndiaAddressTest {
) {
val address = it.addresses.first()

assertThat(address.formattedAddress)
.isEqualTo(
assert(
address.formattedAddress ==
"akshardham society, 2/3, Sarthana - Kamrej Rd, " +
"opp. navjivan restorant, Sarthana Jakat Naka, Nana Varachha, " +
"Surat, Khadsad, Gujarat 395006, India",
)
"opp. navjivan restorant, Sarthana Jakat Naka, Nana Varachha, " +
"Surat, Khadsad, Gujarat 395006, India",
)

val indiaDisplayAddress = address.toAddress("IN").toDisplayAddress() as IndiaDisplayAddress
assertThat(indiaDisplayAddress.aptSuiteUnit).isEqualTo("akshardham society 2/3")
assertThat(
indiaDisplayAddress.streetAddress,
).isEqualTo("Sarthana - Kamrej Road Sarthana Jakat Naka Nana Varachha")
assertThat(indiaDisplayAddress.city).isEqualTo("Surat")
assertThat(indiaDisplayAddress.state).isEqualTo("Gujarat")
assertThat(indiaDisplayAddress.country).isEqualTo("India")
assertThat(indiaDisplayAddress.countryCode).isEqualTo("IN")
assert(indiaDisplayAddress.aptSuiteUnit == "akshardham society 2/3")
assert(
indiaDisplayAddress.streetAddress ==
"Sarthana - Kamrej Road Sarthana Jakat Naka Nana Varachha",
)
assert(indiaDisplayAddress.city == "Surat")
assert(indiaDisplayAddress.state == "Gujarat")
assert(indiaDisplayAddress.country == "India")
assert(indiaDisplayAddress.countryCode == "IN")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import com.google.android.libraries.places.compose.autocomplete.domain.mappers.t
import com.google.android.libraries.places.compose.autocomplete.models.geocoder.ReverseGeocodingResponse
import com.google.android.libraries.places.compose.demo.presentation.landmark.addresshandlers.toDisplayAddress
import com.google.android.libraries.places.compose.demo.presentation.landmark.addresshandlers.withResourceTestFile
import com.google.common.truth.Truth.assertThat
import kotlin.test.Test

internal class ToUsAddressTest {
Expand All @@ -29,18 +28,19 @@ internal class ToUsAddressTest {
) { geocodingResponse ->
val address = geocodingResponse.addresses.first()

assertThat(address.formattedAddress).isEqualTo(
"101 The Embarcadero suite 200, San Francisco, CA 94105, USA",
assert(
address.formattedAddress ==
"101 The Embarcadero suite 200, San Francisco, CA 94105, USA",
)

val usAddress = address.toAddress("US").toDisplayAddress() as UsDisplayAddress
assertThat(usAddress.streetAddress).isEqualTo("101 The Embarcadero")
assertThat(usAddress.additionalAddressInfo).isEqualTo("suite 200")
assertThat(usAddress.city).isEqualTo("San Francisco")
assertThat(usAddress.state).isEqualTo("CA")
assertThat(usAddress.zipCode).isEqualTo("94105")
assertThat(usAddress.countryCode).isEqualTo("US")
assertThat(usAddress.country).isEqualTo("United States")
assert(usAddress.streetAddress == "101 The Embarcadero")
assert(usAddress.additionalAddressInfo == "suite 200")
assert(usAddress.city == "San Francisco")
assert(usAddress.state == "CA")
assert(usAddress.zipCode == "94105")
assert(usAddress.countryCode == "US")
assert(usAddress.country == "United States")
}
}
}
14 changes: 13 additions & 1 deletion places-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,23 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.power.assert)
alias(libs.plugins.compose.compiler)
id("android.places.compose.PublishingConventionPlugin")
}

@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
powerAssert {
functions = listOf(
"kotlin.assert",
"kotlin.test.assertTrue",
"kotlin.test.assertEquals",
"kotlin.test.assertNull",
"kotlin.test.assertNotNull",
)
includedSourceSets = listOf("debugUnitTest", "releaseUnitTest", "debugAndroidTest")
}

android {
lint {
sarifOutput = layout.buildDirectory.file("reports/lint-results.sarif").get().asFile
Expand Down Expand Up @@ -126,7 +139,6 @@ dependencies {
implementation(libs.androidx.compose.material.icons.core)
debugImplementation(libs.androidx.compose.ui.ui.tooling)

testImplementation(libs.google.truth)
testImplementation(kotlin("test"))
testImplementation(libs.robolectric)
testImplementation(libs.mockk)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.google.android.libraries.places.compose.autocomplete.components
import android.graphics.Typeface
import android.text.SpannableStringBuilder
import android.text.style.StyleSpan
import com.google.common.truth.Truth.assertThat
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import kotlin.test.Test
Expand Down Expand Up @@ -48,9 +47,9 @@ class AutoCompleteTextFieldTest {
annotatedText.getStringAnnotations(0, annotatedText.length)

val annotations = annotatedText.spanStyles
assertThat(annotations).hasSize(1)
assertThat(annotations[0].start).isEqualTo(start)
assertThat(annotations[0].end).isEqualTo(end)
assertThat(annotatedText.substring(start, end)).isEqualTo(word)
assert(annotations.size == 1)
assert(annotations[0].start == start)
assert(annotations[0].end == end)
assert(annotatedText.substring(start, end) == word)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTextInput
import com.google.android.libraries.places.compose.autocomplete.data.meters
import com.google.android.libraries.places.compose.autocomplete.models.AutocompletePlace
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import kotlin.test.assertNotNull

/**
* UI unit tests verifying the [PlacesAutocompleteTextField] and [AutocompletePlaceRow] composables.
Expand Down Expand Up @@ -108,7 +108,7 @@ class PlacesAutocompleteTextFieldTest {
composeTestRule.onNodeWithTag("placesAutocompleteSearchField")
.performTextInput("Mountain View")

assertThat(query).isEqualTo("Mountain View")
assert(query == "Mountain View")
}

@Test
Expand All @@ -128,9 +128,9 @@ class PlacesAutocompleteTextFieldTest {

composeTestRule.onNodeWithText("Googleplex").performClick()

assertThat(selectedPlace).isNotNull()
assertThat(selectedPlace?.placeId).isEqualTo("place_1")
assertThat(selectedPlace?.primaryText.toString()).isEqualTo("Googleplex")
val place = assertNotNull(selectedPlace)
assert(place.placeId == "place_1")
assert(place.primaryText.toString() == "Googleplex")
}

@Test
Expand All @@ -149,7 +149,7 @@ class PlacesAutocompleteTextFieldTest {

composeTestRule.onNodeWithContentDescription("Clear").performClick()

assertThat(query).isEmpty()
assert(query.isEmpty())
}

@Test
Expand All @@ -169,7 +169,7 @@ class PlacesAutocompleteTextFieldTest {

composeTestRule.onNodeWithContentDescription("Back").performClick()

assertThat(backClicked).isTrue()
assert(backClicked)
}

@Test
Expand Down Expand Up @@ -223,6 +223,6 @@ class PlacesAutocompleteTextFieldTest {
}

composeTestRule.onNodeWithText("Googleplex").performClick()
assertThat(placeSelected).isTrue()
assert(placeSelected)
}
}
Loading
Loading