LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix LinkPropertiesTest.testCompareResult"

Browse Source 
am: 430d8472b2

Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4
This commit is contained in:
Rubin Xu
2017-09-19 06:37:40 +00:00
committed by android-build-merger
parent 1cbdfb6460 830124470a
commit 1c7c93e084
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/tests/coretests/src/android/net/LinkPropertiesTest.java
View File

@@ -753,7 +753,7 @@ public class LinkPropertiesTest extends TestCase {
@SmallTest @SmallTest
public void testCompareResult() { public void testCompareResult() {
// Either adding or removing items // Either adding or removing items
testCompareResult(Arrays.asList(1), Arrays.asList(1, 2, 3, 4), testCompareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1),
Arrays.asList(2, 3, 4), new ArrayList<>()); Arrays.asList(2, 3, 4), new ArrayList<>());
testCompareResult(Arrays.asList(1, 2), Arrays.asList(3, 2, 1, 4), testCompareResult(Arrays.asList(1, 2), Arrays.asList(3, 2, 1, 4),
new ArrayList<>(), Arrays.asList(3, 4)); new ArrayList<>(), Arrays.asList(3, 4));
@@ -780,9 +780,9 @@ public class LinkPropertiesTest extends TestCase {
assertEquals(expectedSet, actualSet); assertEquals(expectedSet, actualSet);
} }
private <T> void testCompareResult(List<T> oldItems, List<T> newItems, List<T> expectAdded, private <T> void testCompareResult(List<T> oldItems, List<T> newItems, List<T> expectRemoved,
List<T> expectRemoved) { List<T> expectAdded) {
CompareResult<T> result = new CompareResult<>(newItems, oldItems); CompareResult<T> result = new CompareResult<>(oldItems, newItems);
assertEquals(new ArraySet<>(expectAdded), new ArraySet<>(result.added)); assertEquals(new ArraySet<>(expectAdded), new ArraySet<>(result.added));
assertEquals(new ArraySet<>(expectRemoved), (new ArraySet<>(result.removed))); assertEquals(new ArraySet<>(expectRemoved), (new ArraySet<>(result.removed)));
} }