diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2020-10-13 19:39:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-13 19:39:20 +0000 |
| commit | e52360b58f54be0c64408ac2fa3488d6f2f00f32 (patch) | |
| tree | de502b5a2e6962d758010ddfaa9ac43079f80d8b /startop | |
| parent | ef25912ec285edb4e423bd015151544ad5935dd4 (diff) | |
| parent | b65c13a7b9fef2ee2e3e707177d30e412ce99b85 (diff) | |
Merge "Migrate away from deprecated Truth APIs." am: b65c13a7b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457153
Change-Id: I88e2dabdafb941a4f8bab694b3f515fb1d23d7e6
Diffstat (limited to 'startop')
| -rw-r--r-- | startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt b/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt index 8fa0cde0f9cc..150577a21f5a 100644 --- a/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt +++ b/startop/iorap/tests/src/com/google/android/startop/iorap/ParcelablesTest.kt @@ -124,7 +124,7 @@ class ParcelablesTest<T : Parcelable>(private val inputData: InputData<T>) { data class InputData<T : Parcelable>(val valid: T, val validCopy: T, val validOther: T) { val kls = valid.javaClass init { - assertThat(valid).isNotSameAs(validCopy) + assertThat(valid).isNotSameInstanceAs(validCopy) // Don't use isInstanceOf because of phantom warnings in intellij about Class! assertThat(validCopy.javaClass).isEqualTo(valid.javaClass) assertThat(validOther.javaClass).isEqualTo(valid.javaClass) |