From 5560d7de016054509fc9a596468c43f1e38bbeb0 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Thu, 8 Apr 2021 12:10:17 -0700 Subject: [PATCH] For #18836: rename CreatedActivityLogEntry -> LogEntry.ActivityCreated and similar. It's too much work to squash "correctly". --- .../mozilla/fenix/perf/StartupActivityLog.kt | 18 ++-- .../fenix/perf/StartupStateProvider.kt | 4 +- .../fenix/perf/StartupActivityLogTest.kt | 6 +- .../fenix/perf/StartupStateProviderTest.kt | 94 +++++++++---------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt index fe73a6db7..279a576de 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt @@ -55,9 +55,9 @@ class StartupActivityLog { val transformedEntries = log.map { when (it) { is LogEntry.AppStarted -> "App-STARTED" is LogEntry.AppStopped -> "App-STOPPED" - is LogEntry.CreatedActivityLogEntry -> "${it.activityClass.simpleName}-CREATED" - is LogEntry.StartedActivityLogEntry -> "${it.activityClass.simpleName}-STARTED" - is LogEntry.StoppedActivityLogEntry -> "${it.activityClass.simpleName}-STOPPED" + is LogEntry.ActivityCreated -> "${it.activityClass.simpleName}-CREATED" + is LogEntry.ActivityStarted -> "${it.activityClass.simpleName}-STARTED" + is LogEntry.ActivityStopped -> "${it.activityClass.simpleName}-STOPPED" } } loggerArg.debug(transformedEntries.toString()) @@ -79,15 +79,15 @@ class StartupActivityLog { @VisibleForTesting(otherwise = PRIVATE) inner class StartupLogActivityLifecycleCallbacks : DefaultActivityLifecycleCallbacks { override fun onActivityCreated(activity: Activity, bundle: Bundle?) { - _log.add(LogEntry.CreatedActivityLogEntry(activity::class.java)) + _log.add(LogEntry.ActivityCreated(activity::class.java)) } override fun onActivityStarted(activity: Activity) { - _log.add(LogEntry.StartedActivityLogEntry(activity::class.java)) + _log.add(LogEntry.ActivityStarted(activity::class.java)) } override fun onActivityStopped(activity: Activity) { - _log.add(LogEntry.StoppedActivityLogEntry(activity::class.java)) + _log.add(LogEntry.ActivityStopped(activity::class.java)) } } @@ -98,8 +98,8 @@ class StartupActivityLog { object AppStarted : LogEntry() object AppStopped : LogEntry() - data class CreatedActivityLogEntry(val activityClass: Class) : LogEntry() - data class StartedActivityLogEntry(val activityClass: Class) : LogEntry() - data class StoppedActivityLogEntry(val activityClass: Class) : LogEntry() + data class ActivityCreated(val activityClass: Class) : LogEntry() + data class ActivityStarted(val activityClass: Class) : LogEntry() + data class ActivityStopped(val activityClass: Class) : LogEntry() } } diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupStateProvider.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupStateProvider.kt index f22cebb6e..88ca04a9b 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/StartupStateProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/StartupStateProvider.kt @@ -44,14 +44,14 @@ class StartupStateProvider( return false } - val firstActivityStartedIndex = startupLog.log.indexOfFirst { it is LogEntry.StartedActivityLogEntry } + val firstActivityStartedIndex = startupLog.log.indexOfFirst { it is LogEntry.ActivityStarted } if (firstActivityStartedIndex < 0) { return false // if no activities are started, then we haven't started up yet. } val firstActivityStartedAndAfter = startupLog.log.subList(firstActivityStartedIndex, startupLog.log.size) val isFirstActivityStartedStillForegrounded = firstActivityStartedAndAfter == listOf( - LogEntry.StartedActivityLogEntry(activityClass), + LogEntry.ActivityStarted(activityClass), LogEntry.AppStarted ) diff --git a/app/src/test/java/org/mozilla/fenix/perf/StartupActivityLogTest.kt b/app/src/test/java/org/mozilla/fenix/perf/StartupActivityLogTest.kt index 17005c138..ce9fbcb4e 100644 --- a/app/src/test/java/org/mozilla/fenix/perf/StartupActivityLogTest.kt +++ b/app/src/test/java/org/mozilla/fenix/perf/StartupActivityLogTest.kt @@ -74,15 +74,15 @@ class StartupActivityLogTest { val activityClass = mockk()::class.java // mockk can't mock Class<...> activityCallbacks.onActivityCreated(mockk(), null) - expected.add(LogEntry.CreatedActivityLogEntry(activityClass)) + expected.add(LogEntry.ActivityCreated(activityClass)) assertEquals(expected, log.log) activityCallbacks.onActivityStarted(mockk()) - expected.add(LogEntry.StartedActivityLogEntry(activityClass)) + expected.add(LogEntry.ActivityStarted(activityClass)) assertEquals(expected, log.log) activityCallbacks.onActivityStopped(mockk()) - expected.add(LogEntry.StoppedActivityLogEntry(activityClass)) + expected.add(LogEntry.ActivityStopped(activityClass)) assertEquals(expected, log.log) } diff --git a/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt b/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt index 2dcf7d819..4838f1e71 100644 --- a/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt @@ -43,8 +43,8 @@ class StartupStateProviderTest { fun `GIVEN the app started for an activity WHEN we launched to HomeActivity directly THEN start up is cold`() { // These entries mimic observed behavior. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertTrue(provider.isColdStartForStartedActivity(homeActivityClass)) @@ -54,9 +54,9 @@ class StartupStateProviderTest { fun `GIVEN the app started for an activity WHEN we launched to HA through a non-drawing IntentRA THEN start up is cold`() { // These entries mimic observed behavior. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(irActivityClass), - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertTrue(provider.isColdStartForStartedActivity(homeActivityClass)) @@ -66,12 +66,12 @@ class StartupStateProviderTest { fun `GIVEN the app started for an activity WHEN we launched HA through a drawing IntentRA THEN start up is not cold`() { // These entries mimic observed behavior for local code changes. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(irActivityClass), - LogEntry.StartedActivityLogEntry(irActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), LogEntry.AppStarted, - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), - LogEntry.StoppedActivityLogEntry(irActivityClass) + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(irActivityClass) )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) } @@ -81,12 +81,12 @@ class StartupStateProviderTest { // We're making an assumption about how this would work based on previous observed patterns. // AIUI, we should never have more than one HomeActivity. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), - LogEntry.StoppedActivityLogEntry(homeActivityClass) + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(homeActivityClass) )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) } @@ -96,9 +96,9 @@ class StartupStateProviderTest { // These entries are from observed behavior. logEntries.addAll(listOf( LogEntry.AppStopped, - LogEntry.StoppedActivityLogEntry(homeActivityClass), - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) @@ -109,8 +109,8 @@ class StartupStateProviderTest { // These entries are from observed behavior. logEntries.addAll(listOf( LogEntry.AppStopped, - LogEntry.StoppedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) @@ -121,13 +121,13 @@ class StartupStateProviderTest { // While the entries are from observed behavior, this log shouldn't occur in the wild due to // our log optimizations. However, just in case the behavior changes, we check for it. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, LogEntry.AppStopped, - LogEntry.StoppedActivityLogEntry(homeActivityClass), - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) @@ -138,12 +138,12 @@ class StartupStateProviderTest { // This shouldn't occur in the wild due to the optimization but, just in case the behavior changes, // we check for it. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, LogEntry.AppStopped, - LogEntry.StoppedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) @@ -156,30 +156,30 @@ class StartupStateProviderTest { // Since we've never observed this, there are multiple ways the events could // theoretically be ordered: we try a few. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(irActivityClass), - LogEntry.StartedActivityLogEntry(irActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), LogEntry.AppStarted, - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass) + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass) )) assertIsNotCold() logEntries.clear() logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(irActivityClass), - LogEntry.StartedActivityLogEntry(irActivityClass), - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertIsNotCold() logEntries.clear() logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(irActivityClass), - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(irActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(irActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertIsNotCold() @@ -193,7 +193,7 @@ class StartupStateProviderTest { @Test fun `GIVEN the app started for an activity WHEN an activity hasn't started yet THEN start up is not cold`() { logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(homeActivityClass) + LogEntry.ActivityCreated(homeActivityClass) )) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) } @@ -207,17 +207,17 @@ class StartupStateProviderTest { // These are normally the success paths. logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertIsNotCold() logEntries.clear() logEntries.addAll(listOf( - LogEntry.CreatedActivityLogEntry(irActivityClass), - LogEntry.CreatedActivityLogEntry(homeActivityClass), - LogEntry.StartedActivityLogEntry(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted )) assertIsNotCold()