From fc7b8aad908609f0896d18f0458af969fe4e2ea9 Mon Sep 17 00:00:00 2001 From: Zhen Zhang Date: Tue, 22 Oct 2019 11:05:38 -0700 Subject: [PATCH] Modify topKEqualsToSort test to cover more cases. Modify the test to cover k greater than or equals to input size cases. Bug: 143076068, 142558305 Test: this is the test. Change-Id: I52cccd60c1835720f848cdab54b6b09e43020281 --- .../app/ResolverListControllerTest.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java index 6218fa9fbac88..5ac1489bcfefd 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java @@ -16,6 +16,8 @@ package com.android.internal.app; +import static junit.framework.Assert.assertEquals; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.any; @@ -126,7 +128,7 @@ public class ResolverListControllerTest { String annotation = "test_annotation"; Intent sendIntent = createSendImageIntent(annotation); String refererPackage = "test_referer_package"; - List resolvedComponents = createResolvedComponentsForTest(15); + List resolvedComponents = createResolvedComponentsForTest(10); mUsm = new UsageStatsManager(mMockContext, mMockService); when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE)).thenReturn(mUsm); mController = new ResolverListController(mMockContext, mMockPackageManager, sendIntent, @@ -135,7 +137,18 @@ public class ResolverListControllerTest { mController.topK(topKList, 5); List sortList = new ArrayList<>(topKList); mController.sort(sortList); - assertThat(sortList.subList(0, 5), is(topKList.subList(0, 5))); + assertEquals("Top k elements should be sorted when input size greater than k.", + sortList.subList(0, 5), topKList.subList(0, 5)); + mController.topK(topKList, 10); + sortList = new ArrayList<>(topKList); + mController.sort(sortList); + assertEquals("All elements should be sorted when input size equals k.", + sortList, topKList); + mController.topK(topKList, 15); + sortList = new ArrayList<>(topKList); + mController.sort(sortList); + assertEquals("All elements should be sorted when input size less than k.", + sortList, topKList); } private UsageStats initStats(String packageName, String action,