diff options
| author | 2024-10-07 13:49:47 +0000 | |
|---|---|---|
| committer | 2024-10-07 13:49:47 +0000 | |
| commit | a8b34a512b4c29e6ebc0c03c10f1cae11171bcf1 (patch) | |
| tree | 8461d6f4b038defe178f887d34e5b584040b5b0a /tests | |
| parent | f6400db571602fbbb3c5fa88276c3e5ed40792da (diff) | |
| parent | 68b62d37ebe6bbc49d149e2bd5d548afe7415e23 (diff) | |
Update test for Truth8 deprecation. am: 7b0cf4237f am: 68b62d37eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/3283923
Change-Id: I86e100bcd54f19038429ca373b3ba5a5928777cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/activity/Android.bp | 1 | ||||
| -rw-r--r-- | tests/integration/Android.bp | 1 | ||||
| -rw-r--r-- | tests/unit/Android.bp | 1 | ||||
| -rw-r--r-- | tests/unit/src/com/android/intentresolver/platform/NearbyShareModuleTest.kt | 8 |
4 files changed, 4 insertions, 7 deletions
diff --git a/tests/activity/Android.bp b/tests/activity/Android.bp index 9d673b4c..2e66a84d 100644 --- a/tests/activity/Android.bp +++ b/tests/activity/Android.bp @@ -57,7 +57,6 @@ android_test { "mockito-kotlin-nodeps", "testables", "truth", - "truth-java8-extension", "flag-junit", "platform-test-annotations", ], diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index c968c128..9109507a 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -39,7 +39,6 @@ android_test { "IntentResolver-tests-shared", "junit", "truth", - "truth-java8-extension", ], test_suites: ["general-tests"], } diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 850c447f..a3b30a3a 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -59,7 +59,6 @@ android_test { "platform-compat-test-rules", // PlatformCompatChangeRule "testables", // TestableContext/TestableResources "truth", - "truth-java8-extension", "flag-junit", "platform-test-annotations", ], diff --git a/tests/unit/src/com/android/intentresolver/platform/NearbyShareModuleTest.kt b/tests/unit/src/com/android/intentresolver/platform/NearbyShareModuleTest.kt index 6e5c97c2..a4bcad38 100644 --- a/tests/unit/src/com/android/intentresolver/platform/NearbyShareModuleTest.kt +++ b/tests/unit/src/com/android/intentresolver/platform/NearbyShareModuleTest.kt @@ -23,7 +23,7 @@ import android.provider.Settings import android.testing.TestableResources import androidx.test.platform.app.InstrumentationRegistry import com.android.intentresolver.R -import com.google.common.truth.Truth8.assertThat +import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test @@ -34,7 +34,7 @@ class NearbyShareModuleTest { /** Create Resources with overridden values. */ private fun Context.fakeResources( config: Configuration? = null, - block: TestableResources.() -> Unit + block: TestableResources.() -> Unit, ) = TestableResources(resources) .apply { config?.let { overrideConfiguration(it) } } @@ -64,7 +64,7 @@ class NearbyShareModuleTest { context.fakeResources { addOverride( R.string.config_defaultNearbySharingComponent, - "com.example/.ComponentName" + "com.example/.ComponentName", ) } @@ -83,7 +83,7 @@ class NearbyShareModuleTest { context.fakeResources { addOverride( R.string.config_defaultNearbySharingComponent, - "com.example/.AComponent" + "com.example/.AComponent", ) } |