diff options
author | junyulai <junyulai@google.com> | 2021-05-14 11:48:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 11:48:14 +0000 |
commit | 75babd3e64abc65448f80e40dec0f7ae448a9ceb (patch) | |
tree | dd07752f1840377bfeebe099d6035ef6c92f5fc5 | |
parent | e01861901fc9d12c8cf8179233cc64eb77a0cddc (diff) | |
parent | 4fe82862176364307c44fcbceb5d2ae7c7c98d7e (diff) | |
download | net-75babd3e64abc65448f80e40dec0f7ae448a9ceb.tar.gz |
[FUI26.1] Generalize assertSameElements am: 4fe8286217
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1618691
Change-Id: I9336d734af56f794a58fcf0a25c2dedb98e65e00
-rw-r--r-- | common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt b/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt index a8c6b3c7..efd9402d 100644 --- a/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt +++ b/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt @@ -112,11 +112,10 @@ fun <T> assertFieldCountEquals(count: Int, clazz: Class<T>) { }.size) } -fun assertSameElements(expected: List<String?>, actual: List<String?>) { - val expectedSet: HashSet<String?> = HashSet<String?>(expected) - assertEquals(expectedSet.size.toLong(), expected.size.toLong(), - "expected list contains duplicates") - val actualSet: HashSet<String?> = HashSet<String?>(actual) - assertEquals(actualSet.size.toLong(), actual.size.toLong(), "actual list contains duplicates") +fun <T> assertSameElements(expected: List<T>, actual: List<T>) { + val expectedSet: HashSet<T> = HashSet(expected) + assertEquals(expectedSet.size, expected.size, "expected list contains duplicates") + val actualSet: HashSet<T> = HashSet(actual) + assertEquals(actualSet.size, actual.size, "actual list contains duplicates") assertEquals(expectedSet, actualSet) -} +}
\ No newline at end of file |