Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix unit tests for people service." into rvc-dev

Browse Source
This commit is contained in:
Trung Lam
2020-03-02 19:31:43 +00:00
committed by Android (Google) Code Review
parent 4894b560a5 2dcfcc1dee
commit a23db05da5
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/people/java/com/android/server/people/data/AggregateEventHistoryImpl.java
View File

@@ -42,14 +42,16 @@ class AggregateEventHistoryImpl implements EventHistory {
@NonNull @NonNull
@Override @Override
public EventIndex getEventIndex(Set<Integer> eventTypes) { public EventIndex getEventIndex(Set<Integer> eventTypes) {
EventIndex merged = new EventIndex(); EventIndex merged = null;
for (EventHistory eventHistory : mEventHistoryList) { for (EventHistory eventHistory : mEventHistoryList) {
EventIndex eventIndex = eventHistory.getEventIndex(eventTypes); EventIndex eventIndex = eventHistory.getEventIndex(eventTypes);
if (!eventIndex.isEmpty()) { if (merged == null) {
merged = eventIndex;
} else if (!eventIndex.isEmpty()) {
merged = EventIndex.combine(merged, eventIndex); merged = EventIndex.combine(merged, eventIndex);
} }
} }
return merged; return merged != null ? merged : EventIndex.EMPTY;
} }
@NonNull @NonNull

5
services/people/java/com/android/server/people/data/ConversationStore.java
View File

@@ -198,7 +198,10 @@ class ConversationStore {
mLocusIdToShortcutIdMap.clear(); mLocusIdToShortcutIdMap.clear();
mNotifChannelIdToShortcutIdMap.clear(); mNotifChannelIdToShortcutIdMap.clear();
mPhoneNumberToShortcutIdMap.clear(); mPhoneNumberToShortcutIdMap.clear();
mConversationInfosProtoDiskReadWriter.deleteConversationsFile(); ConversationInfosProtoDiskReadWriter writer = getConversationInfosProtoDiskReadWriter();
if (writer != null) {
writer.deleteConversationsFile();
}
} }
@Nullable @Nullable

5
services/people/java/com/android/server/people/data/EventIndex.java
View File

@@ -129,8 +129,7 @@ public class EventIndex {
} }
EventIndex(@NonNull EventIndex from) { EventIndex(@NonNull EventIndex from) {
this(from.mInjector, Arrays.copyOf(from.mEventBitmaps, TIME_SLOT_TYPES_COUNT), this(from.mInjector, from.mEventBitmaps, from.mLastUpdatedTime);
from.mLastUpdatedTime);
} }
@VisibleForTesting @VisibleForTesting
@@ -140,7 +139,7 @@ public class EventIndex {
private EventIndex(@NonNull Injector injector, long[] eventBitmaps, long lastUpdatedTime) { private EventIndex(@NonNull Injector injector, long[] eventBitmaps, long lastUpdatedTime) {
mInjector = injector; mInjector = injector;
mEventBitmaps = eventBitmaps; mEventBitmaps = Arrays.copyOf(eventBitmaps, TIME_SLOT_TYPES_COUNT);
mLastUpdatedTime = lastUpdatedTime; mLastUpdatedTime = lastUpdatedTime;
} }

22
services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java
View File

@@ -335,9 +335,9 @@ public final class DataManagerTest {
throws IntentFilter.MalformedMimeTypeException { throws IntentFilter.MalformedMimeTypeException {
mDataManager.onUserUnlocked(USER_ID_PRIMARY); mDataManager.onUserUnlocked(USER_ID_PRIMARY);
AppTarget appTarget = new AppTarget.Builder( AppTarget appTarget = new AppTarget.Builder(
new AppTargetId(TEST_SHORTCUT_ID), new AppTargetId(TEST_SHORTCUT_ID),
TEST_PKG_NAME, TEST_PKG_NAME,
UserHandle.of(USER_ID_PRIMARY)) UserHandle.of(USER_ID_PRIMARY))
.setClassName(TEST_CLASS_NAME) .setClassName(TEST_CLASS_NAME)
.build(); .build();
AppTargetEvent appTargetEvent = AppTargetEvent appTargetEvent =
@@ -347,8 +347,7 @@ public final class DataManagerTest {
mDataManager.reportShareTargetEvent(appTargetEvent, intentFilter); mDataManager.reportShareTargetEvent(appTargetEvent, intentFilter);
List<Range<Long>> activeShareTimeSlots = getActiveSlotsForTestShortcut( List<Range<Long>> activeShareTimeSlots = getActiveSlotsForAppShares();
Event.SHARE_EVENT_TYPES);
assertEquals(1, activeShareTimeSlots.size()); assertEquals(1, activeShareTimeSlots.size());
} }
@@ -692,8 +691,7 @@ public final class DataManagerTest {
return conversations; return conversations;
} }
private List<Range<Long>> getActiveSlotsForTestShortcut( private List<Range<Long>> getActiveSlotsForTestShortcut(Set<Integer> eventTypes) {
Set<Integer> eventTypes) {
List<Range<Long>> activeSlots = new ArrayList<>(); List<Range<Long>> activeSlots = new ArrayList<>();
mDataManager.forPackagesInProfile(USER_ID_PRIMARY, packageData -> mDataManager.forPackagesInProfile(USER_ID_PRIMARY, packageData ->
activeSlots.addAll( activeSlots.addAll(
@@ -703,6 +701,16 @@ public final class DataManagerTest {
return activeSlots; return activeSlots;
} }
private List<Range<Long>> getActiveSlotsForAppShares() {
List<Range<Long>> activeSlots = new ArrayList<>();
mDataManager.forPackagesInProfile(USER_ID_PRIMARY, packageData ->
activeSlots.addAll(
packageData.getClassLevelEventHistory(TEST_CLASS_NAME)
.getEventIndex(Event.SHARE_EVENT_TYPES)
.getActiveTimeSlots()));
return activeSlots;
}
private ShortcutInfo buildShortcutInfo(String packageName, int userId, String id, private ShortcutInfo buildShortcutInfo(String packageName, int userId, String id,
@Nullable Person person) { @Nullable Person person) {
Context mockContext = mock(Context.class); Context mockContext = mock(Context.class);