[FUI26.1] Generalize assertSameElements am: 4fe8286217 am: 75babd3e64

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1618691

Change-Id: If002a566f5b5af6bd7926cf3c2ff33a328f49933

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