[FUI26.1] Generalize assertSameElements
Test: atest NetworkStaticLibTests
Bug: 174123988
Change-Id: I72a33a3c6ba849666e9f892745be3175aeb34b0e
diff --git a/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt b/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
index a8c6b3c..efd9402 100644
--- a/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
+++ b/common/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
@@ -112,11 +112,10 @@
}.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
