Merge "Remove _DIRECT_LOAD_COMPLETE events in tests." (2c216337) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/com/android/internal/app/ChooserActivityLoggerFake.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,13 @@ public class ChooserActivityLoggerFake implements ChooserActivityLogger {
		return mCalls.get(index).event;
		}

		public void removeCallsForUiEventsOfType(int uiEventType) {
		mCalls.removeIf(
		call ->
		(call.atomId == FrameworkStatsLog.UI_EVENT_REPORTED)
		&& (call.event.getId() == uiEventType));
		}

		@Override
		public void logShareStarted(int eventId, String packageName, String mimeType,
		int appProvidedDirect, int appProvidedApp, boolean isWorkprofile, int previewType,

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+61 −66

Original line number	Diff line number	Diff line
		@@ -771,6 +771,11 @@ public class ChooserActivityTest {
		ChooserActivityLoggerFake logger =
		(ChooserActivityLoggerFake) activity.getChooserActivityLogger();

		// TODO(b/211669337): Determine the expected SHARESHEET_DIRECT_LOAD_COMPLETE events.
		logger.removeCallsForUiEventsOfType(
		ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_DIRECT_LOAD_COMPLETE.getId());

		// SHARESHEET_TRIGGERED:
		assertThat(logger.event(0).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_TRIGGERED.getId()));
		@@ -790,26 +795,21 @@ public class ChooserActivityTest {
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		// Next are just artifacts of test set-up:
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// Fifth and sixth are just artifacts of test set-up:
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));
		assertThat(logger.event(5).getId(),
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_EXPANDED.getId()));

		// SHARESHEET_EDIT_TARGET_SELECTED:
		assertThat(logger.get(6).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(6).targetType,
		assertThat(logger.get(5).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(5).targetType,
		is(ChooserActivityLogger
		.SharesheetTargetSelectedEvent.SHARESHEET_NEARBY_TARGET_SELECTED.getId()));

		// No more events.
		assertThat(logger.numCalls(), is(7));
		assertThat(logger.numCalls(), is(6));
		}


		@@ -840,6 +840,11 @@ public class ChooserActivityTest {
		ChooserActivityLoggerFake logger =
		(ChooserActivityLoggerFake) activity.getChooserActivityLogger();

		// TODO(b/211669337): Determine the expected SHARESHEET_DIRECT_LOAD_COMPLETE events.
		logger.removeCallsForUiEventsOfType(
		ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_DIRECT_LOAD_COMPLETE.getId());

		// SHARESHEET_TRIGGERED:
		assertThat(logger.event(0).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_TRIGGERED.getId()));
		@@ -859,26 +864,21 @@ public class ChooserActivityTest {
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		// Next are just artifacts of test set-up:
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// Fifth and sixth are just artifacts of test set-up:
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));
		assertThat(logger.event(5).getId(),
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_EXPANDED.getId()));

		// SHARESHEET_EDIT_TARGET_SELECTED:
		assertThat(logger.get(6).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(6).targetType,
		assertThat(logger.get(5).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(5).targetType,
		is(ChooserActivityLogger
		.SharesheetTargetSelectedEvent.SHARESHEET_EDIT_TARGET_SELECTED.getId()));

		// No more events.
		assertThat(logger.numCalls(), is(7));
		assertThat(logger.numCalls(), is(6));
		}


		@@ -2088,6 +2088,11 @@ public class ChooserActivityTest {
		ChooserActivityLoggerFake logger =
		(ChooserActivityLoggerFake) activity.getChooserActivityLogger();

		// TODO(b/211669337): Determine the expected SHARESHEET_DIRECT_LOAD_COMPLETE events.
		logger.removeCallsForUiEventsOfType(
		ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_DIRECT_LOAD_COMPLETE.getId());

		// SHARESHEET_TRIGGERED:
		assertThat(logger.event(0).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_TRIGGERED.getId()));
		@@ -2107,26 +2112,21 @@ public class ChooserActivityTest {
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		// Next are just artifacts of test set-up:
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// Fifth and sixth are just artifacts of test set-up:
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));
		assertThat(logger.event(5).getId(),
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_EXPANDED.getId()));

		// SHARESHEET_EDIT_TARGET_SELECTED:
		assertThat(logger.get(6).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(6).targetType,
		assertThat(logger.get(5).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(5).targetType,
		is(ChooserActivityLogger
		.SharesheetTargetSelectedEvent.SHARESHEET_APP_TARGET_SELECTED.getId()));

		// No more events.
		assertThat(logger.numCalls(), is(7));
		assertThat(logger.numCalls(), is(6));
		}

		@Test @Ignore
		@@ -2246,6 +2246,11 @@ public class ChooserActivityTest {
		ChooserActivityLoggerFake logger =
		(ChooserActivityLoggerFake) activity.getChooserActivityLogger();

		// TODO(b/211669337): Determine the expected SHARESHEET_DIRECT_LOAD_COMPLETE events.
		logger.removeCallsForUiEventsOfType(
		ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_DIRECT_LOAD_COMPLETE.getId());

		// SHARESHEET_TRIGGERED:
		assertThat(logger.event(0).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_TRIGGERED.getId()));
		@@ -2265,21 +2270,16 @@ public class ChooserActivityTest {
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// SHARESHEET_EMPTY_DIRECT_SHARE_ROW:
		assertThat(logger.event(4).getId(),
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));

		// Sixth is just an artifact of test set-up:
		assertThat(logger.event(5).getId(),
		// Next is just an artifact of test set-up:
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_EXPANDED.getId()));

		assertThat(logger.numCalls(), is(6));
		assertThat(logger.numCalls(), is(5));
		}

		@Test
		@@ -2307,6 +2307,11 @@ public class ChooserActivityTest {
		ChooserActivityLoggerFake logger =
		(ChooserActivityLoggerFake) activity.getChooserActivityLogger();

		// TODO(b/211669337): Determine the expected SHARESHEET_DIRECT_LOAD_COMPLETE events.
		logger.removeCallsForUiEventsOfType(
		ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_DIRECT_LOAD_COMPLETE.getId());

		// SHARESHEET_TRIGGERED:
		assertThat(logger.event(0).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_TRIGGERED.getId()));
		@@ -2326,26 +2331,21 @@ public class ChooserActivityTest {
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		// Next are just artifacts of test set-up:
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// Fifth and sixth are just artifacts of test set-up:
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));
		assertThat(logger.event(5).getId(),
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_EXPANDED.getId()));

		// SHARESHEET_EDIT_TARGET_SELECTED:
		assertThat(logger.get(6).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(6).targetType,
		assertThat(logger.get(5).atomId, is(FrameworkStatsLog.RANKING_SELECTED));
		assertThat(logger.get(5).targetType,
		is(ChooserActivityLogger
		.SharesheetTargetSelectedEvent.SHARESHEET_COPY_TARGET_SELECTED.getId()));

		// No more events.
		assertThat(logger.numCalls(), is(7));
		assertThat(logger.numCalls(), is(6));
		}

		@Test
		@@ -2373,6 +2373,11 @@ public class ChooserActivityTest {
		ChooserActivityLoggerFake logger =
		(ChooserActivityLoggerFake) activity.getChooserActivityLogger();

		// TODO(b/211669337): Determine the expected SHARESHEET_DIRECT_LOAD_COMPLETE events.
		logger.removeCallsForUiEventsOfType(
		ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_DIRECT_LOAD_COMPLETE.getId());

		// SHARESHEET_TRIGGERED:
		assertThat(logger.event(0).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent.SHARESHEET_TRIGGERED.getId()));
		@@ -2392,45 +2397,35 @@ public class ChooserActivityTest {
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		// Next is just an artifact of test set-up:
		assertThat(logger.event(3).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// Fifth is just an artifact of test set-up:
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));

		// SHARESHEET_PROFILE_CHANGED:
		assertThat(logger.event(5).getId(),
		assertThat(logger.event(4).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_PROFILE_CHANGED.getId()));

		// Repeat the loading steps in the new profile:

		// SHARESHEET_APP_LOAD_COMPLETE:
		assertThat(logger.event(6).getId(),
		assertThat(logger.event(5).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_APP_LOAD_COMPLETE.getId()));

		// SHARESHEET_DIRECT_LOAD_COMPLETE:
		assertThat(logger.event(7).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_DIRECT_LOAD_COMPLETE.getId()));

		// Ninth is again an artifact of test set-up:
		assertThat(logger.event(8).getId(),
		// Next is again an artifact of test set-up:
		assertThat(logger.event(6).getId(),
		is(ChooserActivityLogger
		.SharesheetStandardEvent.SHARESHEET_EMPTY_DIRECT_SHARE_ROW.getId()));

		// SHARESHEET_PROFILE_CHANGED:
		assertThat(logger.event(9).getId(),
		assertThat(logger.event(7).getId(),
		is(ChooserActivityLogger.SharesheetStandardEvent
		.SHARESHEET_PROFILE_CHANGED.getId()));

		// No more events (this profile was already loaded).
		assertThat(logger.numCalls(), is(10));
		assertThat(logger.numCalls(), is(8));
		}

		@Test