summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2020-01-21 15:55:00 +0900
committerRemi NGUYEN VAN <reminv@google.com>2020-01-21 23:14:15 +0900
commit81291b99f522f0b35f5a44e6e8f5ffd4dd72523d (patch)
tree2afbfeadfd3bac85fc8189eb6b769a6cc038bb9b
parent98b659374f6a28a7ee80f8264016eaea72953419 (diff)
Don't count transient fields for parceling identity
Test: used this in ag/10113295 Merged-In: I51ccb0619c72bee763f4933b4608a95e87278211 Change-Id: I51ccb0619c72bee763f4933b4608a95e87278211 (clean cherry-pick from internal branch)
-rw-r--r--tests/lib/multivariant/com/android/testutils/MiscAsserts.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/lib/multivariant/com/android/testutils/MiscAsserts.kt b/tests/lib/multivariant/com/android/testutils/MiscAsserts.kt
index 17540a8..d5e281b 100644
--- a/tests/lib/multivariant/com/android/testutils/MiscAsserts.kt
+++ b/tests/lib/multivariant/com/android/testutils/MiscAsserts.kt
@@ -92,5 +92,7 @@ fun assertRunsInAtMost(descr: String, timeLimit: Long, fn: () -> Unit) {
* @param clazz Class to test.
*/
fun <T> assertFieldCountEquals(count: Int, clazz: Class<T>) {
- assertEquals(count, clazz.declaredFields.filter { !Modifier.isStatic(it.modifiers) }.size)
+ assertEquals(count, clazz.declaredFields.filter {
+ !Modifier.isStatic(it.modifiers) && !Modifier.isTransient(it.modifiers)
+ }.size)
}