-
Notifications
You must be signed in to change notification settings - Fork 545
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* added labels for options language screen * a11y update * Added Tests * fixed spacing issues * fix * unused imports deleted * Added tests for labels * Fixed formatting issues * Tests updated * Removed unused imports * merged develop * Update app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageActivityTest.kt Co-authored-by: Ben Henning <henning.benmax@gmail.com> Co-authored-by: Ben Henning <henning.benmax@gmail.com>
- Loading branch information
1 parent
d802f57
commit 96ad91f
Showing
10 changed files
with
323 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package org.oppia.android.app.options | ||
|
|
||
| import android.app.Application | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.test.core.app.ApplicationProvider | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import androidx.test.rule.ActivityTestRule | ||
| import com.google.common.truth.Truth.assertThat | ||
| import dagger.Component | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.oppia.android.R | ||
| import org.oppia.android.app.activity.ActivityComponent | ||
| import org.oppia.android.app.application.ActivityComponentFactory | ||
| import org.oppia.android.app.application.ApplicationComponent | ||
| import org.oppia.android.app.application.ApplicationInjector | ||
| import org.oppia.android.app.application.ApplicationInjectorProvider | ||
| import org.oppia.android.app.application.ApplicationModule | ||
| import org.oppia.android.app.application.ApplicationStartupListenerModule | ||
| import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule | ||
| import org.oppia.android.app.shim.ViewBindingShimModule | ||
| import org.oppia.android.domain.classify.InteractionsModule | ||
| 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.multiplechoiceinput.MultipleChoiceInputModule | ||
| import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule | ||
| 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.onboarding.ExpirationMetaDataRetrieverModule | ||
| import org.oppia.android.domain.oppialogger.LogStorageModule | ||
| import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule | ||
| import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule | ||
| import org.oppia.android.domain.question.QuestionModule | ||
| import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule | ||
| import org.oppia.android.testing.RobolectricModule | ||
| import org.oppia.android.testing.TestDispatcherModule | ||
| import org.oppia.android.testing.TestLogReportingModule | ||
| import org.oppia.android.testing.time.FakeOppiaClockModule | ||
| import org.oppia.android.util.accessibility.AccessibilityTestModule | ||
| import org.oppia.android.util.caching.testing.CachingTestModule | ||
| import org.oppia.android.util.gcsresource.GcsResourceModule | ||
| import org.oppia.android.util.logging.LoggerModule | ||
| import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule | ||
| import org.oppia.android.util.parser.GlideImageLoaderModule | ||
| import org.oppia.android.util.parser.HtmlParserEntityTypeModule | ||
| import org.oppia.android.util.parser.ImageParsingModule | ||
| import org.robolectric.annotation.Config | ||
| import org.robolectric.annotation.LooperMode | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| /** Tests for [AppLanguageActivity]. */ | ||
| @RunWith(AndroidJUnit4::class) | ||
| @LooperMode(LooperMode.Mode.PAUSED) | ||
| @Config( | ||
| application = AppLanguageActivityTest.TestApplication::class, | ||
| qualifiers = "port-xxhdpi" | ||
| ) | ||
| class AppLanguageActivityTest { | ||
|
|
||
| @get:Rule | ||
| val activityTestRule: ActivityTestRule<AppLanguageActivity> = ActivityTestRule( | ||
| AppLanguageActivity::class.java, /* initialTouchMode= */ true, /* launchActivity= */ false | ||
| ) | ||
|
|
||
| @Inject | ||
| lateinit var context: Context | ||
|
|
||
| private val summaryValue = "English" | ||
|
|
||
| @Before | ||
| fun setUp() { | ||
| setUpTestApplicationComponent() | ||
| } | ||
|
|
||
| private fun setUpTestApplicationComponent() { | ||
| ApplicationProvider.getApplicationContext<TestApplication>().inject(this) | ||
| } | ||
|
|
||
| @Test | ||
| fun testAppLanguageActivity_hasCorrectActivityLabel() { | ||
| activityTestRule.launchActivity( | ||
| createAppLanguageActivityIntent( | ||
| summaryValue | ||
| ) | ||
| ) | ||
| val title = activityTestRule.activity.title | ||
| // Verify that the activity label is correct as a proxy to verify TalkBack will announce the | ||
| // correct string when it's read out. | ||
| assertThat(title).isEqualTo(context.getString(R.string.app_language_activity_title)) | ||
| } | ||
|
|
||
| private fun createAppLanguageActivityIntent(summaryValue: String): Intent { | ||
| return AppLanguageActivity.createAppLanguageActivityIntent( | ||
| ApplicationProvider.getApplicationContext(), | ||
| APP_LANGUAGE, | ||
| summaryValue | ||
| ) | ||
| } | ||
|
|
||
| // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them. | ||
| // TODO(#1675): Add NetworkModule once data module is migrated off of Moshi. | ||
| @Singleton | ||
| @Component( | ||
| modules = [ | ||
| RobolectricModule::class, | ||
| TestDispatcherModule::class, ApplicationModule::class, | ||
| LoggerModule::class, ContinueModule::class, FractionInputModule::class, | ||
| ItemSelectionInputModule::class, MultipleChoiceInputModule::class, | ||
| NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class, | ||
| DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class, | ||
| GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class, | ||
| HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class, | ||
| AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class, | ||
| PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class, | ||
| ViewBindingShimModule::class, RatioInputModule::class, | ||
| ApplicationStartupListenerModule::class, LogUploadWorkerModule::class, | ||
| WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class, | ||
| FirebaseLogUploaderModule::class, FakeOppiaClockModule::class | ||
| ] | ||
| ) | ||
| interface TestApplicationComponent : ApplicationComponent { | ||
| @Component.Builder | ||
| interface Builder : ApplicationComponent.Builder | ||
|
|
||
| fun inject(appLanguageActivityTest: AppLanguageActivityTest) | ||
| } | ||
|
|
||
| class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider { | ||
| private val component: TestApplicationComponent by lazy { | ||
| DaggerAppLanguageActivityTest_TestApplicationComponent.builder() | ||
| .setApplication(this) | ||
| .build() as TestApplicationComponent | ||
| } | ||
|
|
||
| fun inject(appLanguageActivityTest: AppLanguageActivityTest) { | ||
| component.inject(appLanguageActivityTest) | ||
| } | ||
|
|
||
| override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent { | ||
| return component.getActivityComponentBuilderProvider().get().setActivity(activity).build() | ||
| } | ||
|
|
||
| override fun getApplicationInjector(): ApplicationInjector = component | ||
| } | ||
| } |
Oops, something went wrong.