From c743b35f9be26837c6173f03fd809d0397b8ae3e Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Mon, 27 May 2024 18:54:46 -0400 Subject: [PATCH 01/12] Remove #4419 TODOs Remove application\alphakenya package Remove codes in bazel files,test_file_exemptions.textproto that is related with alphakenya Remove AlphaKenya related modules and corresponding tests --- .github/workflows/build_tests.yml | 2 +- .../android/app/application/alpha/BUILD.bazel | 1 - .../AlphaKenyaApplicationComponent.kt | 116 -- .../alphakenya/AlphaKenyaOppiaApplication.kt | 9 - .../app/application/alphakenya/BUILD.bazel | 30 - build_flavors.bzl | 18 +- .../PlatformParameterAlphaKenyaModule.kt | 338 ---- scripts/assets/test_file_exemptions.textproto | 5 - .../oppia/android/util/logging/BUILD.bazel | 13 - ...nyaAlphaEventLoggingConfigurationModule.kt | 16 - ...entTypeToHumanReadableNameConverterImpl.kt | 62 - .../oppia/android/util/logging/BUILD.bazel | 37 - .../KenyaAlphaEventBundleCreatorTest.kt | 1616 ----------------- ...lphaEventLoggingConfigurationModuleTest.kt | 70 - version.bzl | 2 - 15 files changed, 2 insertions(+), 2333 deletions(-) delete mode 100644 app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt delete mode 100644 app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt delete mode 100644 app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel delete mode 100644 domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt delete mode 100644 utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModule.kt delete mode 100644 utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt delete mode 100644 utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt delete mode 100644 utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModuleTest.kt diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index f61837598b8..3e6027d0aa0 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -422,7 +422,7 @@ jobs: run: | bazel build --compilation_mode=opt -- //:oppia_alpha_kitkat - # Note that caching only works on non-forks. + # Note that caching only works on non-forks. 4419: should remove this? - name: Build Oppia alpha Kenya-specific AAB (with caching, non-fork only) if: ${{ env.ENABLE_CACHING == 'true' && github.event.pull_request.head.repo.full_name == 'oppia/oppia-android' }} env: diff --git a/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel index ce982039b52..823732c57a7 100644 --- a/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel @@ -32,7 +32,6 @@ kt_android_library( "AlphaBuildFlavorModule.kt", ], visibility = [ - "//app/src/main/java/org/oppia/android/app/application/alphakenya:__pkg__", "//app/src/test/java/org/oppia/android/app/application/alpha:__pkg__", ], deps = [ diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt deleted file mode 100644 index 75d07359cd4..00000000000 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt +++ /dev/null @@ -1,116 +0,0 @@ -package org.oppia.android.app.application.alphakenya - -import dagger.Component -import org.oppia.android.app.activity.route.ActivityRouterModule -import org.oppia.android.app.application.ApplicationComponent -import org.oppia.android.app.application.ApplicationModule -import org.oppia.android.app.application.ApplicationStartupListenerModule -import org.oppia.android.app.application.alpha.AlphaBuildFlavorModule -import org.oppia.android.app.devoptions.DeveloperOptionsModule -import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule -import org.oppia.android.app.shim.IntentFactoryShimModule -import org.oppia.android.app.shim.ViewBindingShimModule -import org.oppia.android.app.translation.ActivityRecreatorProdModule -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.domain.auth.AuthenticationModule -import org.oppia.android.domain.classify.InteractionsModule -import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule -import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule -import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule -import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.android.domain.exploration.ExplorationProgressModule -import org.oppia.android.domain.exploration.ExplorationStorageModule -import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigAlphaKenyaModule -import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule -import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.android.domain.oppialogger.LogStorageModule -import org.oppia.android.domain.oppialogger.LoggingIdentifierModule -import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule -import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule -import org.oppia.android.domain.oppialogger.exceptions.UncaughtExceptionLoggerModule -import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule -import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule -import org.oppia.android.domain.platformparameter.PlatformParameterAlphaKenyaModule -import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule -import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule -import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule -import org.oppia.android.util.accessibility.AccessibilityProdModule -import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CachingModule -import org.oppia.android.util.gcsresource.GcsResourceModule -import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.KenyaAlphaEventLoggingConfigurationModule -import org.oppia.android.util.logging.LoggerModule -import org.oppia.android.util.logging.SyncStatusModule -import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule -import org.oppia.android.util.logging.firebase.LogReportingModule -import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsAssessorModule -import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsConfigurationsModule -import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule -import org.oppia.android.util.networking.NetworkConnectionUtilProdModule -import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule -import org.oppia.android.util.parser.image.GlideImageLoaderModule -import org.oppia.android.util.parser.image.ImageParsingModule -import org.oppia.android.util.system.OppiaClockModule -import org.oppia.android.util.threading.DispatcherModule -import javax.inject.Singleton - -/** - * Root Dagger component for the alpha version of the application specific to a user study in Kenya. - * - * All application-scoped modules should be included in this component. - */ -@Singleton -@Component( - modules = [ - ApplicationModule::class, DispatcherModule::class, LoggerModule::class, OppiaClockModule::class, - ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class, - MultipleChoiceInputModule::class, NumberWithUnitsRuleModule::class, - NumericInputRuleModule::class, TextInputRuleModule::class, DragDropSortInputModule::class, - InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class, - ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, - QuestionModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, - LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, - PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, - RatioInputModule::class, UncaughtExceptionLoggerModule::class, - ApplicationStartupListenerModule::class, LogReportWorkerModule::class, - WorkManagerConfigurationModule::class, HintsAndSolutionConfigAlphaKenyaModule::class, - FirebaseLogUploaderModule::class, NetworkModule::class, - PlatformParameterAlphaKenyaModule::class, PlatformParameterSingletonModule::class, - ExplorationStorageModule::class, DeveloperOptionsModule::class, - PlatformParameterSyncUpWorkerModule::class, NetworkConfigProdModule::class, AssetModule::class, - LocaleProdModule::class, ActivityRecreatorProdModule::class, ActivityRouterModule::class, - NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class, - MathEquationInputModule::class, SplitScreenInteractionModule::class, - LoggingIdentifierModule::class, ApplicationLifecycleModule::class, - NetworkConnectionDebugUtilModule::class, LoggingIdentifierModule::class, - SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class, - HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class, - PerformanceMetricsConfigurationsModule::class, AlphaBuildFlavorModule::class, - KenyaAlphaEventLoggingConfigurationModule::class, CpuPerformanceSnapshotterModule::class, - PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class, - AuthenticationModule::class, - ] -) -interface AlphaKenyaApplicationComponent : ApplicationComponent { - /** - * The [ApplicationComponent.Builder] for this component. Dagger will generate an implementation - * of this builder for use. - */ - @Component.Builder - interface Builder : ApplicationComponent.Builder { - override fun build(): AlphaKenyaApplicationComponent - } -} diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt b/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt deleted file mode 100644 index 00566b9b6f6..00000000000 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.oppia.android.app.application.alphakenya - -import org.oppia.android.app.application.AbstractOppiaApplication - -// TODO(#4419): Remove this application class & broader Kenya-specific alpha package. -/** The root [AbstractOppiaApplication] for the Kenya-specific alpha build of the Oppia app. */ -class AlphaKenyaOppiaApplication : AbstractOppiaApplication( - DaggerAlphaKenyaApplicationComponent::builder -) diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel deleted file mode 100644 index ff7623c9481..00000000000 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel +++ /dev/null @@ -1,30 +0,0 @@ -""" -This package contains the root application definitions for a Kenya user study specific alpha build -of the app. -""" - -load("@dagger//:workspace_defs.bzl", "dagger_rules") -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") - -kt_android_library( - name = "alpha_kenya_application", - srcs = [ - "AlphaKenyaApplicationComponent.kt", - "AlphaKenyaOppiaApplication.kt", - ], - visibility = ["//:oppia_binary_visibility"], - deps = [ - ":dagger", - "//app", - "//app/src/main/java/org/oppia/android/app/application:abstract_application", - "//app/src/main/java/org/oppia/android/app/application:application_component", - "//app/src/main/java/org/oppia/android/app/application:common_application_modules", - "//app/src/main/java/org/oppia/android/app/application/alpha:alpha_build_flavor_module", - "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", - "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module", - "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", - "//utility/src/main/java/org/oppia/android/util/networking:prod_module", - ], -) - -dagger_rules() diff --git a/build_flavors.bzl b/build_flavors.bzl index 0440b171a55..af69888d5a4 100644 --- a/build_flavors.bzl +++ b/build_flavors.bzl @@ -3,7 +3,7 @@ Macros & definitions corresponding to Oppia binary build flavors. """ load("//:oppia_android_application.bzl", "declare_deployable_application", "oppia_android_application") -load("//:version.bzl", "MAJOR_VERSION", "MINOR_VERSION", "OPPIA_ALPHA_KENYA_VERSION_CODE", "OPPIA_ALPHA_KITKAT_VERSION_CODE", "OPPIA_ALPHA_VERSION_CODE", "OPPIA_BETA_VERSION_CODE", "OPPIA_DEV_KITKAT_VERSION_CODE", "OPPIA_DEV_VERSION_CODE", "OPPIA_GA_VERSION_CODE") +load("//:version.bzl", "MAJOR_VERSION", "MINOR_VERSION", "OPPIA_ALPHA_KITKAT_VERSION_CODE", "OPPIA_ALPHA_VERSION_CODE", "OPPIA_BETA_VERSION_CODE", "OPPIA_DEV_KITKAT_VERSION_CODE", "OPPIA_DEV_VERSION_CODE", "OPPIA_GA_VERSION_CODE") # Defines the list of flavors available to build the Oppia app in. Note to developers: this list # should be ordered by the development pipeline (i.e. features go through dev first, then other @@ -13,7 +13,6 @@ AVAILABLE_FLAVORS = [ "dev_kitkat", "alpha", "alpha_kitkat", - "alpha_kenya", "beta", "ga", ] @@ -41,7 +40,6 @@ _PRODUCTION_PROGUARD_SPECS = [ ] # Note to developers: keys of this dict should follow the order of AVAILABLE_FLAVORS. -# TODO(#4419): Remove the Kenya-specific alpha flavor. _FLAVOR_METADATA = { "dev": { "manifest": "//app:src/main/AndroidManifest.xml", @@ -101,20 +99,6 @@ _FLAVOR_METADATA = { "version_code": OPPIA_ALPHA_KITKAT_VERSION_CODE, "application_class": ".app.application.alpha.AlphaOppiaApplication", }, - "alpha_kenya": { - "manifest": "//app:src/main/AndroidManifest.xml", - "min_sdk_version": 21, - "target_sdk_version": 33, - "multidex": "native", - "proguard_specs": _PRODUCTION_PROGUARD_SPECS, - "production_release": True, - "deps": [ - "//app/src/main/java/org/oppia/android/app/application/alphakenya:alpha_kenya_application", - "//config/src/java/org/oppia/android/config:all_languages_config", - ], - "version_code": OPPIA_ALPHA_KENYA_VERSION_CODE, - "application_class": ".app.application.alphakenya.AlphaKenyaOppiaApplication", - }, "beta": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 21, diff --git a/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt b/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt deleted file mode 100644 index 634755addb5..00000000000 --- a/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt +++ /dev/null @@ -1,338 +0,0 @@ -package org.oppia.android.domain.platformparameter - -import android.content.Context -import dagger.Module -import dagger.Provides -import org.oppia.android.util.extensions.getVersionCode -import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION -import org.oppia.android.util.platformparameter.CACHE_LATEX_RENDERING -import org.oppia.android.util.platformparameter.CACHE_LATEX_RENDERING_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.CacheLatexRendering -import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT -import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI -import org.oppia.android.util.platformparameter.ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY -import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2 -import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION -import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_SPOTLIGHT_UI_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI -import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation -import org.oppia.android.util.platformparameter.EnableDownloadsSupport -import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi -import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi -import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson -import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention -import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics -import org.oppia.android.util.platformparameter.EnableLoggingLearnerStudyIds -import org.oppia.android.util.platformparameter.EnableNpsSurvey -import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2 -import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection -import org.oppia.android.util.platformparameter.EnableSpotlightUi -import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON -import org.oppia.android.util.platformparameter.FORCED_APP_UPDATE_VERSION_CODE -import org.oppia.android.util.platformparameter.ForcedAppUpdateVersionCode -import org.oppia.android.util.platformparameter.INTERACTION_CONFIG_CHANGE_STATE_RETENTION -import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS -import org.oppia.android.util.platformparameter.LOGGING_LEARNER_STUDY_IDS -import org.oppia.android.util.platformparameter.LOWEST_SUPPORTED_API_LEVEL -import org.oppia.android.util.platformparameter.LOWEST_SUPPORTED_API_LEVEL_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.LowestSupportedApiLevel -import org.oppia.android.util.platformparameter.NPS_SURVEY_GRACE_PERIOD_IN_DAYS -import org.oppia.android.util.platformparameter.NPS_SURVEY_GRACE_PERIOD_IN_DAYS_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES -import org.oppia.android.util.platformparameter.NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.NpsSurveyGracePeriodInDays -import org.oppia.android.util.platformparameter.NpsSurveyMinimumAggregateLearningTimeInATopicInMinutes -import org.oppia.android.util.platformparameter.OPTIONAL_APP_UPDATE_VERSION_CODE -import org.oppia.android.util.platformparameter.OptionalAppUpdateVersionCode -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL -import org.oppia.android.util.platformparameter.PerformanceMetricsCollectionHighFrequencyTimeIntervalInMinutes -import org.oppia.android.util.platformparameter.PerformanceMetricsCollectionLowFrequencyTimeIntervalInMinutes -import org.oppia.android.util.platformparameter.PerformanceMetricsCollectionUploadTimeIntervalInMinutes -import org.oppia.android.util.platformparameter.PlatformParameterSingleton -import org.oppia.android.util.platformparameter.PlatformParameterValue -import org.oppia.android.util.platformparameter.SPLASH_SCREEN_WELCOME_MSG -import org.oppia.android.util.platformparameter.SPLASH_SCREEN_WELCOME_MSG_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.SPOTLIGHT_UI -import org.oppia.android.util.platformparameter.SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS -import org.oppia.android.util.platformparameter.SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.SplashScreenWelcomeMsg -import org.oppia.android.util.platformparameter.SyncUpWorkerTimePeriodHours - -// TODO(#4419): Remove this module. -/** - * Dagger module that provides bindings for platform parameters for the Kenya-specific alpha build - * of the app. - */ -@Module -class PlatformParameterAlphaKenyaModule { - @Provides - @EnableDownloadsSupport - fun provideEnableDownloadsSupport( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(DOWNLOADS_SUPPORT) - ?: PlatformParameterValue.createDefaultParameter(ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE) - } - - @Provides - @SplashScreenWelcomeMsg - fun provideSplashScreenWelcomeMsgParam( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(SPLASH_SCREEN_WELCOME_MSG) - ?: PlatformParameterValue.createDefaultParameter(SPLASH_SCREEN_WELCOME_MSG_DEFAULT_VALUE) - } - - @Provides - @SyncUpWorkerTimePeriodHours - fun provideSyncUpWorkerTimePeriod( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS - ) ?: PlatformParameterValue.createDefaultParameter( - SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS_DEFAULT_VALUE - ) - } - - @Provides - @EnableEditAccountsOptionsUi - fun provideEnableEditAccountsOptionsUi( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - EDIT_ACCOUNTS_OPTIONS_UI - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE - ) - } - - @Provides - @EnableLearnerStudyAnalytics - fun provideLearnerStudyAnalytics( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - // Turn on the learner study platform parameter by default. - return platformParameterSingleton.getBooleanPlatformParameter(LEARNER_STUDY_ANALYTICS) - ?: PlatformParameterValue.createDefaultParameter(true) - } - - @Provides - @EnableFastLanguageSwitchingInLesson - fun provideFastInLessonLanguageSwitching( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - // Turn on fast language switching functionality by default. - return platformParameterSingleton.getBooleanPlatformParameter(FAST_LANGUAGE_SWITCHING_IN_LESSON) - ?: PlatformParameterValue.createDefaultParameter(true) - } - - @Provides - @EnableLoggingLearnerStudyIds - fun provideLoggingLearnerStudyIds( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - // Turn on fast language switching functionality by default. - return platformParameterSingleton.getBooleanPlatformParameter(LOGGING_LEARNER_STUDY_IDS) - ?: PlatformParameterValue.createDefaultParameter(true) - } - - @Provides - @CacheLatexRendering - fun provideCacheLatexRendering( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(CACHE_LATEX_RENDERING) - ?: PlatformParameterValue.createDefaultParameter(CACHE_LATEX_RENDERING_DEFAULT_VALUE) - } - - @Provides - @EnablePerformanceMetricsCollection - fun provideEnablePerformanceMetricCollection( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - ENABLE_PERFORMANCE_METRICS_COLLECTION - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE - ) - } - - @Provides - @PerformanceMetricsCollectionUploadTimeIntervalInMinutes - fun providePerformanceMetricsCollectionUploadTimeIntervalInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL - ) - } - - @Provides - @PerformanceMetricsCollectionHighFrequencyTimeIntervalInMinutes - fun providePerformanceMetricsCollectionHighFrequencyTimeIntervalInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL - ) - } - - @Provides - @PerformanceMetricsCollectionLowFrequencyTimeIntervalInMinutes - fun providePerformanceMetricsCollectionLowFrequencyTimeIntervalInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL - ) - } - - @Provides - @EnableExtraTopicTabsUi - fun provideEnableExtraTopicTabsUi( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - EXTRA_TOPIC_TABS_UI - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE - ) - } - - @Provides - @EnableInteractionConfigChangeStateRetention - fun provideEnableInteractionConfigChangeStateRetention( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - INTERACTION_CONFIG_CHANGE_STATE_RETENTION - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE - ) - } - - @Provides - @EnableSpotlightUi - fun provideEnableSpotlightUi( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(SPOTLIGHT_UI) - ?: PlatformParameterValue.createDefaultParameter(ENABLE_SPOTLIGHT_UI_DEFAULT_VALUE) - } - - @Provides - @EnableAppAndOsDeprecation - fun provideEnableAppAndOsDeprecation( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - APP_AND_OS_DEPRECATION - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE - ) - } - - @Provides - @OptionalAppUpdateVersionCode - fun provideOptionalAppUpdateVersionCode( - platformParameterSingleton: PlatformParameterSingleton, - context: Context - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - OPTIONAL_APP_UPDATE_VERSION_CODE - ) ?: PlatformParameterValue.createDefaultParameter( - context.getVersionCode() - ) - } - - @Provides - @ForcedAppUpdateVersionCode - fun provideForcedAppUpdateVersionCode( - platformParameterSingleton: PlatformParameterSingleton, - context: Context - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - FORCED_APP_UPDATE_VERSION_CODE - ) ?: PlatformParameterValue.createDefaultParameter( - context.getVersionCode() - ) - } - - @Provides - @LowestSupportedApiLevel - fun provideLowestSupportedApiLevel( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - LOWEST_SUPPORTED_API_LEVEL - ) ?: PlatformParameterValue.createDefaultParameter( - LOWEST_SUPPORTED_API_LEVEL_DEFAULT_VALUE - ) - } - - @Provides - @NpsSurveyGracePeriodInDays - fun provideNpsSurveyGracePeriodInDays( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - NPS_SURVEY_GRACE_PERIOD_IN_DAYS - ) ?: PlatformParameterValue.createDefaultParameter( - NPS_SURVEY_GRACE_PERIOD_IN_DAYS_DEFAULT_VALUE - ) - } - - @Provides - @NpsSurveyMinimumAggregateLearningTimeInATopicInMinutes - fun provideNpsSurveyMinimumAggregateLearningTimeInATopicInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES_DEFAULT_VALUE - ) - } - - @Provides - @EnableNpsSurvey - fun provideEnableNpsSurvey( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(ENABLE_NPS_SURVEY) - ?: PlatformParameterValue.createDefaultParameter( - ENABLE_NPS_SURVEY_DEFAULT_VALUE - ) - } - - @Provides - @EnableOnboardingFlowV2 - fun provideEnableOnboardingFlowV2( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(ENABLE_ONBOARDING_FLOW_V2) - ?: PlatformParameterValue.createDefaultParameter( - ENABLE_ONBOARDING_FLOW_V2_DEFAULT_VALUE - ) - } -} diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto index 0a1f51904ad..d4c71360f76 100644 --- a/scripts/assets/test_file_exemptions.textproto +++ b/scripts/assets/test_file_exemptions.textproto @@ -54,9 +54,6 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/application/Applica exempted_file_path: "app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt" exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alpha/AlphaOppiaApplication.kt" exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt" -exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt" -exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaBuildFlavorModule.kt" -exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt" exempted_file_path: "app/src/main/java/org/oppia/android/app/application/beta/BetaOppiaApplication.kt" exempted_file_path: "app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt" exempted_file_path: "app/src/main/java/org/oppia/android/app/application/dev/DeveloperOppiaApplication.kt" @@ -690,7 +687,6 @@ exempted_file_path: "domain/src/main/java/org/oppia/android/domain/feedbackrepor exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/DelayShowAdditionalHintsMillis.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/DelayShowInitialHintMillis.kt" -exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigModule.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintHandler.kt" @@ -712,7 +708,6 @@ exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/e exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler/MetricLogSchedulingWorkerFactory.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerFactory.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkerModule.kt" -exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaModule.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterSingletonImpl.kt" exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterSingletonModule.kt" diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel index e0bb6856702..39c77ea4e8e 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel @@ -150,19 +150,6 @@ kt_android_library( ], ) -kt_android_library( - name = "kenya_alpha_event_logging_configuration_module", - srcs = [ - "KenyaAlphaEventLoggingConfigurationModule.kt", - "KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt", - ], - visibility = ["//:oppia_prod_module_visibility"], - deps = [ - ":dagger", - ":event_type_to_human_readable_name_converter", - ], -) - kt_android_library( name = "log_uploader", srcs = [ diff --git a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModule.kt b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModule.kt deleted file mode 100644 index 447525e5488..00000000000 --- a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModule.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.oppia.android.util.logging - -import dagger.Binds -import dagger.Module - -/** - * Module to provide event logging infrastructure configurations specific to Kenya study alpha - * builds of the app. - */ -@Module -interface KenyaAlphaEventLoggingConfigurationModule { - @Binds - fun bindKenyaAlphaSpecificEventTypeToHumanReadableNameConverter( - impl: KenyaAlphaEventTypeToHumanReadableNameConverterImpl - ): EventTypeToHumanReadableNameConverter -} diff --git a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt deleted file mode 100644 index 726eb02c85e..00000000000 --- a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt +++ /dev/null @@ -1,62 +0,0 @@ -package org.oppia.android.util.logging - -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase -import javax.inject.Inject - -// TODO(#4419): Remove this implementation and the extra piping for event name mapping. -/** - * Implementation of [EventTypeToHumanReadableNameConverter] which provides legacy event names for - * interoperability with previously logged data in the Kenya user study. - * - * The event names provided by this implementation are expected to never change as these names are - * the primary ways each corresponding event is identified in logged event queries. - */ -class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor() : - EventTypeToHumanReadableNameConverter { - override fun convertToHumanReadableName(eventType: ActivityContextCase): String { - return when (eventType) { - ActivityContextCase.OPEN_EXPLORATION_ACTIVITY -> "open_exploration_activity" - ActivityContextCase.OPEN_INFO_TAB -> "open_info_tab" - ActivityContextCase.OPEN_LESSONS_TAB -> "open_lessons_tab" - ActivityContextCase.OPEN_PRACTICE_TAB -> "open_practice_tab" - ActivityContextCase.OPEN_REVISION_TAB -> "open_revision_tab" - ActivityContextCase.OPEN_QUESTION_PLAYER -> "open_question_player" - ActivityContextCase.OPEN_STORY_ACTIVITY -> "open_story_activity" - ActivityContextCase.OPEN_CONCEPT_CARD -> "open_concept_card" - ActivityContextCase.OPEN_REVISION_CARD -> "open_revision_card" - ActivityContextCase.CLOSE_REVISION_CARD -> "close_revision_card" - ActivityContextCase.START_CARD_CONTEXT -> "start_card_context" - ActivityContextCase.END_CARD_CONTEXT -> "end_card_context" - ActivityContextCase.HINT_UNLOCKED_CONTEXT -> "hint_offered_context" - ActivityContextCase.ACCESS_HINT_CONTEXT -> "access_hint_context" - ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -> "solution_offered_context" - ActivityContextCase.ACCESS_SOLUTION_CONTEXT -> "access_solution_context" - ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer_context" - ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "play_voice_over_context" - ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "pause_voice_over_context" - ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "app_in_background_context" - ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "app_in_foreground_context" - ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "exit_exploration_context" - ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "finish_exploration_context" - ActivityContextCase.RESUME_EXPLORATION_CONTEXT -> "resume_exploration_context" - ActivityContextCase.START_OVER_EXPLORATION_CONTEXT -> "start_over_exploration_context" - ActivityContextCase.DELETE_PROFILE_CONTEXT -> "delete_profile_context" - ActivityContextCase.OPEN_HOME -> "open_home" - ActivityContextCase.OPEN_PROFILE_CHOOSER -> "open_profile_chooser" - ActivityContextCase.REACH_INVESTED_ENGAGEMENT -> "reached_invested_engagement" - ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -> "switch_in_lesson_language" - ActivityContextCase.SHOW_SURVEY_POPUP -> "show_survey_popup" - ActivityContextCase.BEGIN_SURVEY -> "begin_survey" - ActivityContextCase.ABANDON_SURVEY -> "abandon_survey" - ActivityContextCase.MANDATORY_RESPONSE -> "mandatory_response" - ActivityContextCase.OPTIONAL_RESPONSE -> "optional_response" - ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG -> "failed_analytics_log" - ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -> "unknown_activity_context" - ActivityContextCase.COMPLETE_APP_ONBOARDING -> "complete_app_onboarding" - ActivityContextCase.CONSOLE_LOG -> "console_log" - ActivityContextCase.RETROFIT_CALL_CONTEXT -> "retrofit_call_context" - ActivityContextCase.RETROFIT_CALL_FAILED_CONTEXT -> "retrofit_call_failed_context" - ActivityContextCase.APP_IN_FOREGROUND_TIME -> "app_in_foreground_time" - } - } -} diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel index 15aa68e6b79..7d220d7172e 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel @@ -62,43 +62,6 @@ oppia_android_test( ], ) -oppia_android_test( - name = "KenyaAlphaEventBundleCreatorTest", - srcs = ["KenyaAlphaEventBundleCreatorTest.kt"], - custom_package = "org.oppia.android.util.logging", - test_class = "org.oppia.android.util.logging.KenyaAlphaEventBundleCreatorTest", - test_manifest = "//utility:test_manifest", - deps = [ - ":dagger", - "//testing", - "//third_party:androidx_test_ext_junit", - "//third_party:androidx_test_ext_truth", - "//third_party:com_google_truth_truth", - "//third_party:org_robolectric_robolectric", - "//third_party:robolectric_android-all", - "//utility/src/main/java/org/oppia/android/util/logging:event_bundle_creator", - "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module", - ], -) - -oppia_android_test( - name = "KenyaAlphaEventLoggingConfigurationModuleTest", - srcs = ["KenyaAlphaEventLoggingConfigurationModuleTest.kt"], - custom_package = "org.oppia.android.util.logging", - test_class = "org.oppia.android.util.logging.KenyaAlphaEventLoggingConfigurationModuleTest", - test_manifest = "//utility:test_manifest", - deps = [ - ":dagger", - "//testing", - "//third_party:androidx_test_ext_junit", - "//third_party:androidx_test_ext_truth", - "//third_party:com_google_truth_truth", - "//third_party:org_robolectric_robolectric", - "//third_party:robolectric_android-all", - "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module", - ], -) - oppia_android_test( name = "StandardEventTypeToHumanReadableNameConverterImplTest", srcs = ["StandardEventTypeToHumanReadableNameConverterImplTest.kt"], diff --git a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt deleted file mode 100644 index ccc9f65bf3f..00000000000 --- a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt +++ /dev/null @@ -1,1616 +0,0 @@ -package org.oppia.android.util.logging - -import android.app.Application -import android.content.Context -import android.os.Bundle -import androidx.test.core.app.ApplicationProvider -import androidx.test.core.content.pm.ApplicationInfoBuilder -import androidx.test.core.content.pm.PackageInfoBuilder -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.ext.truth.os.BundleSubject.assertThat -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.After -import org.junit.Test -import org.junit.runner.RunWith -import org.oppia.android.app.model.EventLog -import org.oppia.android.app.model.EventLog.CardContext -import org.oppia.android.app.model.EventLog.ConceptCardContext -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_HINT_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_SOLUTION_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CLOSE_REVISION_CARD -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.DELETE_PROFILE_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.END_CARD_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXIT_EXPLORATION_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.FINISH_EXPLORATION_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_UNLOCKED_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_CONCEPT_CARD -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_EXPLORATION_ACTIVITY -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_HOME -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_INFO_TAB -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_LESSONS_TAB -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_PRACTICE_TAB -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_PROFILE_CHOOSER -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_QUESTION_PLAYER -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_CARD -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_TAB -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_STORY_ACTIVITY -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_CARD_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_OVER_EXPLORATION_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SUBMIT_ANSWER_CONTEXT -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -import org.oppia.android.app.model.EventLog.ExplorationContext -import org.oppia.android.app.model.EventLog.HintContext -import org.oppia.android.app.model.EventLog.LearnerDetailsContext -import org.oppia.android.app.model.EventLog.Priority.ESSENTIAL -import org.oppia.android.app.model.EventLog.Priority.OPTIONAL -import org.oppia.android.app.model.EventLog.QuestionContext -import org.oppia.android.app.model.EventLog.RevisionCardContext -import org.oppia.android.app.model.EventLog.StoryContext -import org.oppia.android.app.model.EventLog.SubmitAnswerContext -import org.oppia.android.app.model.EventLog.SwitchInLessonLanguageEventContext -import org.oppia.android.app.model.EventLog.TopicContext -import org.oppia.android.app.model.EventLog.VoiceoverActionContext -import org.oppia.android.app.model.OppiaLanguage -import org.oppia.android.util.platformparameter.EnableLoggingLearnerStudyIds -import org.oppia.android.util.platformparameter.LOGGING_LEARNER_STUDY_IDS_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.PlatformParameterValue -import org.robolectric.Shadows -import org.robolectric.annotation.Config -import org.robolectric.annotation.LooperMode -import javax.inject.Inject -import javax.inject.Singleton -import org.oppia.android.app.model.EventLog.Context.Builder as EventContextBuilder - -private const val TEST_ANDROID_SDK_VERSION = 30 - -// TODO(#4419): Remove this test suite post-Kenya user study. -/** - * Variant of [EventBundleCreatorTest] but for testing behaviors specific to alpha builds of the app - * intended for users in the Kenya user study. - */ -// FunctionName: test names are conventionally named with underscores. -@Suppress("FunctionName") -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -@Config( - application = KenyaAlphaEventBundleCreatorTest.TestApplication::class, - sdk = [TEST_ANDROID_SDK_VERSION] -) -class KenyaAlphaEventBundleCreatorTest { - private companion object { - private const val TEST_TIMESTAMP_1 = 1556094120000 - private const val TEST_TIMESTAMP_2 = 1234567898765 - private const val TEST_TOPIC_ID = "test_topic_id" - private const val TEST_STORY_ID = "test_story_id" - private const val TEST_EXPLORATION_ID = "test_exploration_id" - private const val TEST_QUESTION_ID = "test_question_id" - private const val TEST_SKILL_ID_1 = "test_skill_id_1" - private const val TEST_SKILL_ID_2 = "test_skill_id_2" - private const val TEST_SUB_TOPIC_INDEX = 1 - private const val TEST_SUB_TOPIC_INDEX_STR = "1" - private const val TEST_LEARNER_ID = "test_ed_ld_learner_id" - private const val TEST_INSTALLATION_ID = "test_installation_id" - private const val TEST_LEARNER_SESSION_ID = "test_session_id" - private const val TEST_EXPLORATION_VERSION = 5 - private const val TEST_EXPLORATION_VERSION_STR = "5" - private const val TEST_STATE_NAME = "test_state_name" - private const val TEST_HINT_INDEX = 1 - private const val TEST_HINT_INDEX_STR = "1" - private const val TEST_IS_ANSWER_CORRECT = true - private const val TEST_IS_ANSWER_CORRECT_STR = "true" - private const val TEST_CONTENT_ID = "test_content_id" - private const val TEST_LANGUAGE_CODE = "en" - private const val TEST_APP_VERSION_NAME = "oppia-android-test-0123456789" - private const val TEST_APP_VERSION_CODE = 125L - } - - @Inject lateinit var context: Context - @Inject lateinit var eventBundleCreator: EventBundleCreator - - @After - fun tearDown() { - TestModule.enableLoggingLearnerStudyIds = LOGGING_LEARNER_STUDY_IDS_DEFAULT_VALUE - } - - @Test - fun testFillEventBundle_defaultEvent_defaultsBundleAndReturnsUnknownActivityContext() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val typeName = eventBundleCreator.fillEventBundle(EventLog.getDefaultInstance(), bundle) - - assertThat(typeName).isEqualTo("unknown_activity_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(0) - assertThat(bundle).string("priority").isEqualTo("unspecified_priority") - assertThat(bundle).integer("event_type").isEqualTo(ACTIVITYCONTEXT_NOT_SET.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_eventWithDefaultedContext_fillsPriorityAndTimeAndRetsUnknownContext() { - setUpTestApplicationComponent() - val bundle = Bundle() - val eventLog = createEventLog(timestamp = TEST_TIMESTAMP_1, priority = ESSENTIAL) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - - assertThat(typeName).isEqualTo("unknown_activity_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(ACTIVITYCONTEXT_NOT_SET.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_eventWithDifferentTimestamp_savesDifferentTimestampInBundle() { - setUpTestApplicationComponent() - val bundle = Bundle() - val eventLog = createEventLog(timestamp = TEST_TIMESTAMP_2) - - eventBundleCreator.fillEventBundle(eventLog, bundle) - - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_2) - } - - @Test - fun testFillEventBundle_eventWithDifferentPriority_savesDifferentPriorityInBundle() { - setUpTestApplicationComponent() - val bundle = Bundle() - val eventLog = createEventLog(priority = OPTIONAL) - - eventBundleCreator.fillEventBundle(eventLog, bundle) - - assertThat(bundle).string("priority").isEqualTo("optional") - } - - @Test - fun testFillEventBundle_openExpActivityEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenExplorationActivity()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_exploration_activity") - assertThat(bundle).hasSize(17) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - } - - @Test - fun testFillEventBundle_openExpActivityEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenExplorationActivity()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_exploration_activity") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_openInfoTabContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenInfoTab()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_info_tab") - assertThat(bundle).hasSize(12) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_INFO_TAB.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - } - - @Test - fun testFillEventBundle_openLessonsTabContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenLessonsTab()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_lessons_tab") - assertThat(bundle).hasSize(12) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_LESSONS_TAB.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - } - - @Test - fun testFillEventBundle_openPracticeTabContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenPracticeTab()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_practice_tab") - assertThat(bundle).hasSize(12) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_PRACTICE_TAB.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - } - - @Test - fun testFillEventBundle_openRevisionTabContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenRevisionTab()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_revision_tab") - assertThat(bundle).hasSize(12) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_REVISION_TAB.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - } - - @Test - fun testFillEventBundle_openQuestionPlayerContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenQuestionPlayer()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_question_player") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_QUESTION_PLAYER.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("question_id").isEqualTo(TEST_QUESTION_ID) - assertThat(bundle).string("skill_ids").isEqualTo("$TEST_SKILL_ID_1,$TEST_SKILL_ID_2") - } - - @Test - fun testFillEventBundle_openStoryActivityContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenStoryActivity()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_story_activity") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_STORY_ACTIVITY.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - } - - @Test - fun testFillEventBundle_openConceptCardContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenConceptCard()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_concept_card") - assertThat(bundle).hasSize(12) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_CONCEPT_CARD.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("skill_id").isEqualTo(TEST_SKILL_ID_1) - } - - @Test - fun testFillEventBundle_openRevisionCardContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenRevisionCard()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_revision_card") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_REVISION_CARD.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("subtopic_index").isEqualTo(TEST_SUB_TOPIC_INDEX_STR) - } - - @Test - fun testFillEventBundle_closeRevisionCardContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createCloseRevisionCard()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("close_revision_card") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(CLOSE_REVISION_CARD.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("subtopic_index").isEqualTo(TEST_SUB_TOPIC_INDEX_STR) - } - - @Test - fun testFillEventBundle_startCardContextEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createStartCardContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("start_card_context") - assertThat(bundle).hasSize(18) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("skill_id").isEqualTo(TEST_SKILL_ID_1) - } - - @Test - fun testFillEventBundle_startCardContextEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createStartCardContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("start_card_context") - assertThat(bundle).hasSize(20) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("skill_id").isEqualTo(TEST_SKILL_ID_1) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_endCardContextEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createEndCardContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("end_card_context") - assertThat(bundle).hasSize(18) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("skill_id").isEqualTo(TEST_SKILL_ID_1) - } - - @Test - fun testFillEventBundle_endCardContextEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createEndCardContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("end_card_context") - assertThat(bundle).hasSize(20) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("skill_id").isEqualTo(TEST_SKILL_ID_1) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_hintUnlockedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createHintUnlockedContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("hint_offered_context") - assertThat(bundle).hasSize(18) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("hint_index").isEqualTo(TEST_HINT_INDEX_STR) - } - - @Test - fun testFillEventBundle_hintUnlockedEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createHintUnlockedContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("hint_offered_context") - assertThat(bundle).hasSize(20) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("hint_index").isEqualTo(TEST_HINT_INDEX_STR) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_accessHintContextEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAccessHintContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("access_hint_context") - assertThat(bundle).hasSize(18) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("hint_index").isEqualTo(TEST_HINT_INDEX_STR) - } - - @Test - fun testFillEventBundle_accessHintContextEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAccessHintContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("access_hint_context") - assertThat(bundle).hasSize(20) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("hint_index").isEqualTo(TEST_HINT_INDEX_STR) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_solutionUnlockedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createSolutionUnlockedContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("solution_offered_context") - assertThat(bundle).hasSize(17) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - } - - @Test - fun testFillEventBundle_solutionUnlockedEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createSolutionUnlockedContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("solution_offered_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_accessSolutionEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAccessSolutionContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("access_solution_context") - assertThat(bundle).hasSize(17) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - } - - @Test - fun testFillEventBundle_accessSolutionEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAccessSolutionContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("access_solution_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_submitAnswerEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createSubmitAnswerContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("submit_answer_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("submitted_answer").isEmpty() - assertThat(bundle).string("is_answer_correct").isEqualTo(TEST_IS_ANSWER_CORRECT_STR) - } - - @Test - fun testFillEventBundle_submitAnswerEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createSubmitAnswerContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("submit_answer_context") - assertThat(bundle).hasSize(21) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("submitted_answer").isEmpty() - assertThat(bundle).string("is_answer_correct").isEqualTo(TEST_IS_ANSWER_CORRECT_STR) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_playVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createPlayVoiceOverContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("play_voice_over_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID) - assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE) - } - - @Test - fun testFillEventBundle_playVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createPlayVoiceOverContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("play_voice_over_context") - assertThat(bundle).hasSize(21) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID) - assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createPauseVoiceOverContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("pause_voice_over_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID) - assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE) - } - - @Test - fun testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createPauseVoiceOverContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("pause_voice_over_context") - assertThat(bundle).hasSize(21) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID) - assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_appInBackgroundEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAppInBackgroundContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("app_in_background_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(APP_IN_BACKGROUND_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_appInBackgroundEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAppInBackgroundContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("app_in_background_context") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(APP_IN_BACKGROUND_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_appInForegroundEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAppInForegroundContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("app_in_foreground_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(APP_IN_FOREGROUND_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_appInForegroundEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createAppInForegroundContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("app_in_foreground_context") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(APP_IN_FOREGROUND_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_exitExplorationEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createExitExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("exit_exploration_context") - assertThat(bundle).hasSize(17) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - } - - @Test - fun testFillEventBundle_exitExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createExitExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("exit_exploration_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_finishExplorationEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createFinishExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("finish_exploration_context") - assertThat(bundle).hasSize(17) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - } - - @Test - fun testFillEventBundle_finishExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createFinishExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("finish_exploration_context") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_resumeExplorationEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createResumeExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("resume_exploration_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(RESUME_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_resumeExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createResumeExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("resume_exploration_context") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(RESUME_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_startOverExpEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createStartOverExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("start_over_exploration_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(START_OVER_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_startOverExpEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createStartOverExplorationContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("start_over_exploration_context") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(START_OVER_EXPLORATION_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_deleteProfileEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createDeleteProfileContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("delete_profile_context") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(DELETE_PROFILE_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_deleteProfileEvent_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createDeleteProfileContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("delete_profile_context") - assertThat(bundle).hasSize(13) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(DELETE_PROFILE_CONTEXT.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - @Test - fun testFillEventBundle_openHomeContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenHomeContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_home") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_HOME.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_openProfileChooserContextEvent_fillsAllFieldsInBundleAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createOpenProfileChooserContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("open_profile_chooser") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(OPEN_PROFILE_CHOOSER.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_switchInLessonLanguageEvent_studyOff_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponent() - val bundle = Bundle() - - val eventLog = createEventLog(context = createSwitchInLessonLanguageContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("switch_in_lesson_language") - assertThat(bundle).hasSize(19) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("from_language").isEqualTo("English") - assertThat(bundle).string("to_language").isEqualTo("Swahili") - } - - @Test - fun testFillEventBundle_switchInLessonLanguageEvent_studyOn_fillsNonSensitiveDataAndRetsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createSwitchInLessonLanguageContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("switch_in_lesson_language") - assertThat(bundle).hasSize(21) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID) - assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID) - assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID) - assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID) - assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR) - assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME) - assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID) - assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID) - assertThat(bundle).string("from_language").isEqualTo("English") - assertThat(bundle).string("to_language").isEqualTo("Swahili") - } - - @Test - fun testFillEventBundle_failedEventInstallId_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() { - setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createInstallationIdForFailedAnalyticsLogContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("failed_analytics_log") - assertThat(bundle).hasSize(11) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(INSTALL_ID_FOR_FAILED_ANALYTICS_LOG.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - } - - @Test - fun testFillEventBundle_failedEventInstallId_studyOn_fillsAllFieldsAndReturnsName() { - setUpTestApplicationComponentWithLearnerAnalyticsStudy() - val bundle = Bundle() - - val eventLog = createEventLog(context = createInstallationIdForFailedAnalyticsLogContext()) - - val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle) - assertThat(typeName).isEqualTo("failed_analytics_log") - assertThat(bundle).hasSize(12) - assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1) - assertThat(bundle).string("priority").isEqualTo("essential") - assertThat(bundle).integer("event_type").isEqualTo(INSTALL_ID_FOR_FAILED_ANALYTICS_LOG.number) - assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION) - assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME) - assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE) - assertThat(bundle).string("install_id").isEqualTo(TEST_INSTALLATION_ID) - } - - private fun createEventLog( - timestamp: Long = TEST_TIMESTAMP_1, - priority: EventLog.Priority = ESSENTIAL, - context: EventLog.Context = EventLog.Context.getDefaultInstance() - ) = EventLog.newBuilder().apply { - this.timestamp = timestamp - this.priority = priority - this.context = context - }.build() - - private fun createOpenExplorationActivity( - explorationContext: ExplorationContext = createExplorationContext() - ) = createEventContext(explorationContext, EventContextBuilder::setOpenExplorationActivity) - - private fun createOpenInfoTab(topicContext: TopicContext = createTopicContext()) = - createEventContext(topicContext, EventContextBuilder::setOpenInfoTab) - - private fun createOpenLessonsTab(topicContext: TopicContext = createTopicContext()) = - createEventContext(topicContext, EventContextBuilder::setOpenLessonsTab) - - private fun createOpenPracticeTab(topicContext: TopicContext = createTopicContext()) = - createEventContext(topicContext, EventContextBuilder::setOpenPracticeTab) - - private fun createOpenRevisionTab(topicContext: TopicContext = createTopicContext()) = - createEventContext(topicContext, EventContextBuilder::setOpenRevisionTab) - - private fun createOpenQuestionPlayer(questionContext: QuestionContext = createQuestionContext()) = - createEventContext(questionContext, EventContextBuilder::setOpenQuestionPlayer) - - private fun createOpenStoryActivity(storyContext: StoryContext = createStoryContext()) = - createEventContext(storyContext, EventContextBuilder::setOpenStoryActivity) - - private fun createOpenConceptCard( - conceptCardContext: ConceptCardContext = createConceptCardContext() - ) = createEventContext(conceptCardContext, EventContextBuilder::setOpenConceptCard) - - private fun createOpenRevisionCard( - revisionCardContext: RevisionCardContext = createRevisionCardContext() - ) = createEventContext(revisionCardContext, EventContextBuilder::setOpenRevisionCard) - - private fun createCloseRevisionCard( - revisionCardContext: RevisionCardContext = createRevisionCardContext() - ) = createEventContext(revisionCardContext, EventContextBuilder::setCloseRevisionCard) - - private fun createStartCardContext(cardContext: CardContext = createCardContext()) = - createEventContext(cardContext, EventContextBuilder::setStartCardContext) - - private fun createEndCardContext(cardContext: CardContext = createCardContext()) = - createEventContext(cardContext, EventContextBuilder::setEndCardContext) - - private fun createHintUnlockedContext(hintContext: HintContext = createHintContext()) = - createEventContext(hintContext, EventContextBuilder::setHintUnlockedContext) - - private fun createAccessHintContext(hintContext: HintContext = createHintContext()) = - createEventContext(hintContext, EventContextBuilder::setAccessHintContext) - - private fun createSolutionUnlockedContext( - explorationContext: ExplorationContext = createExplorationContext() - ) = createEventContext(explorationContext, EventContextBuilder::setSolutionUnlockedContext) - - private fun createAccessSolutionContext( - explorationContext: ExplorationContext = createExplorationContext() - ) = createEventContext(explorationContext, EventContextBuilder::setAccessSolutionContext) - - private fun createSubmitAnswerContext( - submitAnswerContext: SubmitAnswerContext = createSubmitAnswerContextDetails() - ) = createEventContext(submitAnswerContext, EventContextBuilder::setSubmitAnswerContext) - - private fun createPlayVoiceOverContext( - playVoiceOverContext: VoiceoverActionContext = createPlayVoiceOverContextDetails() - ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPlayVoiceOverContext) - - private fun createPauseVoiceOverContext( - pauseVoiceOverContext: VoiceoverActionContext = createPauseVoiceOverContextDetails() - ) = createEventContext(pauseVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext) - - private fun createAppInBackgroundContext( - learnerDetails: LearnerDetailsContext = createLearnerDetailsContext() - ) = createEventContext(learnerDetails, EventContextBuilder::setAppInBackgroundContext) - - private fun createAppInForegroundContext( - learnerDetails: LearnerDetailsContext = createLearnerDetailsContext() - ) = createEventContext(learnerDetails, EventContextBuilder::setAppInForegroundContext) - - private fun createExitExplorationContext( - explorationContext: ExplorationContext = createExplorationContext() - ) = createEventContext(explorationContext, EventContextBuilder::setExitExplorationContext) - - private fun createFinishExplorationContext( - explorationContext: ExplorationContext = createExplorationContext() - ) = createEventContext(explorationContext, EventContextBuilder::setFinishExplorationContext) - - private fun createResumeExplorationContext( - learnerDetails: LearnerDetailsContext = createLearnerDetailsContext() - ) = createEventContext(learnerDetails, EventContextBuilder::setResumeExplorationContext) - - private fun createStartOverExplorationContext( - learnerDetails: LearnerDetailsContext = createLearnerDetailsContext() - ) = createEventContext(learnerDetails, EventContextBuilder::setStartOverExplorationContext) - - private fun createDeleteProfileContext( - learnerDetails: LearnerDetailsContext = createLearnerDetailsContext() - ) = createEventContext(learnerDetails, EventContextBuilder::setDeleteProfileContext) - - private fun createOpenHomeContext() = - createEventContext(value = true, EventContextBuilder::setOpenHome) - - private fun createOpenProfileChooserContext() = - createEventContext(value = true, EventContextBuilder::setOpenProfileChooser) - - private fun createSwitchInLessonLanguageContext( - switchLanguageContext: SwitchInLessonLanguageEventContext = - createSwitchInLessonLanguageEventContext(), - ) = createEventContext(switchLanguageContext, EventContextBuilder::setSwitchInLessonLanguage) - - private fun createInstallationIdForFailedAnalyticsLogContext( - installationId: String = TEST_INSTALLATION_ID - ) = createEventContext(installationId, EventContextBuilder::setInstallIdForFailedAnalyticsLog) - - private fun createEventContext( - value: T, - setter: EventContextBuilder.(T) -> EventContextBuilder - ) = EventLog.Context.newBuilder().setter(value).build() - - private fun createExplorationContext( - topicId: String = TEST_TOPIC_ID, - storyId: String = TEST_STORY_ID, - explorationId: String = TEST_EXPLORATION_ID, - sessionId: String = TEST_LEARNER_SESSION_ID, - explorationVersion: Int = TEST_EXPLORATION_VERSION, - stateName: String = TEST_STATE_NAME, - learnerDetails: LearnerDetailsContext = createLearnerDetailsContext() - ) = ExplorationContext.newBuilder().apply { - this.topicId = topicId - this.storyId = storyId - this.explorationId = explorationId - this.sessionId = sessionId - this.explorationVersion = explorationVersion - this.stateName = stateName - this.learnerDetails = learnerDetails - }.build() - - private fun createLearnerDetailsContext( - learnerId: String = TEST_LEARNER_ID, - installId: String = TEST_INSTALLATION_ID - ) = LearnerDetailsContext.newBuilder().apply { - this.learnerId = learnerId - this.installId = installId - }.build() - - private fun createTopicContext(topicId: String = TEST_TOPIC_ID) = - TopicContext.newBuilder().apply { this.topicId = topicId }.build() - - private fun createQuestionContext( - questionId: String = TEST_QUESTION_ID, - skillIds: List = listOf(TEST_SKILL_ID_1, TEST_SKILL_ID_2) - ) = QuestionContext.newBuilder().apply { - this.questionId = questionId - addAllSkillId(skillIds) - }.build() - - private fun createStoryContext( - topicId: String = TEST_TOPIC_ID, - storyId: String = TEST_STORY_ID - ) = StoryContext.newBuilder().apply { - this.topicId = topicId - this.storyId = storyId - }.build() - - private fun createConceptCardContext(skillId: String = TEST_SKILL_ID_1) = - ConceptCardContext.newBuilder().apply { this.skillId = skillId }.build() - - private fun createRevisionCardContext( - topicId: String = TEST_TOPIC_ID, - subTopicIndex: Int = TEST_SUB_TOPIC_INDEX - ) = RevisionCardContext.newBuilder().apply { - this.topicId = topicId - subTopicId = subTopicIndex - }.build() - - private fun createCardContext( - explorationDetails: ExplorationContext = createExplorationContext(), - skillId: String = TEST_SKILL_ID_1 - ) = CardContext.newBuilder().apply { - this.explorationDetails = explorationDetails - this.skillId = skillId - }.build() - - private fun createHintContext( - explorationDetails: ExplorationContext = createExplorationContext(), - hintIndex: Int = TEST_HINT_INDEX - ) = HintContext.newBuilder().apply { - this.explorationDetails = explorationDetails - this.hintIndex = hintIndex - }.build() - - private fun createSubmitAnswerContextDetails( - explorationDetails: ExplorationContext = createExplorationContext(), - isAnswerCorrect: Boolean = TEST_IS_ANSWER_CORRECT - ) = SubmitAnswerContext.newBuilder().apply { - this.explorationDetails = explorationDetails - this.isAnswerCorrect = isAnswerCorrect - }.build() - - private fun createPlayVoiceOverContextDetails( - explorationDetails: ExplorationContext = createExplorationContext(), - contentId: String = TEST_CONTENT_ID, - languageCode: String = TEST_LANGUAGE_CODE - ) = VoiceoverActionContext.newBuilder().apply { - this.explorationDetails = explorationDetails - this.contentId = contentId - this.languageCode = languageCode - }.build() - - private fun createPauseVoiceOverContextDetails( - explorationDetails: ExplorationContext = createExplorationContext(), - contentId: String = TEST_CONTENT_ID, - languageCode: String = TEST_LANGUAGE_CODE - ) = VoiceoverActionContext.newBuilder().apply { - this.explorationDetails = explorationDetails - this.contentId = contentId - this.languageCode = languageCode - }.build() - - private fun createSwitchInLessonLanguageEventContext( - explorationDetails: ExplorationContext = createExplorationContext(), - switchFromLanguage: OppiaLanguage = OppiaLanguage.ENGLISH, - switchToLanguage: OppiaLanguage = OppiaLanguage.SWAHILI - ) = SwitchInLessonLanguageEventContext.newBuilder().apply { - this.explorationDetails = explorationDetails - this.switchFromLanguage = switchFromLanguage - this.switchToLanguage = switchToLanguage - }.build() - - private fun registerTestApplication() { - val packageManager = Shadows.shadowOf(context.packageManager) - val applicationInfo = - ApplicationInfoBuilder.newBuilder() - .setPackageName(context.packageName) - .build() - val packageInfo = - PackageInfoBuilder.newBuilder() - .setPackageName(context.packageName) - .setApplicationInfo(applicationInfo) - .build() - packageInfo.versionName = TEST_APP_VERSION_NAME - packageInfo.longVersionCode = TEST_APP_VERSION_CODE - packageManager.installPackage(packageInfo) - } - - private fun setUpTestApplicationComponentWithoutLearnerAnalyticsStudy() { - TestModule.enableLoggingLearnerStudyIds = false - setUpTestApplicationComponent() - } - - private fun setUpTestApplicationComponentWithLearnerAnalyticsStudy() { - TestModule.enableLoggingLearnerStudyIds = true - setUpTestApplicationComponent() - } - - private fun setUpTestApplicationComponent() { - ApplicationProvider.getApplicationContext().inject(this) - registerTestApplication() - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - internal companion object { - // This is expected to be off by default, so this helps the tests above confirm that the - // feature's default value is, indeed, off. - var enableLoggingLearnerStudyIds = LOGGING_LEARNER_STUDY_IDS_DEFAULT_VALUE - } - - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - - // The scoping here is to ensure changes to the module value above don't change the parameter - // within the same application instance. - @Provides - @Singleton - @EnableLoggingLearnerStudyIds - fun provideLoggingLearnerStudyIds(): PlatformParameterValue { - // Snapshot the value so that it doesn't change between injection and use. - val enableFeature = enableLoggingLearnerStudyIds - return PlatformParameterValue.createDefaultParameter( - defaultValue = enableFeature - ) - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component(modules = [TestModule::class, KenyaAlphaEventLoggingConfigurationModule::class]) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: KenyaAlphaEventBundleCreatorTest) - } - - class TestApplication : Application() { - private val component: TestApplicationComponent by lazy { - DaggerKenyaAlphaEventBundleCreatorTest_TestApplicationComponent.builder() - .setApplication(this) - .build() - } - - fun inject(test: KenyaAlphaEventBundleCreatorTest) { - component.inject(test) - } - } -} diff --git a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModuleTest.kt b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModuleTest.kt deleted file mode 100644 index 31d1130c3d0..00000000000 --- a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModuleTest.kt +++ /dev/null @@ -1,70 +0,0 @@ -package org.oppia.android.util.logging - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.annotation.Config -import org.robolectric.annotation.LooperMode -import javax.inject.Inject -import javax.inject.Singleton - -/** Tests for [KenyaAlphaEventLoggingConfigurationModule]. */ -// FunctionName: test names are conventionally named with underscores. -@Suppress("FunctionName") -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -@Config(manifest = Config.NONE) -class KenyaAlphaEventLoggingConfigurationModuleTest { - @Inject lateinit var eventTypeToHumanReadableNameConverter: EventTypeToHumanReadableNameConverter - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testModule_injectedEventTypeToHumanReadableNameConverter_isStudySpecificImplementation() { - assertThat(eventTypeToHumanReadableNameConverter) - .isInstanceOf(KenyaAlphaEventTypeToHumanReadableNameConverterImpl::class.java) - } - - private fun setUpTestApplicationComponent() { - DaggerKenyaAlphaEventLoggingConfigurationModuleTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component(modules = [KenyaAlphaEventLoggingConfigurationModule::class]) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: KenyaAlphaEventLoggingConfigurationModuleTest) - } -} diff --git a/version.bzl b/version.bzl index eb277cfabb8..a0316b23c90 100644 --- a/version.bzl +++ b/version.bzl @@ -12,10 +12,8 @@ the app (that are potentially not broadly released yet). MAJOR_VERSION = 0 MINOR_VERSION = 13 -# TODO(#4419): Remove the Kenya-specific alpha version code. OPPIA_DEV_VERSION_CODE = 117 OPPIA_DEV_KITKAT_VERSION_CODE = 116 -OPPIA_ALPHA_KENYA_VERSION_CODE = 115 OPPIA_ALPHA_VERSION_CODE = 114 OPPIA_ALPHA_KITKAT_VERSION_CODE = 113 OPPIA_BETA_VERSION_CODE = 112 From cf295b9ed5020156c4108e69f5b6014752f42c2e Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:12:44 -0400 Subject: [PATCH 02/12] Remove the last file related with AlphaKenya --- .../HintsAndSolutionConfigAlphaKenyaModule.kt | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt diff --git a/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt b/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt deleted file mode 100644 index 5449e58af2b..00000000000 --- a/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.oppia.android.domain.hintsandsolution - -import dagger.Module -import dagger.Provides -import java.util.concurrent.TimeUnit - -/** Production module for providing configurations for hints & solutions. */ -@Module -class HintsAndSolutionConfigAlphaKenyaModule { - @Provides - @DelayShowInitialHintMillis - fun provideInitialDelayForShowingHintsMillis(): Long = TimeUnit.SECONDS.toMillis(60) - - @Provides - @DelayShowAdditionalHintsMillis - fun provideDelayForShowingAdditionalHintsMillis(): Long = TimeUnit.MINUTES.toMillis(5) / 2 - - @Provides - @DelayShowAdditionalHintsFromWrongAnswerMillis - fun provideDelayForShowingHintsAfterOneWrongAnswerMillis(): Long = TimeUnit.SECONDS.toMillis(15) -} From caebae1c8c235f6d9934f4cb35ae88fbefb7fac2 Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Sun, 30 Jun 2024 10:41:26 -0400 Subject: [PATCH 03/12] Deleted Alpha Kenya package, PlatformParameterAlphaKenyaModule.kt, and workflow in build_tests.yml --- .github/workflows/build_tests.yml | 13 - .../AlphaKenyaApplicationComponent.kt | 115 ------ .../app/application/alphakenya/BUILD.bazel | 27 -- .../PlatformParameterAlphaKenyaModule.kt | 352 ------------------ 4 files changed, 507 deletions(-) delete mode 100644 app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt delete mode 100644 app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel delete mode 100644 domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 937610b4bd3..342280994a3 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -422,19 +422,6 @@ jobs: run: | bazel build --compilation_mode=opt -- //:oppia_alpha_kitkat - # Note that caching only works on non-forks. 4419: should remove this? - - name: Build Oppia alpha Kenya-specific AAB (with caching, non-fork only) - if: ${{ env.ENABLE_CACHING == 'true' && github.event.pull_request.head.repo.full_name == 'oppia/oppia-android' }} - env: - BAZEL_REMOTE_CACHE_URL: ${{ secrets.BAZEL_REMOTE_CACHE_URL }} - run: | - bazel build --compilation_mode=opt --remote_http_cache=$BAZEL_REMOTE_CACHE_URL --google_credentials=./config/oppia-dev-workflow-remote-cache-credentials.json -- //:oppia_alpha_kenya - - - name: Build Oppia alpha Kenya-specific AAB (without caching, or on a fork) - if: ${{ env.ENABLE_CACHING == 'false' || github.event.pull_request.head.repo.full_name != 'oppia/oppia-android' }} - run: | - bazel build --compilation_mode=opt -- //:oppia_alpha_kenya - build_oppia_beta_aab: name: Build Oppia AAB (beta flavor) runs-on: ${{ matrix.os }} diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt deleted file mode 100644 index bc5ecdf8093..00000000000 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt +++ /dev/null @@ -1,115 +0,0 @@ -package org.oppia.android.app.application.alphakenya - -import dagger.Component -import org.oppia.android.app.activity.route.ActivityRouterModule -import org.oppia.android.app.application.ApplicationComponent -import org.oppia.android.app.application.ApplicationModule -import org.oppia.android.app.application.ApplicationStartupListenerModule -import org.oppia.android.app.application.alpha.AlphaBuildFlavorModule -import org.oppia.android.app.devoptions.DeveloperOptionsModule -import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule -import org.oppia.android.app.shim.IntentFactoryShimModule -import org.oppia.android.app.shim.ViewBindingShimModule -import org.oppia.android.app.translation.ActivityRecreatorProdModule -import org.oppia.android.data.backends.gae.NetworkConfigProdModule -import org.oppia.android.data.backends.gae.NetworkModule -import org.oppia.android.domain.auth.AuthenticationModule -import org.oppia.android.domain.classify.InteractionsModule -import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule -import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule -import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule -import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.android.domain.exploration.ExplorationProgressModule -import org.oppia.android.domain.exploration.ExplorationStorageModule -import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigAlphaKenyaModule -import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule -import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.android.domain.oppialogger.LogStorageModule -import org.oppia.android.domain.oppialogger.LoggingIdentifierModule -import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule -import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule -import org.oppia.android.domain.oppialogger.exceptions.UncaughtExceptionLoggerModule -import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule -import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule -import org.oppia.android.domain.platformparameter.PlatformParameterAlphaKenyaModule -import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule -import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule -import org.oppia.android.domain.question.QuestionModule -import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule -import org.oppia.android.util.accessibility.AccessibilityProdModule -import org.oppia.android.util.caching.AssetModule -import org.oppia.android.util.caching.CachingModule -import org.oppia.android.util.gcsresource.GcsResourceModule -import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.KenyaAlphaEventLoggingConfigurationModule -import org.oppia.android.util.logging.LoggerModule -import org.oppia.android.util.logging.SyncStatusModule -import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule -import org.oppia.android.util.logging.firebase.LogReportingModule -import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsAssessorModule -import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsConfigurationsModule -import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule -import org.oppia.android.util.networking.NetworkConnectionUtilProdModule -import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule -import org.oppia.android.util.parser.image.GlideImageLoaderModule -import org.oppia.android.util.parser.image.ImageParsingModule -import org.oppia.android.util.system.OppiaClockModule -import org.oppia.android.util.threading.DispatcherModule -import javax.inject.Singleton - -/** - * Root Dagger component for the alpha version of the application specific to a user study in Kenya. - * - * All application-scoped modules should be included in this component. - */ -@Singleton -@Component( - modules = [ - ApplicationModule::class, DispatcherModule::class, LoggerModule::class, OppiaClockModule::class, - ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class, - MultipleChoiceInputModule::class, NumberWithUnitsRuleModule::class, - NumericInputRuleModule::class, TextInputRuleModule::class, DragDropSortInputModule::class, - InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class, - ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class, - QuestionModule::class, AccessibilityProdModule::class, ImageClickInputModule::class, - LogStorageModule::class, IntentFactoryShimModule::class, ViewBindingShimModule::class, - ExpirationMetaDataRetrieverModule::class, - RatioInputModule::class, UncaughtExceptionLoggerModule::class, - ApplicationStartupListenerModule::class, LogReportWorkerModule::class, - WorkManagerConfigurationModule::class, HintsAndSolutionConfigAlphaKenyaModule::class, - FirebaseLogUploaderModule::class, NetworkModule::class, - PlatformParameterAlphaKenyaModule::class, PlatformParameterSingletonModule::class, - ExplorationStorageModule::class, DeveloperOptionsModule::class, - PlatformParameterSyncUpWorkerModule::class, NetworkConfigProdModule::class, AssetModule::class, - LocaleProdModule::class, ActivityRecreatorProdModule::class, ActivityRouterModule::class, - NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class, - MathEquationInputModule::class, SplitScreenInteractionModule::class, - LoggingIdentifierModule::class, ApplicationLifecycleModule::class, - NetworkConnectionDebugUtilModule::class, LoggingIdentifierModule::class, - SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class, - HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class, - PerformanceMetricsConfigurationsModule::class, AlphaBuildFlavorModule::class, - KenyaAlphaEventLoggingConfigurationModule::class, CpuPerformanceSnapshotterModule::class, - PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class, - AuthenticationModule::class, - ] -) -interface AlphaKenyaApplicationComponent : ApplicationComponent { - /** - * The [ApplicationComponent.Builder] for this component. Dagger will generate an implementation - * of this builder for use. - */ - @Component.Builder - interface Builder : ApplicationComponent.Builder { - override fun build(): AlphaKenyaApplicationComponent - } -} diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel deleted file mode 100644 index 33f82ca7469..00000000000 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel +++ /dev/null @@ -1,27 +0,0 @@ -""" -This package contains the root application definitions for a Kenya user study specific alpha build -of the app. -""" - -load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") - -kt_android_library( - name = "alpha_kenya_application", - srcs = [ - "AlphaKenyaApplicationComponent.kt", - "AlphaKenyaOppiaApplication.kt", - ], - visibility = ["//:oppia_binary_visibility"], - deps = [ - "//:dagger", - "//app", - "//app/src/main/java/org/oppia/android/app/application:abstract_application", - "//app/src/main/java/org/oppia/android/app/application:application_component", - "//app/src/main/java/org/oppia/android/app/application:common_application_modules", - "//app/src/main/java/org/oppia/android/app/application/alpha:alpha_build_flavor_module", - "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", - "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module", - "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", - "//utility/src/main/java/org/oppia/android/util/networking:prod_module", - ], -) diff --git a/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt b/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt deleted file mode 100644 index 657ed9f43d1..00000000000 --- a/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt +++ /dev/null @@ -1,352 +0,0 @@ -package org.oppia.android.domain.platformparameter - -import android.content.Context -import dagger.Module -import dagger.Provides -import org.oppia.android.util.extensions.getVersionCode -import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION -import org.oppia.android.util.platformparameter.CACHE_LATEX_RENDERING -import org.oppia.android.util.platformparameter.CACHE_LATEX_RENDERING_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.CacheLatexRendering -import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT -import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI -import org.oppia.android.util.platformparameter.ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS -import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY -import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2 -import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION -import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.ENABLE_SPOTLIGHT_UI_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI -import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation -import org.oppia.android.util.platformparameter.EnableDownloadsSupport -import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi -import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi -import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson -import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention -import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics -import org.oppia.android.util.platformparameter.EnableLoggingLearnerStudyIds -import org.oppia.android.util.platformparameter.EnableMultipleClassrooms -import org.oppia.android.util.platformparameter.EnableNpsSurvey -import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2 -import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection -import org.oppia.android.util.platformparameter.EnableSpotlightUi -import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON -import org.oppia.android.util.platformparameter.FORCED_APP_UPDATE_VERSION_CODE -import org.oppia.android.util.platformparameter.ForcedAppUpdateVersionCode -import org.oppia.android.util.platformparameter.INTERACTION_CONFIG_CHANGE_STATE_RETENTION -import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS -import org.oppia.android.util.platformparameter.LOGGING_LEARNER_STUDY_IDS -import org.oppia.android.util.platformparameter.LOWEST_SUPPORTED_API_LEVEL -import org.oppia.android.util.platformparameter.LOWEST_SUPPORTED_API_LEVEL_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.LowestSupportedApiLevel -import org.oppia.android.util.platformparameter.NPS_SURVEY_GRACE_PERIOD_IN_DAYS -import org.oppia.android.util.platformparameter.NPS_SURVEY_GRACE_PERIOD_IN_DAYS_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES -import org.oppia.android.util.platformparameter.NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.NpsSurveyGracePeriodInDays -import org.oppia.android.util.platformparameter.NpsSurveyMinimumAggregateLearningTimeInATopicInMinutes -import org.oppia.android.util.platformparameter.OPTIONAL_APP_UPDATE_VERSION_CODE -import org.oppia.android.util.platformparameter.OptionalAppUpdateVersionCode -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES -import org.oppia.android.util.platformparameter.PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL -import org.oppia.android.util.platformparameter.PerformanceMetricsCollectionHighFrequencyTimeIntervalInMinutes -import org.oppia.android.util.platformparameter.PerformanceMetricsCollectionLowFrequencyTimeIntervalInMinutes -import org.oppia.android.util.platformparameter.PerformanceMetricsCollectionUploadTimeIntervalInMinutes -import org.oppia.android.util.platformparameter.PlatformParameterSingleton -import org.oppia.android.util.platformparameter.PlatformParameterValue -import org.oppia.android.util.platformparameter.SPLASH_SCREEN_WELCOME_MSG -import org.oppia.android.util.platformparameter.SPLASH_SCREEN_WELCOME_MSG_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.SPOTLIGHT_UI -import org.oppia.android.util.platformparameter.SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS -import org.oppia.android.util.platformparameter.SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS_DEFAULT_VALUE -import org.oppia.android.util.platformparameter.SplashScreenWelcomeMsg -import org.oppia.android.util.platformparameter.SyncUpWorkerTimePeriodHours - -// TODO(#4419): Remove this module. -/** - * Dagger module that provides bindings for platform parameters for the Kenya-specific alpha build - * of the app. - */ -@Module -class PlatformParameterAlphaKenyaModule { - @Provides - @EnableDownloadsSupport - fun provideEnableDownloadsSupport( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(DOWNLOADS_SUPPORT) - ?: PlatformParameterValue.createDefaultParameter(ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE) - } - - @Provides - @SplashScreenWelcomeMsg - fun provideSplashScreenWelcomeMsgParam( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(SPLASH_SCREEN_WELCOME_MSG) - ?: PlatformParameterValue.createDefaultParameter(SPLASH_SCREEN_WELCOME_MSG_DEFAULT_VALUE) - } - - @Provides - @SyncUpWorkerTimePeriodHours - fun provideSyncUpWorkerTimePeriod( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS - ) ?: PlatformParameterValue.createDefaultParameter( - SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS_DEFAULT_VALUE - ) - } - - @Provides - @EnableEditAccountsOptionsUi - fun provideEnableEditAccountsOptionsUi( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - EDIT_ACCOUNTS_OPTIONS_UI - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE - ) - } - - @Provides - @EnableLearnerStudyAnalytics - fun provideLearnerStudyAnalytics( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - // Turn on the learner study platform parameter by default. - return platformParameterSingleton.getBooleanPlatformParameter(LEARNER_STUDY_ANALYTICS) - ?: PlatformParameterValue.createDefaultParameter(true) - } - - @Provides - @EnableFastLanguageSwitchingInLesson - fun provideFastInLessonLanguageSwitching( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - // Turn on fast language switching functionality by default. - return platformParameterSingleton.getBooleanPlatformParameter(FAST_LANGUAGE_SWITCHING_IN_LESSON) - ?: PlatformParameterValue.createDefaultParameter(true) - } - - @Provides - @EnableLoggingLearnerStudyIds - fun provideLoggingLearnerStudyIds( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - // Turn on fast language switching functionality by default. - return platformParameterSingleton.getBooleanPlatformParameter(LOGGING_LEARNER_STUDY_IDS) - ?: PlatformParameterValue.createDefaultParameter(true) - } - - @Provides - @CacheLatexRendering - fun provideCacheLatexRendering( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(CACHE_LATEX_RENDERING) - ?: PlatformParameterValue.createDefaultParameter(CACHE_LATEX_RENDERING_DEFAULT_VALUE) - } - - @Provides - @EnablePerformanceMetricsCollection - fun provideEnablePerformanceMetricCollection( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - ENABLE_PERFORMANCE_METRICS_COLLECTION - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE - ) - } - - @Provides - @PerformanceMetricsCollectionUploadTimeIntervalInMinutes - fun providePerformanceMetricsCollectionUploadTimeIntervalInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - PERFORMANCE_METRICS_COLLECTION_UPLOAD_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL - ) - } - - @Provides - @PerformanceMetricsCollectionHighFrequencyTimeIntervalInMinutes - fun providePerformanceMetricsCollectionHighFrequencyTimeIntervalInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - PERFORMANCE_METRICS_COLLECTION_HIGH_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL - ) - } - - @Provides - @PerformanceMetricsCollectionLowFrequencyTimeIntervalInMinutes - fun providePerformanceMetricsCollectionLowFrequencyTimeIntervalInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - PERFORMANCE_METRICS_COLLECTION_LOW_FREQUENCY_TIME_INTERVAL_IN_MINUTES_DEFAULT_VAL - ) - } - - @Provides - @EnableExtraTopicTabsUi - fun provideEnableExtraTopicTabsUi( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - EXTRA_TOPIC_TABS_UI - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE - ) - } - - @Provides - @EnableInteractionConfigChangeStateRetention - fun provideEnableInteractionConfigChangeStateRetention( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - INTERACTION_CONFIG_CHANGE_STATE_RETENTION - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE - ) - } - - @Provides - @EnableSpotlightUi - fun provideEnableSpotlightUi( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(SPOTLIGHT_UI) - ?: PlatformParameterValue.createDefaultParameter(ENABLE_SPOTLIGHT_UI_DEFAULT_VALUE) - } - - @Provides - @EnableAppAndOsDeprecation - fun provideEnableAppAndOsDeprecation( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter( - APP_AND_OS_DEPRECATION - ) ?: PlatformParameterValue.createDefaultParameter( - ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE - ) - } - - @Provides - @OptionalAppUpdateVersionCode - fun provideOptionalAppUpdateVersionCode( - platformParameterSingleton: PlatformParameterSingleton, - context: Context - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - OPTIONAL_APP_UPDATE_VERSION_CODE - ) ?: PlatformParameterValue.createDefaultParameter( - context.getVersionCode() - ) - } - - @Provides - @ForcedAppUpdateVersionCode - fun provideForcedAppUpdateVersionCode( - platformParameterSingleton: PlatformParameterSingleton, - context: Context - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - FORCED_APP_UPDATE_VERSION_CODE - ) ?: PlatformParameterValue.createDefaultParameter( - context.getVersionCode() - ) - } - - @Provides - @LowestSupportedApiLevel - fun provideLowestSupportedApiLevel( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - LOWEST_SUPPORTED_API_LEVEL - ) ?: PlatformParameterValue.createDefaultParameter( - LOWEST_SUPPORTED_API_LEVEL_DEFAULT_VALUE - ) - } - - @Provides - @NpsSurveyGracePeriodInDays - fun provideNpsSurveyGracePeriodInDays( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - NPS_SURVEY_GRACE_PERIOD_IN_DAYS - ) ?: PlatformParameterValue.createDefaultParameter( - NPS_SURVEY_GRACE_PERIOD_IN_DAYS_DEFAULT_VALUE - ) - } - - @Provides - @NpsSurveyMinimumAggregateLearningTimeInATopicInMinutes - fun provideNpsSurveyMinimumAggregateLearningTimeInATopicInMinutes( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getIntegerPlatformParameter( - NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES - ) ?: PlatformParameterValue.createDefaultParameter( - NPS_SURVEY_MINIMUM_AGGREGATE_LEARNING_TIME_IN_A_TOPIC_IN_MINUTES_DEFAULT_VALUE - ) - } - - @Provides - @EnableNpsSurvey - fun provideEnableNpsSurvey( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(ENABLE_NPS_SURVEY) - ?: PlatformParameterValue.createDefaultParameter( - ENABLE_NPS_SURVEY_DEFAULT_VALUE - ) - } - - @Provides - @EnableOnboardingFlowV2 - fun provideEnableOnboardingFlowV2( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(ENABLE_ONBOARDING_FLOW_V2) - ?: PlatformParameterValue.createDefaultParameter( - ENABLE_ONBOARDING_FLOW_V2_DEFAULT_VALUE - ) - } - - @Provides - @EnableMultipleClassrooms - fun provideEnableMultipleClassrooms( - platformParameterSingleton: PlatformParameterSingleton - ): PlatformParameterValue { - return platformParameterSingleton.getBooleanPlatformParameter(ENABLE_MULTIPLE_CLASSROOMS) - ?: PlatformParameterValue.createDefaultParameter( - ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE - ) - } -} From 2508f355cf3df428cbc0b21ff376aa6b8c396c02 Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Sun, 30 Jun 2024 10:54:38 -0400 Subject: [PATCH 04/12] Delete more kenyaalpha related in BUILD.bazel, Remove KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt Resolved conflicts in test_file_exemptions.textproto --- scripts/assets/test_file_exemptions.textproto | 24 ------- .../oppia/android/util/logging/BUILD.bazel | 13 ---- ...entTypeToHumanReadableNameConverterImpl.kt | 70 ------------------- .../oppia/android/util/logging/BUILD.bazel | 37 ---------- 4 files changed, 144 deletions(-) delete mode 100644 utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto index 6721dcb339e..f0920d77f69 100644 --- a/scripts/assets/test_file_exemptions.textproto +++ b/scripts/assets/test_file_exemptions.textproto @@ -222,18 +222,6 @@ test_file_exemption { exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt" - test_file_not_required: true -} -test_file_exemption { - exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaBuildFlavorModule.kt" - test_file_not_required: true -} -test_file_exemption { - exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "app/src/main/java/org/oppia/android/app/application/beta/BetaOppiaApplication.kt" test_file_not_required: true @@ -2682,10 +2670,6 @@ test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/DelayShowInitialHintMillis.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt" test_file_not_required: true @@ -2770,10 +2754,6 @@ test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkerModule.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaModule.kt" test_file_not_required: true @@ -3318,10 +3298,6 @@ test_file_exemption { exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt" test_file_not_required: true diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel index 0b8fc767cb7..429a9bd5fcd 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel @@ -149,19 +149,6 @@ kt_android_library( ], ) -kt_android_library( - name = "kenya_alpha_event_logging_configuration_module", - srcs = [ - "KenyaAlphaEventLoggingConfigurationModule.kt", - "KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt", - ], - visibility = ["//:oppia_prod_module_visibility"], - deps = [ - ":event_type_to_human_readable_name_converter", - "//:dagger", - ], -) - kt_android_library( name = "log_uploader", srcs = [ diff --git a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt deleted file mode 100644 index 342333d65eb..00000000000 --- a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt +++ /dev/null @@ -1,70 +0,0 @@ -package org.oppia.android.util.logging - -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase -import javax.inject.Inject - -// TODO(#4419): Remove this implementation and the extra piping for event name mapping. -/** - * Implementation of [EventTypeToHumanReadableNameConverter] which provides legacy event names for - * interoperability with previously logged data in the Kenya user study. - * - * The event names provided by this implementation are expected to never change as these names are - * the primary ways each corresponding event is identified in logged event queries. - */ -class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor() : - EventTypeToHumanReadableNameConverter { - override fun convertToHumanReadableName(eventType: ActivityContextCase): String { - return when (eventType) { - ActivityContextCase.OPEN_EXPLORATION_ACTIVITY -> "open_exploration_activity" - ActivityContextCase.OPEN_INFO_TAB -> "open_info_tab" - ActivityContextCase.OPEN_LESSONS_TAB -> "open_lessons_tab" - ActivityContextCase.OPEN_PRACTICE_TAB -> "open_practice_tab" - ActivityContextCase.OPEN_REVISION_TAB -> "open_revision_tab" - ActivityContextCase.OPEN_QUESTION_PLAYER -> "open_question_player" - ActivityContextCase.OPEN_STORY_ACTIVITY -> "open_story_activity" - ActivityContextCase.OPEN_CONCEPT_CARD -> "open_concept_card" - ActivityContextCase.OPEN_REVISION_CARD -> "open_revision_card" - ActivityContextCase.CLOSE_REVISION_CARD -> "close_revision_card" - ActivityContextCase.START_CARD_CONTEXT -> "start_card_context" - ActivityContextCase.END_CARD_CONTEXT -> "end_card_context" - ActivityContextCase.HINT_UNLOCKED_CONTEXT -> "hint_offered_context" - ActivityContextCase.ACCESS_HINT_CONTEXT -> "access_hint_context" - ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -> "solution_offered_context" - ActivityContextCase.ACCESS_SOLUTION_CONTEXT -> "access_solution_context" - ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer_context" - ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "play_voice_over_context" - ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "pause_voice_over_context" - ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "app_in_background_context" - ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "app_in_foreground_context" - ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "exit_exploration_context" - ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "finish_exploration_context" - ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success_context" - ActivityContextCase.PROGRESS_SAVING_FAILURE_CONTEXT -> "progress_saving_failure_context" - ActivityContextCase.LESSON_SAVED_ADVERTENTLY_CONTEXT -> "lesson_saved_advertently_context" - ActivityContextCase.RESUME_LESSON_SUBMIT_CORRECT_ANSWER_CONTEXT -> - "resume_lesson_submit_correct_answer_context" - ActivityContextCase.RESUME_LESSON_SUBMIT_INCORRECT_ANSWER_CONTEXT -> - "resume_lesson_submit_incorrect_answer_context" - ActivityContextCase.RESUME_EXPLORATION_CONTEXT -> "resume_exploration_context" - ActivityContextCase.START_OVER_EXPLORATION_CONTEXT -> "start_over_exploration_context" - ActivityContextCase.DELETE_PROFILE_CONTEXT -> "delete_profile_context" - ActivityContextCase.OPEN_HOME -> "open_home" - ActivityContextCase.OPEN_PROFILE_CHOOSER -> "open_profile_chooser" - ActivityContextCase.REACH_INVESTED_ENGAGEMENT -> "reached_invested_engagement" - ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -> "switch_in_lesson_language" - ActivityContextCase.SHOW_SURVEY_POPUP -> "show_survey_popup" - ActivityContextCase.BEGIN_SURVEY -> "begin_survey" - ActivityContextCase.ABANDON_SURVEY -> "abandon_survey" - ActivityContextCase.MANDATORY_RESPONSE -> "mandatory_response" - ActivityContextCase.OPTIONAL_RESPONSE -> "optional_response" - ActivityContextCase.FEATURE_FLAG_LIST_CONTEXT -> "feature_flag_list" - ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG -> "failed_analytics_log" - ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -> "unknown_activity_context" - ActivityContextCase.COMPLETE_APP_ONBOARDING -> "complete_app_onboarding" - ActivityContextCase.CONSOLE_LOG -> "console_log" - ActivityContextCase.RETROFIT_CALL_CONTEXT -> "retrofit_call_context" - ActivityContextCase.RETROFIT_CALL_FAILED_CONTEXT -> "retrofit_call_failed_context" - ActivityContextCase.APP_IN_FOREGROUND_TIME -> "app_in_foreground_time" - } - } -} diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel index fca189182df..366dacaefc3 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel @@ -61,43 +61,6 @@ oppia_android_test( ], ) -oppia_android_test( - name = "KenyaAlphaEventBundleCreatorTest", - srcs = ["KenyaAlphaEventBundleCreatorTest.kt"], - custom_package = "org.oppia.android.util.logging", - test_class = "org.oppia.android.util.logging.KenyaAlphaEventBundleCreatorTest", - test_manifest = "//utility:test_manifest", - deps = [ - "//:dagger", - "//testing", - "//third_party:androidx_test_ext_junit", - "//third_party:androidx_test_ext_truth", - "//third_party:com_google_truth_truth", - "//third_party:org_robolectric_robolectric", - "//third_party:robolectric_android-all", - "//utility/src/main/java/org/oppia/android/util/logging:event_bundle_creator", - "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module", - ], -) - -oppia_android_test( - name = "KenyaAlphaEventLoggingConfigurationModuleTest", - srcs = ["KenyaAlphaEventLoggingConfigurationModuleTest.kt"], - custom_package = "org.oppia.android.util.logging", - test_class = "org.oppia.android.util.logging.KenyaAlphaEventLoggingConfigurationModuleTest", - test_manifest = "//utility:test_manifest", - deps = [ - "//:dagger", - "//testing", - "//third_party:androidx_test_ext_junit", - "//third_party:androidx_test_ext_truth", - "//third_party:com_google_truth_truth", - "//third_party:org_robolectric_robolectric", - "//third_party:robolectric_android-all", - "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module", - ], -) - oppia_android_test( name = "StandardEventTypeToHumanReadableNameConverterImplTest", srcs = ["StandardEventTypeToHumanReadableNameConverterImplTest.kt"], From 2e63967b3dc91a9a6f369898a3c03cf7471a5b3e Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:20:02 -0400 Subject: [PATCH 05/12] Remove EventLoggingConfigurationModule and updated the version code --- .../alpha/AlphaApplicationComponent.kt | 3 +- .../beta/BetaApplicationComponent.kt | 3 +- .../dev/DeveloperApplicationComponent.kt | 3 +- .../application/ga/GaApplicationComponent.kt | 3 +- .../AdministratorControlsActivityTest.kt | 3 +- .../AdministratorControlsFragmentTest.kt | 3 +- .../AppVersionActivityTest.kt | 3 +- .../ProfileAndDeviceIdActivityTest.kt | 3 +- .../ProfileAndDeviceIdFragmentTest.kt | 3 +- .../classroom/ClassroomListActivityTest.kt | 3 +- .../classroom/ClassroomListFragmentTest.kt | 3 +- .../CompletedStoryListActivityTest.kt | 3 +- .../LessonThumbnailImageViewTest.kt | 3 +- .../MathExpressionInteractionsViewTest.kt | 3 +- .../AppCompatCheckBoxBindingAdaptersTest.kt | 3 +- .../CircularProgressIndicatorAdaptersTest.kt | 3 +- .../databinding/ColorBindingAdaptersTest.kt | 3 +- .../DrawableBindingAdaptersTest.kt | 3 +- .../ImageViewBindingAdaptersTest.kt | 3 +- .../databinding/MarginBindingAdaptersTest.kt | 3 +- ...StateAssemblerMarginBindingAdaptersTest.kt | 3 +- ...tateAssemblerPaddingBindingAdaptersTest.kt | 3 +- .../TextViewBindingAdaptersTest.kt | 3 +- .../databinding/ViewBindingAdaptersTest.kt | 3 +- .../DeveloperOptionsActivityTest.kt | 3 +- .../DeveloperOptionsFragmentTest.kt | 3 +- .../MarkChaptersCompletedActivityTest.kt | 3 +- .../MarkChaptersCompletedFragmentTest.kt | 3 +- .../MarkStoriesCompletedActivityTest.kt | 3 +- .../MarkStoriesCompletedFragmentTest.kt | 3 +- .../MarkTopicsCompletedActivityTest.kt | 3 +- .../MarkTopicsCompletedFragmentTest.kt | 3 +- .../devoptions/ViewEventLogsActivityTest.kt | 3 +- .../devoptions/ViewEventLogsFragmentTest.kt | 3 +- .../ForceNetworkTypeActivityTest.kt | 3 +- .../ForceNetworkTypeFragmentTest.kt | 3 +- .../MathExpressionParserActivityTest.kt | 3 +- .../MathExpressionParserFragmentTest.kt | 3 +- .../android/app/faq/FAQListFragmentTest.kt | 3 +- .../android/app/faq/FAQSingleActivityTest.kt | 3 +- .../android/app/faq/FaqListActivityTest.kt | 3 +- .../android/app/help/HelpActivityTest.kt | 3 +- .../android/app/help/HelpFragmentTest.kt | 3 +- .../android/app/home/HomeActivityTest.kt | 3 +- .../app/home/RecentlyPlayedFragmentTest.kt | 3 +- .../app/home/TopicSummaryViewModelTest.kt | 3 +- .../android/app/home/WelcomeViewModelTest.kt | 3 +- .../PromotedStoryListViewModelTest.kt | 3 +- .../PromotedStoryViewModelTest.kt | 3 +- .../mydownloads/MyDownloadsActivityTest.kt | 3 +- .../mydownloads/MyDownloadsFragmentTest.kt | 3 +- .../notice/BetaNoticeDialogFragmentTest.kt | 3 +- ...dAppDeprecationNoticeDialogFragmentTest.kt | 3 +- ...labilityUpgradeNoticeDialogFragmentTest.kt | 3 +- ...lAppDeprecationNoticeDialogFragmentTest.kt | 3 +- .../OsDeprecationNoticeDialogFragmentTest.kt | 3 +- .../onboarding/CreateProfileActivityTest.kt | 3 +- .../onboarding/CreateProfileFragmentTest.kt | 3 +- .../app/onboarding/IntroActivityTest.kt | 3 +- .../app/onboarding/IntroFragmentTest.kt | 3 +- .../app/onboarding/OnboardingActivityTest.kt | 3 +- .../app/onboarding/OnboardingFragmentTest.kt | 3 +- .../OnboardingProfileTypeActivityTest.kt | 3 +- .../OnboardingProfileTypeFragmentTest.kt | 3 +- .../OngoingTopicListActivityTest.kt | 3 +- .../app/options/AppLanguageActivityTest.kt | 3 +- .../app/options/AppLanguageFragmentTest.kt | 3 +- .../app/options/AudioLanguageActivityTest.kt | 3 +- .../app/options/AudioLanguageFragmentTest.kt | 3 +- .../app/options/OptionsActivityTest.kt | 3 +- .../app/options/OptionsFragmentTest.kt | 3 +- .../options/ReadingTextSizeActivityTest.kt | 3 +- .../options/ReadingTextSizeFragmentTest.kt | 3 +- .../android/app/parser/HtmlParserTest.kt | 3 +- .../app/player/audio/AudioFragmentTest.kt | 3 +- .../exploration/BottomSheetOptionsMenuTest.kt | 3 +- .../exploration/ExplorationActivityTest.kt | 3 +- .../app/player/state/StateFragmentTest.kt | 3 +- .../app/policies/PoliciesActivityTest.kt | 3 +- .../app/policies/PoliciesFragmentTest.kt | 3 +- .../app/profile/AddProfileActivityTest.kt | 3 +- .../app/profile/AdminAuthActivityTest.kt | 3 +- .../app/profile/AdminPinActivityTest.kt | 3 +- .../app/profile/PinPasswordActivityTest.kt | 3 +- .../app/profile/ProfileChooserActivityTest.kt | 3 +- .../app/profile/ProfileChooserFragmentTest.kt | 3 +- .../ProfilePictureActivityTest.kt | 3 +- .../ProfileProgressActivityTest.kt | 3 +- .../ProfileProgressFragmentTest.kt | 3 +- .../app/recyclerview/BindableAdapterTest.kt | 3 +- .../resumelesson/ResumeLessonActivityTest.kt | 3 +- .../resumelesson/ResumeLessonFragmentTest.kt | 3 +- .../profile/ProfileEditActivityTest.kt | 3 +- .../profile/ProfileEditFragmentTest.kt | 3 +- .../profile/ProfileListActivityTest.kt | 3 +- .../profile/ProfileListFragmentTest.kt | 3 +- .../profile/ProfileRenameActivityTest.kt | 3 +- .../profile/ProfileRenameFragmentTest.kt | 3 +- .../profile/ProfileResetPinActivityTest.kt | 3 +- .../profile/ProfileResetPinFragmentTest.kt | 3 +- .../android/app/splash/SplashActivityTest.kt | 3 +- .../app/spotlight/SpotlightFragmentTest.kt | 3 +- .../android/app/story/StoryActivityTest.kt | 3 +- .../android/app/story/StoryFragmentTest.kt | 3 +- .../android/app/survey/SurveyActivityTest.kt | 3 +- .../android/app/survey/SurveyFragmentTest.kt | 3 +- .../app/testing/DragDropTestActivityTest.kt | 3 +- ...ionInputInteractionViewTestActivityTest.kt | 3 +- ...ImageRegionSelectionInteractionViewTest.kt | 3 +- .../InputInteractionViewTestActivityTest.kt | 3 +- .../NavigationDrawerActivityDebugTest.kt | 3 +- .../NavigationDrawerActivityProdTest.kt | 3 +- ...tioInputInteractionViewTestActivityTest.kt | 3 +- ...tFontScaleConfigurationUtilActivityTest.kt | 3 +- ...extInputInteractionViewTestActivityTest.kt | 3 +- .../testing/TopicTestActivityForStoryTest.kt | 3 +- .../app/thirdparty/LicenseListActivityTest.kt | 3 +- .../app/thirdparty/LicenseListFragmentTest.kt | 3 +- .../LicenseTextViewerActivityTest.kt | 3 +- .../LicenseTextViewerFragmentTest.kt | 3 +- .../ThirdPartyDependencyListActivityTest.kt | 3 +- .../ThirdPartyDependencyListFragmentTest.kt | 3 +- .../android/app/topic/TopicActivityTest.kt | 3 +- .../android/app/topic/TopicFragmentTest.kt | 3 +- .../conceptcard/ConceptCardFragmentTest.kt | 3 +- .../app/topic/info/TopicInfoFragmentTest.kt | 3 +- .../topic/lessons/TopicLessonsFragmentTest.kt | 3 +- .../practice/TopicPracticeFragmentTest.kt | 3 +- .../QuestionPlayerActivityTest.kt | 3 +- .../revision/TopicRevisionFragmentTest.kt | 3 +- .../revisioncard/RevisionCardActivityTest.kt | 3 +- .../revisioncard/RevisionCardFragmentTest.kt | 3 +- .../app/utility/RatioExtensionsTest.kt | 3 +- .../walkthrough/WalkthroughActivityTest.kt | 3 +- .../WalkthroughFinalFragmentTest.kt | 3 +- .../WalkthroughTopicListFragmentTest.kt | 3 +- .../WalkthroughWelcomeFragmentTest.kt | 3 +- .../activity/ActivityIntentFactoriesTest.kt | 3 +- .../route/ActivityRouterModuleTest.kt | 3 +- .../app/activity/route/ActivityRouterTest.kt | 3 +- .../android/app/home/HomeActivityLocalTest.kt | 3 +- .../app/parser/FractionParsingUiErrorTest.kt | 3 +- .../parser/ListItemLeadingMarginSpanTest.kt | 3 +- .../app/parser/StringToRatioParserTest.kt | 3 +- .../ExplorationActivityLocalTest.kt | 3 +- .../player/state/StateFragmentLocalTest.kt | 3 +- .../ProfileChooserFragmentLocalTest.kt | 3 +- .../app/story/StoryActivityLocalTest.kt | 3 +- .../app/testing/CompletedStoryListSpanTest.kt | 3 +- .../oppia/android/app/testing/HomeSpanTest.kt | 3 +- .../app/testing/OngoingTopicListSpanTest.kt | 3 +- .../PlatformParameterIntegrationTest.kt | 3 +- .../app/testing/ProfileChooserSpanTest.kt | 3 +- .../testing/ProfileProgressSpanCountTest.kt | 3 +- .../app/testing/RecentlyPlayedSpanTest.kt | 3 +- .../app/testing/TopicRevisionSpanTest.kt | 3 +- .../app/testing/activity/TestActivityTest.kt | 3 +- .../AdministratorControlsFragmentTest.kt | 3 +- .../testing/options/OptionsFragmentTest.kt | 3 +- .../player/split/PlayerSplitScreenTest.kt | 3 +- .../state/StateFragmentAccessibilityTest.kt | 3 +- .../topic/info/TopicInfoFragmentLocalTest.kt | 3 +- .../lessons/TopicLessonsFragmentLocalTest.kt | 3 +- .../QuestionPlayerActivityLocalTest.kt | 3 +- .../RevisionCardActivityLocalTest.kt | 3 +- .../ActivityLanguageLocaleHandlerTest.kt | 3 +- .../AppLanguageResourceHandlerTest.kt | 3 +- .../AppLanguageWatcherMixinTest.kt | 3 +- .../app/utility/datetime/DateTimeUtilTest.kt | 3 +- .../MathExpressionAccessibilityUtilTest.kt | 3 +- .../application/TestApplicationComponent.kt | 3 +- ...alizeDefaultLocaleRuleCustomContextTest.kt | 3 +- ...InitializeDefaultLocaleRuleOmissionTest.kt | 3 +- .../junit/InitializeDefaultLocaleRuleTest.kt | 3 +- .../oppia/android/util/logging/BUILD.bazel | 13 --- .../EventLoggingConfigurationModule.kt | 13 --- .../EventTypeToHumanReadableNameConverter.kt | 90 ++++++++++++++++--- ...entTypeToHumanReadableNameConverterImpl.kt | 83 ----------------- .../util/logging/EventBundleCreatorTest.kt | 2 +- .../EventLoggingConfigurationModuleTest.kt | 70 --------------- .../firebase/LogReportingModuleTest.kt | 1 - version.bzl | 12 +-- 182 files changed, 257 insertions(+), 549 deletions(-) delete mode 100644 utility/src/main/java/org/oppia/android/util/logging/EventLoggingConfigurationModule.kt delete mode 100644 utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt delete mode 100644 utility/src/test/java/org/oppia/android/util/logging/EventLoggingConfigurationModuleTest.kt diff --git a/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt index d4545931ca4..460ed8832b9 100644 --- a/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt @@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.CachingModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -97,7 +96,7 @@ import javax.inject.Singleton SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class, HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class, PerformanceMetricsConfigurationsModule::class, AlphaBuildFlavorModule::class, - EventLoggingConfigurationModule::class, CpuPerformanceSnapshotterModule::class, + CpuPerformanceSnapshotterModule::class, PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class, AuthenticationModule::class, ] diff --git a/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt index 1b63f350433..45ccf6f11a8 100644 --- a/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt @@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.CachingModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -97,7 +96,7 @@ import javax.inject.Singleton SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class, HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class, PerformanceMetricsConfigurationsModule::class, BetaBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class, AuthenticationModule::class, ] diff --git a/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt index 4c938925cc8..7607dfba33a 100644 --- a/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt @@ -50,7 +50,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.CachingModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.DebugLogReportingModule @@ -99,7 +98,7 @@ import javax.inject.Singleton NetworkConnectionDebugUtilModule::class, LoggingIdentifierModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, PerformanceMetricsAssessorModule::class, PerformanceMetricsConfigurationsModule::class, - DeveloperBuildFlavorModule::class, EventLoggingConfigurationModule::class, + DeveloperBuildFlavorModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, AuthenticationModule::class, ] diff --git a/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt index 23fcae14bc3..b4dd98d67c2 100644 --- a/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt @@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.CachingModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -97,7 +96,7 @@ import javax.inject.Singleton SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class, HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class, PerformanceMetricsConfigurationsModule::class, GaBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class, AuthenticationModule::class, ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt index 96da1bb908e..ed5e44231c5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt @@ -120,7 +120,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -928,7 +927,7 @@ class AdministratorControlsActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt index 7a3e7cee59b..6d543ac59af 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt @@ -100,7 +100,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -616,7 +615,7 @@ class AdministratorControlsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt index 49a66d5c398..e8f5dc07884 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt @@ -94,7 +94,6 @@ import org.oppia.android.util.extensions.getVersionName import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -307,7 +306,7 @@ class AppVersionActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt index cdcd5f47c24..cdbbd25578d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusManager import org.oppia.android.util.logging.SyncStatusModule @@ -227,7 +226,7 @@ class ProfileAndDeviceIdActivityTest { SyncStatusModule::class, SplitScreenInteractionModule::class, NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class, MathEquationInputModule::class, MetricLogSchedulerModule::class, - TestingBuildFlavorModule::class, EventLoggingConfigurationModule::class, + TestingBuildFlavorModule::class, ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ApplicationLifecycleModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt index df161b770ae..890275fa0a6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt @@ -122,7 +122,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.locale.OppiaLocale -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusManager.SyncStatus import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1139,7 +1138,7 @@ class ProfileAndDeviceIdFragmentTest { SyncStatusTestModule::class, SplitScreenInteractionModule::class, NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class, MathEquationInputModule::class, MetricLogSchedulerModule::class, - TestingBuildFlavorModule::class, EventLoggingConfigurationModule::class, + TestingBuildFlavorModule::class, ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ApplicationLifecycleModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class diff --git a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListActivityTest.kt index 845096edd39..7de41f91535 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListActivityTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -185,7 +184,7 @@ class ClassroomListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt index 4a3fe4c6360..feae1fee7b3 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt @@ -116,7 +116,6 @@ import org.oppia.android.util.extensions.getProtoExtra import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.locale.OppiaLocale -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -905,7 +904,7 @@ class ClassroomListFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class, TestImageLoaderModule::class, ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt index 2d7afaf5f53..4b0c5d0e6a3 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt @@ -100,7 +100,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -539,7 +538,7 @@ class CompletedStoryListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt index 1a289adbc5a..821f649f615 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -177,7 +176,7 @@ class LessonThumbnailImageViewTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt index 3bf69aba46a..8c276551e21 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt @@ -97,7 +97,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1806,7 +1805,7 @@ class MathExpressionInteractionsViewTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt index f16aec0eff3..10bf38da63b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/AppCompatCheckBoxBindingAdaptersTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -168,7 +167,7 @@ class AppCompatCheckBoxBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt index 8f7c78964ac..8eeeb56da65 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt @@ -81,7 +81,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -299,7 +298,7 @@ class CircularProgressIndicatorAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/ColorBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/ColorBindingAdaptersTest.kt index 393311789b3..8228345af00 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/ColorBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/ColorBindingAdaptersTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -183,7 +182,7 @@ class ColorBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt index 19c12c8d35b..cfa195714fa 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/DrawableBindingAdaptersTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -188,7 +187,7 @@ class DrawableBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt index 55011df1067..3caa12ca21e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/ImageViewBindingAdaptersTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -230,7 +229,7 @@ class ImageViewBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt index 826d629d355..0ac0a8483b9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt @@ -90,7 +90,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -351,7 +350,7 @@ class MarginBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt index 5cb77082e7c..c2f0e9d5eb4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdaptersTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -506,7 +505,7 @@ class StateAssemblerMarginBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt index 404ddf2ce36..32d07d6feb9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdaptersTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -504,7 +503,7 @@ class StateAssemblerPaddingBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt index bc00e284c6c..9bb4cab6bb1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextViewBindingAdaptersTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -310,7 +309,7 @@ class TextViewBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt index aeb0d606ddb..92afe7e3b60 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/ViewBindingAdaptersTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -238,7 +237,7 @@ class ViewBindingAdaptersTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt index 9210e687ffa..47401fc5216 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt @@ -104,7 +104,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -342,7 +341,7 @@ class DeveloperOptionsActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt index 9f91c2dbd19..a25c1f61952 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentTest.kt @@ -98,7 +98,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -661,7 +660,7 @@ class DeveloperOptionsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt index 78dfe47defd..c831fcb7050 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt @@ -89,7 +89,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -271,7 +270,7 @@ class MarkChaptersCompletedActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt index 8c79da699c3..9b81a4a6479 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt @@ -96,7 +96,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1022,7 +1021,7 @@ class MarkChaptersCompletedFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt index d9e860e8473..4600d53176b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -202,7 +201,7 @@ class MarkStoriesCompletedActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt index 19836a42087..6427066b40e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt @@ -90,7 +90,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -569,7 +568,7 @@ class MarkStoriesCompletedFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt index 6358140af44..0d6195ea12b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -202,7 +201,7 @@ class MarkTopicsCompletedActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt index dd17bbe74ba..7182cf4438d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt @@ -90,7 +90,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -550,7 +549,7 @@ class MarkTopicsCompletedFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt index 8ea77d0c034..66172c2e8d1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.DebugLogReportingModule @@ -192,7 +191,7 @@ class ViewEventLogsActivityTest { LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, PerformanceMetricsAssessorModule::class, PerformanceMetricsConfigurationsModule::class, - TestingBuildFlavorModule::class, EventLoggingConfigurationModule::class, + TestingBuildFlavorModule::class, ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt index f40406b79fd..e4952bffb71 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt @@ -95,7 +95,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.AnalyticsEventLogger -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.ExceptionLogger import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule @@ -755,7 +754,7 @@ class ViewEventLogsFragmentTest { LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, PerformanceMetricsAssessorModule::class, PerformanceMetricsConfigurationsModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class, ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt index e5fd7723e09..832e378cae9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeActivityTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -193,7 +192,7 @@ class ForceNetworkTypeActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt index b6010476622..46872bc9b64 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeFragmentTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -400,7 +399,7 @@ class ForceNetworkTypeFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt index 9ffd7fcabe5..3070fd11dd2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserActivityTest.kt @@ -77,7 +77,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -178,7 +177,7 @@ class MathExpressionParserActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt index a381f85a049..36b378e0a2d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserFragmentTest.kt @@ -87,7 +87,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1418,7 +1417,7 @@ class MathExpressionParserFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt index 875f395be75..5e032dfec9a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt @@ -91,7 +91,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -260,7 +259,7 @@ class FAQListFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt index f4f947fde89..d38ddf5fd17 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt @@ -87,7 +87,6 @@ import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -239,7 +238,7 @@ class FAQSingleActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt index 815dac646ad..c9399fab764 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -166,7 +165,7 @@ class FaqListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt index ca9cbf486ad..fed5e5d83ab 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -169,7 +168,7 @@ class HelpActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt index 508d72bdb2a..95a540c6cf9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt @@ -106,7 +106,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1449,7 +1448,7 @@ class HelpFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt index b6962460974..46df59bfa2f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt @@ -144,7 +144,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -2063,7 +2062,7 @@ class HomeActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt index c45a0580213..9a162d5a583 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt @@ -124,7 +124,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1486,7 +1485,7 @@ class RecentlyPlayedFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt index 2a5c4e54f36..c97c82d7242 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -389,7 +388,7 @@ class TopicSummaryViewModelTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt index 726c76c7f73..f7c504ae8c4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -362,7 +361,7 @@ class WelcomeViewModelTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt index f7da7a5d2d2..80d3d215180 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -375,7 +374,7 @@ class PromotedStoryListViewModelTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt index 859b55572f1..ae6037af1de 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -401,7 +400,7 @@ class PromotedStoryViewModelTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt index 98eee4d1a68..289fdb8386e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsActivityTest.kt @@ -82,7 +82,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -197,7 +196,7 @@ class MyDownloadsActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt index cdd24a8e73b..e76c11e9756 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt @@ -81,7 +81,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -238,7 +237,7 @@ class MyDownloadsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt index 2155cb3d671..b7f7a024d13 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -249,7 +248,7 @@ class BetaNoticeDialogFragmentTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, CachingTestModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt index 161210eaddd..558b356daac 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/ForcedAppDeprecationNoticeDialogFragmentTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -238,7 +237,7 @@ class ForcedAppDeprecationNoticeDialogFragmentTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, CachingTestModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt index 328c63583ef..098f4fb8144 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -256,7 +255,7 @@ class GeneralAvailabilityUpgradeNoticeDialogFragmentTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, CachingTestModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt index 8ef96d1613f..3f099affbc4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/OptionalAppDeprecationNoticeDialogFragmentTest.kt @@ -87,7 +87,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.extensions.getVersionCode import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -247,7 +246,7 @@ class OptionalAppDeprecationNoticeDialogFragmentTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, CachingTestModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt index 630f1f84aac..8c44a36dc31 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/OsDeprecationNoticeDialogFragmentTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -229,7 +228,7 @@ class OsDeprecationNoticeDialogFragmentTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, CachingTestModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileActivityTest.kt index 3763cf7d57c..6255d92d7e0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileActivityTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -181,7 +180,7 @@ class CreateProfileActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt index 5e9c8ada80e..0f886f3d215 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt @@ -104,7 +104,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.extensions.getProtoExtra import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -518,7 +517,7 @@ class CreateProfileFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class, TestImageLoaderModule::class, ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroActivityTest.kt index 11ded15d116..b880e500caa 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroActivityTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -191,7 +190,7 @@ class IntroActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroFragmentTest.kt index 72fea853fbc..295e0bc93da 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroFragmentTest.kt @@ -81,7 +81,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -272,7 +271,7 @@ class IntroFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt index d35c89af96e..2345101ede4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingActivityTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -164,7 +163,7 @@ class OnboardingActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt index 46f1b08fe88..2e59edea781 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt @@ -100,7 +100,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -859,7 +858,7 @@ class OnboardingFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeActivityTest.kt index 82c3d74ae11..0c569d5941c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeActivityTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -182,7 +181,7 @@ class OnboardingProfileTypeActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt index 2649e11c610..17e31946afa 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt @@ -87,7 +87,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.locale.OppiaLocale -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -361,7 +360,7 @@ class OnboardingProfileTypeFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt index 7c6f16174d0..d5c066cb437 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt @@ -98,7 +98,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -488,7 +487,7 @@ class OngoingTopicListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt index ba0831a5696..f5ff14491ba 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -173,7 +172,7 @@ class AppLanguageActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt index 62749ba3863..be41f8a60fe 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -310,7 +309,7 @@ class AppLanguageFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt index 89bb88668cf..c2e00b7e1ec 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -164,7 +163,7 @@ class AudioLanguageActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt index b25607c9158..556fcddd6e7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt @@ -89,7 +89,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -453,7 +452,7 @@ class AudioLanguageFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt index 8a9b5e83586..c7209180411 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -169,7 +168,7 @@ class OptionsActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt index 5cb9b71ef75..07d94b978f7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt @@ -102,7 +102,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -627,7 +626,7 @@ class OptionsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt index 046cd81fed2..5eb5c15332a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeActivityTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -164,7 +163,7 @@ class ReadingTextSizeActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt index 75e9b20db35..07212be14ca 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -307,7 +306,7 @@ class ReadingTextSizeFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt b/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt index 3d9c7be9364..1e1ca843c6a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt @@ -121,7 +121,6 @@ import org.oppia.android.util.locale.DisplayLocaleImpl import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.locale.OppiaBidiFormatter import org.oppia.android.util.locale.OppiaLocale -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -914,7 +913,7 @@ class HtmlParserTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt index ed37473683f..01edd6de418 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt @@ -101,7 +101,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -485,7 +484,7 @@ class AudioFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt index 7fb19f1484f..82572882642 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt @@ -82,7 +82,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -192,7 +191,7 @@ class BottomSheetOptionsMenuTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, CachingTestModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index ec53953d954..134272b12de 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -158,7 +158,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -2814,7 +2813,7 @@ class ExplorationActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt index eb141d43015..e73983f31df 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt @@ -179,7 +179,6 @@ import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -5653,7 +5652,7 @@ class StateFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt index 2a2d4e8fb72..ff1e8c493c5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt @@ -93,7 +93,6 @@ import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -279,7 +278,7 @@ class PoliciesActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt index b6d16ecd926..3db8bca24cd 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesFragmentTest.kt @@ -104,7 +104,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -359,7 +358,7 @@ class PoliciesFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt index 6e4992389cd..0152d1056d7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt @@ -114,7 +114,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1795,7 +1794,7 @@ class AddProfileActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt index 3cab12f1fd5..38e7ecd8019 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt @@ -96,7 +96,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -692,7 +691,7 @@ class AdminAuthActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt index 33fc0a1fbb6..901aee82fcf 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt @@ -107,7 +107,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1109,7 +1108,7 @@ class AdminPinActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt index 5da1ccdf4e5..77a482529c4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt @@ -108,7 +108,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1261,7 +1260,7 @@ class PinPasswordActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt index cf5339feb13..c7cf8e611c5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -163,7 +162,7 @@ class ProfileChooserActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt index 322f5e2855d..15479e71e4f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt @@ -101,7 +101,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -590,7 +589,7 @@ class ProfileChooserFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt index f24675389c6..833d18873fb 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt @@ -82,7 +82,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -219,7 +218,7 @@ class ProfilePictureActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt index 50f62020d71..2e256508a1d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -169,7 +168,7 @@ class ProfileProgressActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt index a9015c415da..1bfc769e383 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt @@ -124,7 +124,6 @@ import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EnableConsoleLog import org.oppia.android.util.logging.EnableFileLog -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.GlobalLogLevel import org.oppia.android.util.logging.LogLevel import org.oppia.android.util.logging.SyncStatusModule @@ -914,7 +913,7 @@ class ProfileProgressFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt index f896d8ec490..c948b006621 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt @@ -109,7 +109,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -682,7 +681,7 @@ class BindableAdapterTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt index 40aeae59dcc..6f09f3ec034 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt @@ -96,7 +96,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -241,7 +240,7 @@ class ResumeLessonActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt index 1a28e628594..19ffe22d792 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt @@ -101,7 +101,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -382,7 +381,7 @@ class ResumeLessonFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt index cbee7ee1069..d63a296f378 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt @@ -92,7 +92,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -371,7 +370,7 @@ class ProfileEditActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt index 37992371629..e829a088e68 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt @@ -102,7 +102,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.data.DataProviders.Companion.toLiveData import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -504,7 +503,7 @@ class ProfileEditFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt index 8b3628f767e..17c7f4e5530 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListActivityTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -165,7 +164,7 @@ class ProfileListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt index 5b7bd78bb3e..79a5863300a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -394,7 +393,7 @@ class ProfileListFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt index 8f15112e9fc..0a1d886dda6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt @@ -77,7 +77,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -191,7 +190,7 @@ class ProfileRenameActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt index fd4bf50712b..8313bac8e32 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt @@ -93,7 +93,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -468,7 +467,7 @@ class ProfileRenameFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt index 544ae8034d0..b42ac9f88ac 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -200,7 +199,7 @@ class ProfileResetPinActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt index c306e9a6206..3254534236b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt @@ -94,7 +94,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1032,7 +1031,7 @@ class ProfileResetPinFragmentTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt index 484a9696142..0cc3ccec366 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt @@ -113,7 +113,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1226,7 +1225,7 @@ class SplashActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt index 1e37adc5e68..5751b1ce99f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/spotlight/SpotlightFragmentTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -370,7 +369,7 @@ class SpotlightFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt index 733b0efc911..117640c66e7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt @@ -96,7 +96,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -267,7 +266,7 @@ class StoryActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt index c93e0f8460a..30140780c03 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt @@ -134,7 +134,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1003,7 +1002,7 @@ class StoryFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt index 3634f6f4a24..e2258bdc5d6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -192,7 +191,7 @@ class SurveyActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt index b600558c0da..49bdf36f967 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt @@ -104,7 +104,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -618,7 +617,7 @@ class SurveyFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt index 9417fedeb1b..6209e6b49fe 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt @@ -82,7 +82,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -236,7 +235,7 @@ class DragDropTestActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt index 45b86216d84..ce7a4b8fd92 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivityTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -577,7 +576,7 @@ class FractionInputInteractionViewTestActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt index a754284daaa..6b558212760 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt @@ -101,7 +101,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -455,7 +454,7 @@ class ImageRegionSelectionInteractionViewTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt index abbb27b7dd5..92053254ccc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -451,7 +450,7 @@ class InputInteractionViewTestActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt index e367b50c81a..36e5f90594f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt @@ -114,7 +114,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -457,7 +456,7 @@ class NavigationDrawerActivityDebugTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt index c5a79951ef5..7075675cc9a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt @@ -123,7 +123,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1019,7 +1018,7 @@ class NavigationDrawerActivityProdTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt index f766a7a1bb0..6f3fdc02b3d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivityTest.kt @@ -91,7 +91,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -445,7 +444,7 @@ class RatioInputInteractionViewTestActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt index 7da565cf4a4..b714c9f31ba 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt @@ -77,7 +77,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -211,7 +210,7 @@ class TestFontScaleConfigurationUtilActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt index 078853e8adf..29356e45382 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivityTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -244,7 +243,7 @@ class TextInputInteractionViewTestActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class ] ) diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt index bce20a77687..3585996ccf3 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -212,7 +211,7 @@ class TopicTestActivityForStoryTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt index 6ee2c2c8425..f3ef4c05bca 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -178,7 +177,7 @@ class LicenseListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt index 1e2bc4791a7..61754b7c4a6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt @@ -89,7 +89,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -378,7 +377,7 @@ class LicenseListFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt index 8c447854ba7..9733daf8297 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt @@ -83,7 +83,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -282,7 +281,7 @@ class LicenseTextViewerActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt index b397bcd214b..f264a3cc398 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt @@ -79,7 +79,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -356,7 +355,7 @@ class LicenseTextViewerFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt index 70d49bf0af0..95e617c29a8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -175,7 +174,7 @@ class ThirdPartyDependencyListActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt index 89403f4efe2..78172b51b76 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt @@ -88,7 +88,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -488,7 +487,7 @@ class ThirdPartyDependencyListFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt index debec65d207..fd3abbeb87c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt @@ -97,7 +97,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -257,7 +256,7 @@ class TopicActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt index dc00a9ca748..e7ae27305ff 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt @@ -111,7 +111,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1070,7 +1069,7 @@ class TopicFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt index c8ec2292371..fea264ee880 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt @@ -118,7 +118,6 @@ import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -586,7 +585,7 @@ class ConceptCardFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt index cabd5945931..472e8aefd8a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt @@ -103,7 +103,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -515,7 +514,7 @@ class TopicInfoFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index 075b49e8ac0..0bbc1c36717 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -126,7 +126,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1359,7 +1358,7 @@ class TopicLessonsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt index fd5c8f4117f..3707b80e7b2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt @@ -102,7 +102,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -466,7 +465,7 @@ class TopicPracticeFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt index e612dacc954..29cfd79e184 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt @@ -145,7 +145,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -880,7 +879,7 @@ class QuestionPlayerActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt index dec1050be90..518d1c8ee84 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt @@ -104,7 +104,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -374,7 +373,7 @@ class TopicRevisionFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt index c73b3c86579..15e47cbb2f2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt @@ -98,7 +98,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -480,7 +479,7 @@ class RevisionCardActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt index 29dde65b725..98882ab707b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt @@ -124,7 +124,6 @@ import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -900,7 +899,7 @@ class RevisionCardFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt index 7db790a6b1e..9e96546527f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -164,7 +163,7 @@ class RatioExtensionsTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt index 4f59324ee1f..5939e42ae93 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -253,7 +252,7 @@ class WalkthroughActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt index 3bd1620da59..608d84b0b19 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt @@ -87,7 +87,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -299,7 +298,7 @@ class WalkthroughFinalFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt index 831fb16faee..7bf8581cafe 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt @@ -92,7 +92,6 @@ import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -315,7 +314,7 @@ class WalkthroughTopicListFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt index 34437e03bc7..97974f3a2d6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -222,7 +221,7 @@ class WalkthroughWelcomeFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt index 4a75e8d367a..554cbeff236 100644 --- a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt @@ -76,7 +76,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.extensions.getProtoExtra import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -206,7 +205,7 @@ class ActivityIntentFactoriesTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt index b3caf939c6d..3aa92beb124 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterModuleTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -160,7 +159,7 @@ class ActivityRouterModuleTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt index e493e5a6120..d1f06461035 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -191,7 +190,7 @@ class ActivityRouterTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt index 3f69bfff0d6..c1dd20cd006 100644 --- a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -228,7 +227,7 @@ class HomeActivityLocalTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt b/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt index 6a308f4ae91..df806df9225 100644 --- a/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/FractionParsingUiErrorTest.kt @@ -68,7 +68,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -269,7 +268,7 @@ class FractionParsingUiErrorTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt index d007c30d687..e97850dc3a3 100644 --- a/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt @@ -103,7 +103,6 @@ import org.oppia.android.util.locale.DisplayLocaleImpl import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.locale.OppiaBidiFormatter import org.oppia.android.util.locale.OppiaLocale -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1078,7 +1077,7 @@ class ListItemLeadingMarginSpanTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt index e82fc1249e9..dbdffdca5db 100644 --- a/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -273,7 +272,7 @@ class StringToRatioParserTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt index c62ba27d2a0..b5059c0892e 100644 --- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt @@ -94,7 +94,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -428,7 +427,7 @@ class ExplorationActivityLocalTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt index b40a46e7ce4..4af5ec06d22 100644 --- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt @@ -162,7 +162,6 @@ import org.oppia.android.util.caching.LoadImagesFromAssets import org.oppia.android.util.caching.LoadLessonProtosFromAssets import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -2935,7 +2934,7 @@ class StateFragmentLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt index 0295ea4eb15..128361f5d7b 100644 --- a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt @@ -72,7 +72,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -149,7 +148,7 @@ class ProfileChooserFragmentLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt index 8cee1756370..b973bf5ef81 100644 --- a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -177,7 +176,7 @@ class StoryActivityLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt index e18e33c8df8..ea6b365c212 100644 --- a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -182,7 +181,7 @@ class CompletedStoryListSpanTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt index f3dd5643520..84ff4b75285 100644 --- a/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -198,7 +197,7 @@ class HomeSpanTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt index e6f5fa12f34..3e8eba9a4a9 100644 --- a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt @@ -75,7 +75,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -193,7 +192,7 @@ class OngoingTopicListSpanTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt b/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt index ec2f7c75064..55923caadbc 100644 --- a/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/PlatformParameterIntegrationTest.kt @@ -94,7 +94,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -366,7 +365,7 @@ class PlatformParameterIntegrationTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt index 4518f4a30a8..e5e783cd8b3 100644 --- a/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -395,7 +394,7 @@ class ProfileChooserSpanTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt index 47ee98a7204..451e9aa249d 100644 --- a/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCountTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -179,7 +178,7 @@ class ProfileProgressSpanCountTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt index c348c55fe90..538f31e64b9 100644 --- a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -320,7 +319,7 @@ class RecentlyPlayedSpanTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt index 6408a9b1e52..8fae80c1dcb 100644 --- a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -179,7 +178,7 @@ class TopicRevisionSpanTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt b/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt index c2a673eb4ea..bbb6dd15f15 100644 --- a/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/activity/TestActivityTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -204,7 +203,7 @@ class TestActivityTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt index 2145dab63cb..2b2ee89f742 100644 --- a/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt @@ -82,7 +82,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -205,7 +204,7 @@ class AdministratorControlsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt index ee9b8cbbc5c..54178d81774 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt @@ -80,7 +80,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -241,7 +240,7 @@ class OptionsFragmentTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt index 9d38a8fabee..e0b55eb5de7 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -212,7 +211,7 @@ class PlayerSplitScreenTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt index c36293a6e29..157dac70478 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -221,7 +220,7 @@ class StateFragmentAccessibilityTest { SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt index 8c61974dcfe..b7a0a3dcabd 100644 --- a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt @@ -72,7 +72,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -166,7 +165,7 @@ class TopicInfoFragmentLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt index 080512c02fb..0c0a47eba17 100644 --- a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt @@ -71,7 +71,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -170,7 +169,7 @@ class TopicLessonsFragmentLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt index bde01024154..53794b37cce 100644 --- a/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt @@ -102,7 +102,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -512,7 +511,7 @@ class QuestionPlayerActivityLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt index 5db8eeb9491..88085b5959e 100644 --- a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt @@ -73,7 +73,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -156,7 +155,7 @@ class RevisionCardActivityLocalTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt b/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt index c60af9cf356..aa12b2be77a 100644 --- a/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt +++ b/app/src/test/java/org/oppia/android/app/translation/ActivityLanguageLocaleHandlerTest.kt @@ -86,7 +86,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.OppiaLocale import org.oppia.android.util.locale.testing.LocaleTestModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -329,7 +328,7 @@ class ActivityLanguageLocaleHandlerTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt b/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt index 76811f7f5b3..7897a1baa25 100644 --- a/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt +++ b/app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt @@ -84,7 +84,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.testing.LocaleTestModule import org.oppia.android.util.locale.testing.TestOppiaBidiFormatter -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -617,7 +616,7 @@ class AppLanguageResourceHandlerTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt b/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt index 2bb7f687b8c..49c522e6963 100644 --- a/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt +++ b/app/src/test/java/org/oppia/android/app/translation/AppLanguageWatcherMixinTest.kt @@ -85,7 +85,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.testing.LocaleTestModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -311,7 +310,7 @@ class AppLanguageWatcherMixinTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt b/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt index c709292fa29..e3ec6648bca 100644 --- a/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt +++ b/app/src/test/java/org/oppia/android/app/utility/datetime/DateTimeUtilTest.kt @@ -74,7 +74,6 @@ import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.EnableConsoleLog import org.oppia.android.util.logging.EnableFileLog -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.GlobalLogLevel import org.oppia.android.util.logging.LogLevel import org.oppia.android.util.logging.SyncStatusModule @@ -227,7 +226,7 @@ class DateTimeUtilTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, AnalyticsStartupListenerTestModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt b/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt index 628b7cb8b75..2b286fc6a0b 100644 --- a/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt +++ b/app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt @@ -97,7 +97,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.testing.LocaleTestModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -1272,7 +1271,7 @@ class MathExpressionAccessibilityUtilTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt b/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt index da1c997fc18..65ead6fa8e7 100644 --- a/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt +++ b/instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt @@ -49,7 +49,6 @@ import org.oppia.android.util.accessibility.AccessibilityProdModule import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.CachingModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.DebugLogReportingModule @@ -100,7 +99,7 @@ import javax.inject.Singleton SyncStatusModule::class, NetworkConnectionDebugUtilModule::class, MetricLogSchedulerModule::class, ActivityRouterModule::class, PerformanceMetricsAssessorModule::class, PerformanceMetricsConfigurationsModule::class, - TestingBuildFlavorModule::class, EventLoggingConfigurationModule::class, + TestingBuildFlavorModule::class, ExplorationProgressModule::class, CpuPerformanceSnapshotterModule::class, TestAuthenticationModule::class ] diff --git a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt index 57a3bd0babf..ba70eadf910 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleCustomContextTest.kt @@ -69,7 +69,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -270,7 +269,7 @@ class InitializeDefaultLocaleRuleCustomContextTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt index c90ef4ab183..eaaf0521394 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleOmissionTest.kt @@ -67,7 +67,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -146,7 +145,7 @@ class InitializeDefaultLocaleRuleOmissionTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt index a3518296ea9..cf6b0da998c 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/junit/InitializeDefaultLocaleRuleTest.kt @@ -70,7 +70,6 @@ import org.oppia.android.util.caching.AssetModule import org.oppia.android.util.caching.testing.CachingTestModule import org.oppia.android.util.gcsresource.GcsResourceModule import org.oppia.android.util.locale.LocaleProdModule -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule @@ -150,7 +149,7 @@ class InitializeDefaultLocaleRuleTest { MathEquationInputModule::class, SplitScreenInteractionModule::class, LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class, - EventLoggingConfigurationModule::class, ActivityRouterModule::class, + ActivityRouterModule::class, CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class, TestAuthenticationModule::class ] diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel index 429a9bd5fcd..fec6137a9b5 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel @@ -136,19 +136,6 @@ kt_android_library( ], ) -kt_android_library( - name = "standard_event_logging_configuration_module", - srcs = [ - "EventLoggingConfigurationModule.kt", - "StandardEventTypeToHumanReadableNameConverterImpl.kt", - ], - visibility = ["//:oppia_prod_module_visibility"], - deps = [ - ":event_type_to_human_readable_name_converter", - "//:dagger", - ], -) - kt_android_library( name = "log_uploader", srcs = [ diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventLoggingConfigurationModule.kt b/utility/src/main/java/org/oppia/android/util/logging/EventLoggingConfigurationModule.kt deleted file mode 100644 index 57c88d8d2c9..00000000000 --- a/utility/src/main/java/org/oppia/android/util/logging/EventLoggingConfigurationModule.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.oppia.android.util.logging - -import dagger.Binds -import dagger.Module - -/** Module to provide standard configurations for the event logging infrastructure. */ -@Module -interface EventLoggingConfigurationModule { - @Binds - fun bindStandardEventTypeToHumanReadableNameConverter( - impl: StandardEventTypeToHumanReadableNameConverterImpl - ): EventTypeToHumanReadableNameConverter -} diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt b/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt index c6c3c849e40..72abfd30d5a 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt @@ -1,21 +1,83 @@ package org.oppia.android.util.logging -import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase +import javax.inject.Inject /** - * Converter for event types into loggable, human-readable names. + * Implementation of [EventTypeToHumanReadableNameConverter] which provides well-named + * representations for each event type. * - * Different builds of the app may leverage different implementations of this converter in order to - * customize the event names for querying purposes. + * The provided names may be changed over time as the broad standard for event names evolves with + * new and changed events. The general convention for event names is a second person singular + * conjugated action verb followed by the action, context, or both, that the user conducted that led + * to that event. Furthermore, efforts are taken to reduce referencing Android-specific terminology + * (e.g. 'screen' is used in place of 'activity'). + * + * Event names cannot exceed 40 characters, so care should be taken to ensure only the most + * important information is conveyed via the name. + * + * Finally, the provided event names are only meant to help simplify analyzing logged events. Since + * they can change, aggregation or dimensional slicing of events should occur by keying on the + * event's integral type rather than its name (as this type will remain fixed for the lifetime of a + * given event, unlike its name returned by this implementation). */ -interface EventTypeToHumanReadableNameConverter { - /** - * Returns a human-readable event name for the specified [eventType]. - * - * Note that the same name should always be returned for a given event type within the same - * version of the app (though the names can change across versions). The returned name should not - * contain any personal information nor any information tied to users; they should be constant - * regardless of the current logged in/created profile state of the app. - */ - fun convertToHumanReadableName(eventType: EventLog.Context.ActivityContextCase): String +class EventTypeToHumanReadableNameConverter @Inject constructor() + { + fun convertToHumanReadableName(eventType: ActivityContextCase): String { + return when (eventType) { + ActivityContextCase.OPEN_EXPLORATION_ACTIVITY -> "open_exploration_player_screen" + ActivityContextCase.OPEN_INFO_TAB -> "select_topic_info_tab" + ActivityContextCase.OPEN_LESSONS_TAB -> "select_topic_lessons_tab" + ActivityContextCase.OPEN_PRACTICE_TAB -> "select_topic_practice_tab" + ActivityContextCase.OPEN_REVISION_TAB -> "select_topic_revision_tab" + ActivityContextCase.OPEN_QUESTION_PLAYER -> "open_question_player_screen" + ActivityContextCase.OPEN_STORY_ACTIVITY -> "open_story_chapter_list_screen" + ActivityContextCase.OPEN_CONCEPT_CARD -> "open_concept_card" + ActivityContextCase.OPEN_REVISION_CARD -> "open_revision_card" + ActivityContextCase.CLOSE_REVISION_CARD -> "close_revision_card" + ActivityContextCase.START_CARD_CONTEXT -> "start_exploration_card" + ActivityContextCase.END_CARD_CONTEXT -> "end_exploration_card" + ActivityContextCase.HINT_UNLOCKED_CONTEXT -> "unlock_hint" + ActivityContextCase.REVEAL_HINT_CONTEXT -> "reveal_hint" + ActivityContextCase.VIEW_EXISTING_HINT_CONTEXT -> "view_existing_hint" + ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -> "unlock_solution" + ActivityContextCase.REVEAL_SOLUTION_CONTEXT -> "reveal_solution" + ActivityContextCase.VIEW_EXISTING_SOLUTION_CONTEXT -> "view_existing_solution" + ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer" + ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "click_play_voiceover_button" + ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "click_pause_voiceover_button" + ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "send_app_to_background" + ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "bring_app_to_foreground" + ActivityContextCase.START_EXPLORATION_CONTEXT -> "start_exploration_context" + ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "leave_exploration" + ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "complete_exploration" + ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success" + ActivityContextCase.PROGRESS_SAVING_FAILURE_CONTEXT -> "progress_saving_failure" + ActivityContextCase.LESSON_SAVED_ADVERTENTLY_CONTEXT -> "lesson_saved_advertently" + ActivityContextCase.RESUME_LESSON_SUBMIT_CORRECT_ANSWER_CONTEXT -> + "submit_correct_ans_in_resumed_lesson" + ActivityContextCase.RESUME_LESSON_SUBMIT_INCORRECT_ANSWER_CONTEXT -> + "submit_incorrect_ans_in_resumed_lesson" + ActivityContextCase.RESUME_EXPLORATION_CONTEXT -> "resume_in_progress_exploration" + ActivityContextCase.START_OVER_EXPLORATION_CONTEXT -> "restart_in_progress_exploration" + ActivityContextCase.DELETE_PROFILE_CONTEXT -> "delete_profile" + ActivityContextCase.OPEN_HOME -> "open_home_screen" + ActivityContextCase.OPEN_PROFILE_CHOOSER -> "open_profile_chooser_screen" + ActivityContextCase.REACH_INVESTED_ENGAGEMENT -> "reach_invested_engagement" + ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -> "click_switch_language_in_lesson" + ActivityContextCase.SHOW_SURVEY_POPUP -> "show_survey_popup" + ActivityContextCase.BEGIN_SURVEY -> "begin_survey" + ActivityContextCase.ABANDON_SURVEY -> "abandon_survey" + ActivityContextCase.MANDATORY_RESPONSE -> "mandatory_response" + ActivityContextCase.OPTIONAL_RESPONSE -> "optional_response" + ActivityContextCase.FEATURE_FLAG_LIST_CONTEXT -> "feature_flag_list" + ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG, + ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -> "ERROR_internal_logging_failure" + ActivityContextCase.COMPLETE_APP_ONBOARDING -> "complete_app_onboarding" + ActivityContextCase.CONSOLE_LOG -> "console_log" + ActivityContextCase.RETROFIT_CALL_CONTEXT -> "retrofit_call_context" + ActivityContextCase.RETROFIT_CALL_FAILED_CONTEXT -> "retrofit_call_failed_context" + ActivityContextCase.APP_IN_FOREGROUND_TIME -> "app_in_foreground_time" + } + } } diff --git a/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt deleted file mode 100644 index 315c28c5f3f..00000000000 --- a/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt +++ /dev/null @@ -1,83 +0,0 @@ -package org.oppia.android.util.logging - -import org.oppia.android.app.model.EventLog.Context.ActivityContextCase -import javax.inject.Inject - -/** - * Implementation of [EventTypeToHumanReadableNameConverter] which provides well-named - * representations for each event type. - * - * The provided names may be changed over time as the broad standard for event names evolves with - * new and changed events. The general convention for event names is a second person singular - * conjugated action verb followed by the action, context, or both, that the user conducted that led - * to that event. Furthermore, efforts are taken to reduce referencing Android-specific terminology - * (e.g. 'screen' is used in place of 'activity'). - * - * Event names cannot exceed 40 characters, so care should be taken to ensure only the most - * important information is conveyed via the name. - * - * Finally, the provided event names are only meant to help simplify analyzing logged events. Since - * they can change, aggregation or dimensional slicing of events should occur by keying on the - * event's integral type rather than its name (as this type will remain fixed for the lifetime of a - * given event, unlike its name returned by this implementation). - */ -class StandardEventTypeToHumanReadableNameConverterImpl @Inject constructor() : - EventTypeToHumanReadableNameConverter { - override fun convertToHumanReadableName(eventType: ActivityContextCase): String { - return when (eventType) { - ActivityContextCase.OPEN_EXPLORATION_ACTIVITY -> "open_exploration_player_screen" - ActivityContextCase.OPEN_INFO_TAB -> "select_topic_info_tab" - ActivityContextCase.OPEN_LESSONS_TAB -> "select_topic_lessons_tab" - ActivityContextCase.OPEN_PRACTICE_TAB -> "select_topic_practice_tab" - ActivityContextCase.OPEN_REVISION_TAB -> "select_topic_revision_tab" - ActivityContextCase.OPEN_QUESTION_PLAYER -> "open_question_player_screen" - ActivityContextCase.OPEN_STORY_ACTIVITY -> "open_story_chapter_list_screen" - ActivityContextCase.OPEN_CONCEPT_CARD -> "open_concept_card" - ActivityContextCase.OPEN_REVISION_CARD -> "open_revision_card" - ActivityContextCase.CLOSE_REVISION_CARD -> "close_revision_card" - ActivityContextCase.START_CARD_CONTEXT -> "start_exploration_card" - ActivityContextCase.END_CARD_CONTEXT -> "end_exploration_card" - ActivityContextCase.HINT_UNLOCKED_CONTEXT -> "unlock_hint" - ActivityContextCase.REVEAL_HINT_CONTEXT -> "reveal_hint" - ActivityContextCase.VIEW_EXISTING_HINT_CONTEXT -> "view_existing_hint" - ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -> "unlock_solution" - ActivityContextCase.REVEAL_SOLUTION_CONTEXT -> "reveal_solution" - ActivityContextCase.VIEW_EXISTING_SOLUTION_CONTEXT -> "view_existing_solution" - ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer" - ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "click_play_voiceover_button" - ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "click_pause_voiceover_button" - ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "send_app_to_background" - ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "bring_app_to_foreground" - ActivityContextCase.START_EXPLORATION_CONTEXT -> "start_exploration_context" - ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "leave_exploration" - ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "complete_exploration" - ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success" - ActivityContextCase.PROGRESS_SAVING_FAILURE_CONTEXT -> "progress_saving_failure" - ActivityContextCase.LESSON_SAVED_ADVERTENTLY_CONTEXT -> "lesson_saved_advertently" - ActivityContextCase.RESUME_LESSON_SUBMIT_CORRECT_ANSWER_CONTEXT -> - "submit_correct_ans_in_resumed_lesson" - ActivityContextCase.RESUME_LESSON_SUBMIT_INCORRECT_ANSWER_CONTEXT -> - "submit_incorrect_ans_in_resumed_lesson" - ActivityContextCase.RESUME_EXPLORATION_CONTEXT -> "resume_in_progress_exploration" - ActivityContextCase.START_OVER_EXPLORATION_CONTEXT -> "restart_in_progress_exploration" - ActivityContextCase.DELETE_PROFILE_CONTEXT -> "delete_profile" - ActivityContextCase.OPEN_HOME -> "open_home_screen" - ActivityContextCase.OPEN_PROFILE_CHOOSER -> "open_profile_chooser_screen" - ActivityContextCase.REACH_INVESTED_ENGAGEMENT -> "reach_invested_engagement" - ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -> "click_switch_language_in_lesson" - ActivityContextCase.SHOW_SURVEY_POPUP -> "show_survey_popup" - ActivityContextCase.BEGIN_SURVEY -> "begin_survey" - ActivityContextCase.ABANDON_SURVEY -> "abandon_survey" - ActivityContextCase.MANDATORY_RESPONSE -> "mandatory_response" - ActivityContextCase.OPTIONAL_RESPONSE -> "optional_response" - ActivityContextCase.FEATURE_FLAG_LIST_CONTEXT -> "feature_flag_list" - ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG, - ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -> "ERROR_internal_logging_failure" - ActivityContextCase.COMPLETE_APP_ONBOARDING -> "complete_app_onboarding" - ActivityContextCase.CONSOLE_LOG -> "console_log" - ActivityContextCase.RETROFIT_CALL_CONTEXT -> "retrofit_call_context" - ActivityContextCase.RETROFIT_CALL_FAILED_CONTEXT -> "retrofit_call_failed_context" - ActivityContextCase.APP_IN_FOREGROUND_TIME -> "app_in_foreground_time" - } - } -} diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt index 7a285e8626c..e0b29f36d15 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt +++ b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt @@ -2557,7 +2557,7 @@ class EventBundleCreatorTest { // TODO(#89): Move this to a common test application component. @Singleton - @Component(modules = [TestModule::class, EventLoggingConfigurationModule::class]) + @Component(modules = [TestModule::class]) interface TestApplicationComponent { @Component.Builder interface Builder { diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventLoggingConfigurationModuleTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventLoggingConfigurationModuleTest.kt deleted file mode 100644 index 4bd1ea8e445..00000000000 --- a/utility/src/test/java/org/oppia/android/util/logging/EventLoggingConfigurationModuleTest.kt +++ /dev/null @@ -1,70 +0,0 @@ -package org.oppia.android.util.logging - -import android.app.Application -import android.content.Context -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.google.common.truth.Truth.assertThat -import dagger.BindsInstance -import dagger.Component -import dagger.Module -import dagger.Provides -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.annotation.Config -import org.robolectric.annotation.LooperMode -import javax.inject.Inject -import javax.inject.Singleton - -/** Tests for [EventLoggingConfigurationModule]. */ -// FunctionName: test names are conventionally named with underscores. -@Suppress("FunctionName") -@RunWith(AndroidJUnit4::class) -@LooperMode(LooperMode.Mode.PAUSED) -@Config(manifest = Config.NONE) -class EventLoggingConfigurationModuleTest { - @Inject lateinit var eventTypeToHumanReadableNameConverter: EventTypeToHumanReadableNameConverter - - @Before - fun setUp() { - setUpTestApplicationComponent() - } - - @Test - fun testModule_injectedEventTypeToHumanReadableNameConverter_isStandardImplementation() { - assertThat(eventTypeToHumanReadableNameConverter) - .isInstanceOf(StandardEventTypeToHumanReadableNameConverterImpl::class.java) - } - - private fun setUpTestApplicationComponent() { - DaggerEventLoggingConfigurationModuleTest_TestApplicationComponent - .builder() - .setApplication(ApplicationProvider.getApplicationContext()).build().inject(this) - } - - // TODO(#89): Move this to a common test application component. - @Module - class TestModule { - @Provides - @Singleton - fun provideContext(application: Application): Context { - return application - } - } - - // TODO(#89): Move this to a common test application component. - @Singleton - @Component(modules = [EventLoggingConfigurationModule::class]) - interface TestApplicationComponent { - @Component.Builder - interface Builder { - @BindsInstance - fun setApplication(application: Application): Builder - - fun build(): TestApplicationComponent - } - - fun inject(test: EventLoggingConfigurationModuleTest) - } -} diff --git a/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt b/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt index 30992f7132c..2630c98d2e2 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt +++ b/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt @@ -20,7 +20,6 @@ import org.oppia.android.util.data.DataProvidersInjector import org.oppia.android.util.data.DataProvidersInjectorProvider import org.oppia.android.util.locale.LocaleProdModule import org.oppia.android.util.logging.AnalyticsEventLogger -import org.oppia.android.util.logging.EventLoggingConfigurationModule import org.oppia.android.util.logging.LoggerModule import org.oppia.android.util.logging.SyncStatusModule import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsEventLogger diff --git a/version.bzl b/version.bzl index 40d42c93f06..2d911e6c615 100644 --- a/version.bzl +++ b/version.bzl @@ -12,9 +12,9 @@ the app (that are potentially not broadly released yet). MAJOR_VERSION = 0 MINOR_VERSION = 13 -OPPIA_DEV_VERSION_CODE = 166 -OPPIA_DEV_KITKAT_VERSION_CODE = 165 -OPPIA_ALPHA_VERSION_CODE = 163 -OPPIA_ALPHA_KITKAT_VERSION_CODE = 162 -OPPIA_BETA_VERSION_CODE = 161 -OPPIA_GA_VERSION_CODE = 160 +OPPIA_DEV_VERSION_CODE = 167 +OPPIA_DEV_KITKAT_VERSION_CODE = 166 +OPPIA_ALPHA_VERSION_CODE = 164 +OPPIA_ALPHA_KITKAT_VERSION_CODE = 163 +OPPIA_BETA_VERSION_CODE = 162 +OPPIA_GA_VERSION_CODE = 167 From d7426959316caccc8adb0133007b288c3c432d1b Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:34:09 -0400 Subject: [PATCH 06/12] Resolve conflict in test_file_exemptions.textproto --- scripts/assets/test_file_exemptions.textproto | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto index bbc8a2fd872..9df392a7ba1 100644 --- a/scripts/assets/test_file_exemptions.textproto +++ b/scripts/assets/test_file_exemptions.textproto @@ -238,18 +238,6 @@ test_file_exemption { exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alpha/AlphaOppiaApplication.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt" - test_file_not_required: true -} -test_file_exemption { - exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaBuildFlavorModule.kt" - test_file_not_required: true -} -test_file_exemption { - exempted_file_path: "app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt" test_file_not_required: true @@ -3530,10 +3518,6 @@ test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintHandlerProdImpl.kt" source_file_is_incompatible_with_code_coverage: true } -test_file_exemption { - exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigAlphaKenyaModule.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt" test_file_not_required: true @@ -3670,10 +3654,6 @@ test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/survey/SurveyEventsLogger.kt" source_file_is_incompatible_with_code_coverage: true } -test_file_exemption { - exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaKenyaModule.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaModule.kt" test_file_not_required: true @@ -4374,14 +4354,6 @@ test_file_exemption { exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventLoggingConfigurationModule.kt" - override_min_coverage_percent_required: 0 -} -test_file_exemption { - exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt" test_file_not_required: true From a84a3cdd527de95d45751e190aea410112543769 Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Wed, 21 Aug 2024 23:15:06 -0400 Subject: [PATCH 07/12] Updated version.bzl and more clean up for EventLoggingConfigurationModule in test_file_exemptions.textproto & LogReportingModuleTest.kt --- scripts/assets/test_file_exemptions.textproto | 4 ---- .../util/logging/firebase/LogReportingModuleTest.kt | 1 - version.bzl | 10 +++++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto index 9df392a7ba1..411037cf8c2 100644 --- a/scripts/assets/test_file_exemptions.textproto +++ b/scripts/assets/test_file_exemptions.textproto @@ -4342,10 +4342,6 @@ test_file_exemption { exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/ConsoleLoggerInjectorProvider.kt" test_file_not_required: true } -test_file_exemption { - exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/EventLoggingConfigurationModule.kt" - override_min_coverage_percent_required: 0 -} test_file_exemption { exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt" test_file_not_required: true diff --git a/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt b/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt index 2630c98d2e2..40c20ad719c 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt +++ b/utility/src/test/java/org/oppia/android/util/logging/firebase/LogReportingModuleTest.kt @@ -111,7 +111,6 @@ class LogReportingModuleTest { RobolectricModule::class, FakeOppiaClockModule::class, NetworkConnectionUtilDebugModule::class, LocaleProdModule::class, TestPlatformParameterModule::class, LoggerModule::class, SyncStatusModule::class, - EventLoggingConfigurationModule::class ] ) interface TestApplicationComponent : DataProvidersInjector { diff --git a/version.bzl b/version.bzl index 2d911e6c615..cd5a9094511 100644 --- a/version.bzl +++ b/version.bzl @@ -12,9 +12,9 @@ the app (that are potentially not broadly released yet). MAJOR_VERSION = 0 MINOR_VERSION = 13 -OPPIA_DEV_VERSION_CODE = 167 -OPPIA_DEV_KITKAT_VERSION_CODE = 166 -OPPIA_ALPHA_VERSION_CODE = 164 -OPPIA_ALPHA_KITKAT_VERSION_CODE = 163 -OPPIA_BETA_VERSION_CODE = 162 +OPPIA_DEV_VERSION_CODE = 172 +OPPIA_DEV_KITKAT_VERSION_CODE = 171 +OPPIA_ALPHA_VERSION_CODE = 170 +OPPIA_ALPHA_KITKAT_VERSION_CODE = 169 +OPPIA_BETA_VERSION_CODE = 168 OPPIA_GA_VERSION_CODE = 167 From 63a41e4f212fdd197ae2fbf18fac00765d4bd493 Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Wed, 21 Aug 2024 23:18:45 -0400 Subject: [PATCH 08/12] Remove standard_event_logging_configuration_module in BUILD.bazel that caused build failed. --- .../android/app/application/alpha/BUILD.bazel | 1 - .../android/app/application/beta/BUILD.bazel | 1 - .../android/app/application/dev/BUILD.bazel | 1 - .../android/app/application/ga/BUILD.bazel | 1 - .../learneranalytics/BUILD.bazel | 2 - .../app/customview/interaction/BUILD.bazel | 1 - .../oppia/android/app/databinding/BUILD.bazel | 10 ----- .../mathexpressionparser/BUILD.bazel | 2 - .../org/oppia/android/app/notice/BUILD.bazel | 5 --- .../app/player/exploration/BUILD.bazel | 2 - .../android/app/player/state/BUILD.bazel | 1 - .../org/oppia/android/app/splash/BUILD.bazel | 1 - .../oppia/android/app/activity/BUILD.bazel | 1 - .../android/app/activity/route/BUILD.bazel | 2 - .../android/app/testing/activity/BUILD.bazel | 1 - .../oppia/android/app/translation/BUILD.bazel | 3 -- .../android/app/utility/math/BUILD.bazel | 1 - .../instrumentation/application/BUILD.bazel | 1 - .../oppia/android/testing/junit/BUILD.bazel | 3 -- .../oppia/android/util/logging/BUILD.bazel | 37 ------------------- .../android/util/logging/firebase/BUILD.bazel | 2 - 21 files changed, 79 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel index c5fbd5a72a3..935d66a7c55 100644 --- a/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel @@ -19,7 +19,6 @@ kt_android_library( "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:common_application_modules", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], diff --git a/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel index e615e151ac2..3023007d58f 100644 --- a/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel @@ -22,7 +22,6 @@ kt_android_library( "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:common_application_modules", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], diff --git a/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel index 76e56e3bab1..8831acd7ef7 100644 --- a/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel @@ -26,7 +26,6 @@ kt_android_library( "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:common_application_modules", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel index da232f782d2..1cdb245597a 100644 --- a/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel @@ -22,7 +22,6 @@ kt_android_library( "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:common_application_modules", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel index 847369f8d0e..1c98702393b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel @@ -28,7 +28,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -65,7 +64,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel index c30d27bb755..79c19ba42e5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel @@ -34,7 +34,6 @@ app_test( "//third_party:robolectric_android-all", "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel index 91bc0418d6b..c6c438cc60e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel @@ -70,7 +70,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -106,7 +105,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -142,7 +140,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -178,7 +175,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -214,7 +210,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -250,7 +245,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -286,7 +280,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -322,7 +315,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -358,7 +350,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -394,7 +385,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel index 0a49195e96c..8f3db957dcc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel @@ -31,7 +31,6 @@ app_test( "//third_party:robolectric_android-all", "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -64,7 +63,6 @@ app_test( "//third_party:robolectric_android-all", "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel index fae6ecc5a23..f065383e9a5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel @@ -35,7 +35,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -72,7 +71,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -103,7 +101,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) @@ -132,7 +129,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) @@ -161,7 +157,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel index 4ba1c3f5b56..64a22de135b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel @@ -35,7 +35,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -94,7 +93,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel index 1264e021c84..9bdb9a1acc1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel @@ -45,7 +45,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", diff --git a/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel index 387ee6650f4..be9324b4937 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel @@ -44,7 +44,6 @@ app_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", diff --git a/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel b/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel index 48fed80cf67..9c2f2586933 100644 --- a/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel @@ -37,7 +37,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel b/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel index 250d3e8bf15..e44430238fc 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel @@ -41,7 +41,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/extensions:bundle_extensions", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -81,7 +80,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel b/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel index 6ee76e3e337..4adaac2d311 100644 --- a/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel @@ -39,7 +39,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale:prod_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", diff --git a/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel b/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel index faddd51f273..ed1db979001 100644 --- a/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel @@ -81,7 +81,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -131,7 +130,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_oppia_bidi_formatter", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -178,7 +176,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", diff --git a/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel b/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel index 672944d46ec..a7caa3b0995 100644 --- a/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel @@ -43,7 +43,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/math:math_expression_parser", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", diff --git a/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel b/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel index 7e7ab58686e..a42115f4021 100644 --- a/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel +++ b/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel @@ -26,7 +26,6 @@ kt_android_library( "//domain", "//testing/src/main/java/org/oppia/android/testing/firebase:test_authentication_module", "//utility", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], diff --git a/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel index 69c6c6cbdca..e4b1a3de3ed 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel @@ -52,7 +52,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale:prod_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -106,7 +105,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale:prod_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", @@ -161,7 +159,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale:prod_module", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel index 562a370e705..b9c05cfff87 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel @@ -56,42 +56,6 @@ oppia_android_test( "//third_party:org_robolectric_robolectric", "//third_party:robolectric_android-all", "//utility/src/main/java/org/oppia/android/util/logging:event_bundle_creator", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", - ], -) - -oppia_android_test( - name = "EventLoggingConfigurationModuleTest", - srcs = ["EventLoggingConfigurationModuleTest.kt"], - custom_package = "org.oppia.android.util.logging", - test_class = "org.oppia.android.util.logging.EventLoggingConfigurationModuleTest", - test_manifest = "//utility:test_manifest", - deps = [ - "//:dagger", - "//testing", - "//third_party:androidx_test_ext_junit", - "//third_party:androidx_test_ext_truth", - "//third_party:com_google_truth_truth", - "//third_party:org_robolectric_robolectric", - "//third_party:robolectric_android-all", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", - ], -) - -oppia_android_test( - name = "StandardEventTypeToHumanReadableNameConverterImplTest", - srcs = ["StandardEventTypeToHumanReadableNameConverterImplTest.kt"], - custom_package = "org.oppia.android.util.logging", - test_class = "org.oppia.android.util.logging.StandardEventTypeToHumanReadableNameConverterImplTest", - test_manifest = "//utility:test_manifest", - deps = [ - "//:dagger", - "//testing", - "//third_party:androidx_test_ext_junit", - "//third_party:com_google_truth_truth", - "//third_party:org_robolectric_robolectric", - "//third_party:robolectric_android-all", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", ], ) @@ -145,7 +109,6 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", "//utility/src/main/java/org/oppia/android/util/logging:event_bundle_creator", "//utility/src/main/java/org/oppia/android/util/logging:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) diff --git a/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel index 8980bedd68c..841f115ae69 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel @@ -22,7 +22,6 @@ oppia_android_test( "//third_party:org_robolectric_robolectric", "//third_party:robolectric_android-all", "//utility/src/main/java/org/oppia/android/util/locale:prod_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], @@ -46,7 +45,6 @@ oppia_android_test( "//third_party:org_robolectric_robolectric", "//third_party:robolectric_android-all", "//utility/src/main/java/org/oppia/android/util/locale/testing:test_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", From 6ec532fc845969157fb6ab439fbf938ac6245937 Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:56:35 -0400 Subject: [PATCH 09/12] More cleanup at EventTypeToHumanReadableNameConverterTest. --- ...ntTypeToHumanReadableNameConverterTest.kt} | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) rename utility/src/test/java/org/oppia/android/util/logging/{StandardEventTypeToHumanReadableNameConverterImplTest.kt => EventTypeToHumanReadableNameConverterTest.kt} (75%) diff --git a/utility/src/test/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImplTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverterTest.kt similarity index 75% rename from utility/src/test/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImplTest.kt rename to utility/src/test/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverterTest.kt index 82047919161..55bff1f748e 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImplTest.kt +++ b/utility/src/test/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverterTest.kt @@ -17,7 +17,7 @@ import javax.inject.Inject import javax.inject.Singleton /** - * Tests for [StandardEventTypeToHumanReadableNameConverterImpl]. + * Tests for [EventTypeToHumanReadableNameConverter]. * * Note that this suite has special change detector tests to ensure that the converter conforms to * event logger restrictions (such as not having an event name longer than a certain number), which @@ -29,9 +29,9 @@ import javax.inject.Singleton @Suppress("FunctionName") @RunWith(AndroidJUnit4::class) @LooperMode(LooperMode.Mode.PAUSED) -@Config(application = StandardEventTypeToHumanReadableNameConverterImplTest.TestApplication::class) -class StandardEventTypeToHumanReadableNameConverterImplTest { - @Inject lateinit var converterImpl: StandardEventTypeToHumanReadableNameConverterImpl +@Config(application = EventTypeToHumanReadableNameConverterTest.TestApplication::class) +class EventTypeToHumanReadableNameConverterTest { + @Inject lateinit var converter: EventTypeToHumanReadableNameConverter private companion object { private val FAILURE_TYPES = setOf( @@ -49,7 +49,7 @@ class StandardEventTypeToHumanReadableNameConverterImplTest { fun testConvertToHumanReadableName_nonErrorTypes_returnsUniqueNameForEach() { val nonErrorContexts = ActivityContextCase.values().toSet() - FAILURE_TYPES - val nonErrorNames = nonErrorContexts.map(converterImpl::convertToHumanReadableName) + val nonErrorNames = nonErrorContexts.map(converter::convertToHumanReadableName) assertThat(nonErrorNames).containsNoDuplicates() } @@ -58,7 +58,7 @@ class StandardEventTypeToHumanReadableNameConverterImplTest { fun testConvertToHumanReadableName_errorTypes_shareTheSameName() { val errorContexts = FAILURE_TYPES - val errorNames = errorContexts.map(converterImpl::convertToHumanReadableName) + val errorNames = errorContexts.map(converter::convertToHumanReadableName) assertThat(errorNames.toSet()).hasSize(1) } @@ -68,8 +68,8 @@ class StandardEventTypeToHumanReadableNameConverterImplTest { val errorContexts = FAILURE_TYPES val nonErrorContexts = ActivityContextCase.values().toSet() - errorContexts - val nonErrorNames = nonErrorContexts.map(converterImpl::convertToHumanReadableName).toSet() - val errorNames = errorContexts.map(converterImpl::convertToHumanReadableName).toSet() + val nonErrorNames = nonErrorContexts.map(converter::convertToHumanReadableName).toSet() + val errorNames = errorContexts.map(converter::convertToHumanReadableName).toSet() assertThat(errorNames).containsNoneIn(nonErrorNames) } @@ -77,7 +77,7 @@ class StandardEventTypeToHumanReadableNameConverterImplTest { @Test fun testConvertToHumanReadableName_allNamesLessThan40Chars() { val allContexts = ActivityContextCase.values() - val allNames = allContexts.map(converterImpl::convertToHumanReadableName) + val allNames = allContexts.map(converter::convertToHumanReadableName) val namesLongerThan40 = allNames.filter { it.length > 40 } @@ -100,17 +100,17 @@ class StandardEventTypeToHumanReadableNameConverterImplTest { fun build(): TestApplicationComponent } - fun inject(test: StandardEventTypeToHumanReadableNameConverterImplTest) + fun inject(test: EventTypeToHumanReadableNameConverterTest) } class TestApplication : Application() { private val component: TestApplicationComponent by lazy { - DaggerStandardEventTypeToHumanReadableNameConverterImplTest_TestApplicationComponent.builder() + DaggerEventTypeToHumanReadableNameConverterTest_TestApplicationComponent.builder() .setApplication(this) .build() } - fun inject(test: StandardEventTypeToHumanReadableNameConverterImplTest) { + fun inject(test: EventTypeToHumanReadableNameConverterTest) { component.inject(test) } } From 802dff132024286911fe33ea92c554e37af5f69e Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:08:46 -0400 Subject: [PATCH 10/12] Include javax in BUILD.bazel for EventTypeToHumanReadableNameConverter.kt Added test BUILD.bazel config for EventTypeToHumanReadableNameConverterTest --- .../org/oppia/android/util/logging/BUILD.bazel | 1 + .../org/oppia/android/util/logging/BUILD.bazel | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel index fec6137a9b5..de80cc82f38 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel @@ -117,6 +117,7 @@ kt_android_library( ], deps = [ "//model/src/main/proto:event_logger_java_proto_lite", + "//third_party:javax_inject_javax_inject", ], ) diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel index b9c05cfff87..b13132c35ce 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel @@ -112,3 +112,18 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) + +oppia_android_test( + name = "EventTypeToHumanReadableNameConverterTest", + srcs = ["EventTypeToHumanReadableNameConverterTest.kt"], + custom_package = "org.oppia.android.util.logging", + test_class = "org.oppia.android.util.logging.EventTypeToHumanReadableNameConverterTest", + test_manifest = "//utility:test_manifest", + deps = [ + "//:dagger", + "//testing", + "//third_party:androidx_test_ext_junit", + "//third_party:com_google_truth_truth", + "//third_party:org_robolectric_robolectric", + "//third_party:robolectric_android-all", + ], \ No newline at end of file From fea05c36f0ed610200f13042a2608c187bc93942 Mon Sep 17 00:00:00 2001 From: XichengSpencer <74568012+XichengSpencer@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:26:48 -0400 Subject: [PATCH 11/12] Fix syntax error in BUILD.bazel --- .../src/test/java/org/oppia/android/util/logging/BUILD.bazel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel index b13132c35ce..318e1584f52 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel @@ -126,4 +126,5 @@ oppia_android_test( "//third_party:com_google_truth_truth", "//third_party:org_robolectric_robolectric", "//third_party:robolectric_android-all", - ], \ No newline at end of file + ], +) \ No newline at end of file From 4da3aa14712e898b6e09f8ede3b5052c9a59d474 Mon Sep 17 00:00:00 2001 From: XichengSpencer Date: Tue, 24 Sep 2024 12:41:28 -0400 Subject: [PATCH 12/12] Remove stard_event_logging_configuration part in BUILD.bazel and fix format issues --- app/BUILD.bazel | 1 - .../logging/EventTypeToHumanReadableNameConverter.kt | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 35036cf44fa..cbeefc86af0 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -939,7 +939,6 @@ TEST_DEPS = [ "//utility/src/main/java/org/oppia/android/util/accessibility:test_module", "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module", "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module", - "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module", "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module", "//utility/src/main/java/org/oppia/android/util/math:math_expression_parser", "//utility/src/main/java/org/oppia/android/util/networking:debug_module", diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt b/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt index 72abfd30d5a..b030194183b 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt @@ -21,9 +21,14 @@ import javax.inject.Inject * event's integral type rather than its name (as this type will remain fixed for the lifetime of a * given event, unlike its name returned by this implementation). */ -class EventTypeToHumanReadableNameConverter @Inject constructor() - { - fun convertToHumanReadableName(eventType: ActivityContextCase): String { +class EventTypeToHumanReadableNameConverter @Inject constructor() { + /** + * Converts an event type to a human-readable name. + * + * @param eventType The type of event to convert. + * @return A human-readable string representation of the event type. + */ + fun convertToHumanReadableName(eventType: ActivityContextCase): String { return when (eventType) { ActivityContextCase.OPEN_EXPLORATION_ACTIVITY -> "open_exploration_player_screen" ActivityContextCase.OPEN_INFO_TAB -> "select_topic_info_tab"