Skip to content

Commit

Permalink
Fixes oppia#3351 Merge accessibility test rule in oppia test rule (op…
Browse files Browse the repository at this point in the history
…pia#4025)

* Tests added in OppiaTestRule from AccessbilityTestRule

* Optimized code in OppiaTestRule

* Optimized imports in OppiaTestRule

* AccessbilityTestRule file deleted

* Revert "AccessbilityTestRule file deleted"

This reverts commit e6df4eb.

* AccessbilityTestRule replaced with OppiaTestRule in some files

* OppiaTestRule added in remaining files

* AccessbilityTestRule file deleted

* klint issue fixed for some files

* Revert "AccessbilityTestRule file deleted"

This reverts commit 8f9532f.

* klint fixed for single activity to check

* klint fixed for some files

* klint issue fixed

* Imports optimized

* Removed blank line from HomeActivityTest

* AccessibilityTestRule File Deleted

* Fixed tests passing on removing DisableAccessibilityTest

* Revert "AccessibilityTestRule File Deleted"

This reverts commit 1566b0d.

* Revert "Fixed tests passing on removing DisableAccessibilityTest"

This reverts commit fe3b0f8.

* AccessibilityTest File Deleted

* Fixed error in OppiaTestRule

* Fixed klint issue

* Changed variables in OppiaTestRule

* Fixed klint issue in OppiaTestRule

* Klint space issue fixed

* AccessibilityTestRule placed inside when condition
  • Loading branch information
vrajdesai78 authored and bhaktideshmukh committed Jan 25, 2022
1 parent 54a7283 commit 6819445
Show file tree
Hide file tree
Showing 82 changed files with 169 additions and 263 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.profile.ProfileTestHelper
Expand Down Expand Up @@ -126,7 +126,7 @@ class AdministratorControlsActivityTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

private val internalProfileId = 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -105,7 +105,7 @@ class AppVersionActivityTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@get:Rule
val activityTestRule: ActivityTestRule<AppVersionActivity> = ActivityTestRule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0
import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID
import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
import org.oppia.android.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -110,7 +110,7 @@ class CompletedStoryListActivityTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

private val internalProfileId = 0
private val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestImageLoaderModule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
Expand Down Expand Up @@ -87,7 +87,7 @@ class LessonThumbnailImageViewTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@get:Rule
val activityTestRule = ActivityTestRule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -124,7 +124,7 @@ class DeveloperOptionsActivityTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.assertThrows
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
Expand Down Expand Up @@ -129,7 +129,7 @@ class DeveloperOptionsFragmentTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -103,7 +103,7 @@ class MarkChaptersCompletedActivityTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -125,7 +125,7 @@ class MarkChaptersCompletedFragmentTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -103,7 +103,7 @@ class MarkStoriesCompletedActivityTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -125,7 +125,7 @@ class MarkStoriesCompletedFragmentTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -103,7 +103,7 @@ class MarkTopicsCompletedActivityTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -125,7 +125,7 @@ class MarkTopicsCompletedFragmentTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
import org.oppia.android.testing.threading.TestDispatcherModule
Expand Down Expand Up @@ -95,7 +95,7 @@ class ViewEventLogsActivityTest {
lateinit var context: Context

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@get:Rule
val activityTestRule = ActivityTestRule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
import org.oppia.android.testing.threading.TestCoroutineDispatchers
Expand Down Expand Up @@ -105,7 +105,7 @@ class ViewEventLogsFragmentTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Inject
lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -102,7 +102,7 @@ class ForceNetworkTypeActivityTest {
)

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -104,7 +104,7 @@ class ForceNetworkTypeFragmentTest {
lateinit var context: Context

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -99,7 +99,7 @@ class FAQListFragmentTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -96,7 +96,7 @@ class FAQSingleActivityTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

private lateinit var launchedActivity: Activity

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -83,7 +83,7 @@ class FaqListActivityTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@get:Rule
val activityTestRule: ActivityTestRule<FAQListActivity> = ActivityTestRule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.TestLogReportingModule
import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
import org.oppia.android.testing.robolectric.RobolectricModule
Expand Down Expand Up @@ -82,7 +82,7 @@ class HelpActivityTest {
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()
val oppiaTestRule = OppiaTestRule()

@get:Rule
val activityTestRule: ActivityTestRule<HelpActivity> = ActivityTestRule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
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.testing.AccessibilityTestRule
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.RunOn
import org.oppia.android.testing.TestLogReportingModule
Expand Down Expand Up @@ -109,9 +108,6 @@ class HelpFragmentTest {
@get:Rule
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()

@get:Rule
val oppiaTestRule = OppiaTestRule()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID
import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
import org.oppia.android.testing.AccessibilityTestRule
import org.oppia.android.testing.BuildEnvironment
import org.oppia.android.testing.OppiaTestRule
import org.oppia.android.testing.RunOn
Expand Down Expand Up @@ -158,9 +157,6 @@ class HomeActivityTest {
@get:Rule
val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()

@get:Rule
val accessibilityTestRule = AccessibilityTestRule()

@get:Rule
val oppiaTestRule = OppiaTestRule()

Expand Down
Loading

0 comments on commit 6819445

Please sign in to comment.