Skip to content
Merged
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ icu4j = "com.ibm.icu:icu4j:77.1"
junit = "junit:junit:4.13.2"
kotlinPoet = "com.squareup:kotlinpoet:2.2.0"
testParameterInjector = "com.google.testparameterinjector:test-parameter-injector:1.18"
truth = "com.google.truth:truth:1.4.4"
assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
coreLibraryDesugaring = "com.android.tools:desugar_jdk_libs:2.1.5"

[plugins]
Expand Down
2 changes: 1 addition & 1 deletion plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ dependencies {
implementation(libs.kotlinPoet)

testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.assertk)
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ import app.cash.paraphrase.plugin.TokenType.SelectOrdinal
import app.cash.paraphrase.plugin.TokenType.SpellOut
import app.cash.paraphrase.plugin.TokenType.Time
import app.cash.paraphrase.plugin.TokenType.TimeWithOffset
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.isEqualTo
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package app.cash.paraphrase.plugin

import app.cash.paraphrase.plugin.model.PublicResource
import app.cash.paraphrase.plugin.model.ResourceName
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.containsExactly
import org.junit.Assert.assertThrows
import org.junit.Test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ import app.cash.paraphrase.plugin.model.ResourceName
import app.cash.paraphrase.plugin.model.TokenizedResource
import app.cash.paraphrase.plugin.model.TokenizedResource.Token.NamedToken
import app.cash.paraphrase.plugin.model.TokenizedResource.Token.NumberedToken
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.contains
import assertk.assertions.containsExactly
import assertk.assertions.isEmpty
import assertk.assertions.isEqualTo
import java.time.LocalDateTime
import org.junit.Test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package app.cash.paraphrase.plugin

import app.cash.paraphrase.plugin.model.ResourceName
import app.cash.paraphrase.plugin.model.StringResource
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.containsExactly
import org.junit.Test

class ResourceParserTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ import app.cash.paraphrase.plugin.model.TokenizedResource
import app.cash.paraphrase.plugin.model.TokenizedResource.Token
import app.cash.paraphrase.plugin.model.TokenizedResource.Token.NamedToken
import app.cash.paraphrase.plugin.model.TokenizedResource.Token.NumberedToken
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.isEqualTo
import org.junit.Test

class ResourceTokenizerTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package app.cash.paraphrase.plugin
import app.cash.paraphrase.plugin.model.MergedResource
import app.cash.paraphrase.plugin.model.MergedResource.Deprecation
import app.cash.paraphrase.plugin.model.ResourceName
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.contains
import com.squareup.kotlinpoet.AnnotationSpec
import com.squareup.kotlinpoet.FileSpec
import com.squareup.kotlinpoet.KModifier
Expand Down
2 changes: 1 addition & 1 deletion runtime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies {
api(libs.androidAnnotation)

testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.assertk)
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
*/
package app.cash.paraphrase

import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.isEqualTo
import assertk.assertions.isFalse
import assertk.assertions.isNotEqualTo
import assertk.assertions.isTrue
import org.junit.Test

class FormattedResourceTest {
Expand Down
2 changes: 1 addition & 1 deletion tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {

dependencies {
implementation(libs.junit)
implementation(libs.truth)
implementation(libs.assertk)
implementation(libs.androidTestRunner)
implementation(libs.testParameterInjector)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import app.cash.paraphrase.FormattedResource
import app.cash.paraphrase.getString
import app.cash.paraphrase.tests.LocalesTest.TestLocale.en_IL_ca_hebrew
import app.cash.paraphrase.tests.LocalesTest.TestLocale.en_US
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.isEqualTo
import com.google.testing.junit.testparameterinjector.TestParameter
import com.google.testing.junit.testparameterinjector.TestParameterInjector
import java.time.LocalDate
Expand Down
11 changes: 6 additions & 5 deletions tests/src/main/kotlin/app/cash/paraphrase/tests/NamedTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,26 @@ package app.cash.paraphrase.tests

import androidx.test.platform.app.InstrumentationRegistry
import app.cash.paraphrase.getString
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.isEqualTo
import org.junit.Test

class NamedTest {
private val context = InstrumentationRegistry.getInstrumentation().context

@Test fun numberedSparseOne() {
val formattedResource = FormattedResources.named_one("Z")
assertThat(formattedResource.arguments as? Map<String, Any>)
.containsExactly("one", "Z")
assertThat(formattedResource.arguments as Map<String, Any>)
.isEqualTo(mapOf("one" to "Z"))

val formatted = context.getString(formattedResource)
assertThat(formatted).isEqualTo("A Z B")
}

@Test fun numberedSparseThree() {
val formattedResource = FormattedResources.named_three("Z", "Y", "X")
assertThat(formattedResource.arguments as? Map<String, Any>)
.containsExactly("one", "Z", "two", "Y", "three", "X")
assertThat(formattedResource.arguments as Map<String, Any>)
.isEqualTo(mapOf("one" to "Z", "two" to "Y", "three" to "X"))

val formatted = context.getString(formattedResource)
assertThat(formatted).isEqualTo("A Z B Y C X D")
Expand Down
20 changes: 9 additions & 11 deletions tests/src/main/kotlin/app/cash/paraphrase/tests/NumberedTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,45 @@ package app.cash.paraphrase.tests

import androidx.test.platform.app.InstrumentationRegistry
import app.cash.paraphrase.getString
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.containsExactly
import assertk.assertions.isEqualTo
import org.junit.Test

class NumberedTest {
private val context = InstrumentationRegistry.getInstrumentation().context

@Test fun numberedContiguousOne() {
val formattedResource = FormattedResources.numbered_contiguous_one("Z")
assertThat(formattedResource.arguments as? Array<Any>)
.asList()
assertThat(formattedResource.arguments as Array<Any>)
.containsExactly("Z")
.inOrder()

val formatted = context.getString(formattedResource)
assertThat(formatted).isEqualTo("A Z B")
}

@Test fun numberedContiguousThree() {
val formattedResource = FormattedResources.numbered_contiguous_three("Z", "Y", "X")
assertThat(formattedResource.arguments as? Array<Any>)
.asList()
assertThat(formattedResource.arguments as Array<Any>)
.containsExactly("Z", "Y", "X")
.inOrder()

val formatted = context.getString(formattedResource)
assertThat(formatted).isEqualTo("A Z B Y C X D")
}

@Test fun numberedSparseOne() {
val formattedResource = FormattedResources.numbered_sparse_one("Z")
assertThat(formattedResource.arguments as? Map<String, Any>)
.containsExactly("1", "Z")
assertThat(formattedResource.arguments as Map<String, Any>)
.isEqualTo(mapOf("1" to "Z"))

val formatted = context.getString(formattedResource)
assertThat(formatted).isEqualTo("A Z B")
}

@Test fun numberedSparseThree() {
val formattedResource = FormattedResources.numbered_sparse_three("Z", "Y", "X")
assertThat(formattedResource.arguments as? Map<String, Any>)
.containsExactly("1", "Z", "3", "Y", "5", "X")
assertThat(formattedResource.arguments as Map<String, Any>)
.isEqualTo(mapOf("1" to "Z", "3" to "Y", "5" to "X"))

val formatted = context.getString(formattedResource)
assertThat(formatted).isEqualTo("A Z B Y C X D")
Expand Down
3 changes: 2 additions & 1 deletion tests/src/main/kotlin/app/cash/paraphrase/tests/TypesTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package app.cash.paraphrase.tests
import android.os.Build
import androidx.test.platform.app.InstrumentationRegistry
import app.cash.paraphrase.getString
import com.google.common.truth.Truth.assertThat
import assertk.assertThat
import assertk.assertions.isEqualTo
import java.time.LocalDate
import java.time.LocalTime
import java.time.Month
Expand Down