Lint fixes and a few more dep additions

oppia · Jan 6, 2025 · de2e8e3 · de2e8e3
1 parent 2ddadb5
commit de2e8e3
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 50 deletions.
diff --git a/app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel
@@ -12,6 +12,7 @@ oppia_android_test(
     test_manifest = "//app:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//app/src/main/java/org/oppia/android/app/application/alpha:alpha_build_flavor_module",
         "//model/src/main/proto:version_java_proto_lite",
         "//third_party:androidx_test_ext_junit",

diff --git a/app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel
@@ -12,6 +12,7 @@ oppia_android_test(
     test_manifest = "//app:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//app/src/main/java/org/oppia/android/app/application/beta:beta_application",
         "//model/src/main/proto:version_java_proto_lite",
         "//third_party:androidx_test_ext_junit",

diff --git a/app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel
@@ -12,6 +12,7 @@ oppia_android_test(
     test_manifest = "//app:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//app/src/main/java/org/oppia/android/app/application/dev:developer_application",
         "//model/src/main/proto:version_java_proto_lite",
         "//third_party:androidx_test_ext_junit",

diff --git a/app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel
@@ -12,6 +12,7 @@ oppia_android_test(
     test_manifest = "//app:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//app/src/main/java/org/oppia/android/app/application/ga:general_availability_application",
         "//model/src/main/proto:version_java_proto_lite",
         "//third_party:androidx_test_ext_junit",

diff --git a/app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel
@@ -12,6 +12,7 @@ oppia_android_test(
     test_manifest = "//app:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module",
         "//model/src/main/proto:version_java_proto_lite",
         "//third_party:androidx_test_ext_junit",

diff --git a/...ndroid/app/devoptions/devoptionsitemviewmodel/DeveloperOptionsTestParsersViewModelTest.kt b/...ndroid/app/devoptions/devoptionsitemviewmodel/DeveloperOptionsTestParsersViewModelTest.kt
@@ -8,15 +8,11 @@ import org.mockito.Mockito.verifyNoMoreInteractions
 import org.mockito.junit.MockitoJUnit
 import org.mockito.junit.MockitoRule
 import org.oppia.android.app.devoptions.RouteToMathExpressionParserTestListener
-import org.oppia.android.testing.OppiaTestRule
 
 /** Tests for [DeveloperOptionsTestParsersViewModel]. */
 // FunctionName: test names are conventionally named with underscores.
 @Suppress("FunctionName")
 class DeveloperOptionsTestParsersViewModelTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
   @Rule
   @JvmField
   val mockitoRule: MockitoRule = MockitoJUnit.rule()

diff --git a/...icexpressioninput/AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest.kt b/...icexpressioninput/AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest.kt
@@ -9,15 +9,13 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.InteractionObject
 import org.oppia.android.app.model.SchemaObject
 import org.oppia.android.app.model.SchemaObjectList
 import org.oppia.android.domain.classify.ClassificationContext
 import org.oppia.android.domain.classify.RuleClassifier
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
@@ -48,8 +46,6 @@ import org.oppia.android.domain.classify.rules.algebraicexpressioninput.DaggerAl
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(manifest = Config.NONE)
 class AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
 
   @Inject
   internal lateinit var provider: AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProvider

diff --git a/...nput/AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt b/...nput/AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt
@@ -9,15 +9,13 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.InteractionObject
 import org.oppia.android.app.model.SchemaObject
 import org.oppia.android.app.model.SchemaObjectList
 import org.oppia.android.domain.classify.ClassificationContext
 import org.oppia.android.domain.classify.RuleClassifier
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
@@ -49,8 +47,6 @@ import org.oppia.android.domain.classify.rules.algebraicexpressioninput.DaggerAl
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(manifest = Config.NONE)
 class AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
 
   @Inject internal lateinit var provider: RuleClassifierProvider
 

diff --git a/...rc/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel b/...rc/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel
@@ -92,6 +92,7 @@ oppia_android_test(
         "//:dagger",
         "//domain",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module",
+        "//testing",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
         "//testing/src/main/java/org/oppia/android/testing/time:test_module",

diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel
@@ -92,6 +92,7 @@ oppia_android_test(
         "//:dagger",
         "//domain",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_rule_module",
+        "//testing",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
         "//testing/src/main/java/org/oppia/android/testing/time:test_module",

diff --git a/...sify/rules/mathequationinput/MathEquationInputIsEquivalentToRuleClassifierProviderTest.kt b/...sify/rules/mathequationinput/MathEquationInputIsEquivalentToRuleClassifierProviderTest.kt
@@ -9,15 +9,13 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.InteractionObject
 import org.oppia.android.app.model.SchemaObject
 import org.oppia.android.app.model.SchemaObjectList
 import org.oppia.android.domain.classify.ClassificationContext
 import org.oppia.android.domain.classify.RuleClassifier
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
@@ -47,8 +45,6 @@ import javax.inject.Singleton
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(manifest = Config.NONE)
 class MathEquationInputIsEquivalentToRuleClassifierProviderTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
 
   @Inject
   internal lateinit var provider: MathEquationInputIsEquivalentToRuleClassifierProvider

diff --git a/.../rules/mathequationinput/MathEquationInputMatchesExactlyWithRuleClassifierProviderTest.kt b/.../rules/mathequationinput/MathEquationInputMatchesExactlyWithRuleClassifierProviderTest.kt
@@ -9,15 +9,13 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.InteractionObject
 import org.oppia.android.app.model.SchemaObject
 import org.oppia.android.app.model.SchemaObjectList
 import org.oppia.android.domain.classify.ClassificationContext
 import org.oppia.android.domain.classify.RuleClassifier
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
@@ -47,8 +45,6 @@ import javax.inject.Singleton
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(manifest = Config.NONE)
 class MathEquationInputMatchesExactlyWithRuleClassifierProviderTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
 
   @Inject
   internal lateinit var provider: MathEquationInputMatchesExactlyWithRuleClassifierProvider

diff --git a/...uationinput/MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt b/...uationinput/MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt
@@ -9,15 +9,13 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.InteractionObject
 import org.oppia.android.app.model.SchemaObject
 import org.oppia.android.app.model.SchemaObjectList
 import org.oppia.android.domain.classify.ClassificationContext
 import org.oppia.android.domain.classify.RuleClassifier
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
@@ -49,8 +47,6 @@ import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInp
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(manifest = Config.NONE)
 class MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
 
   @Inject internal lateinit var provider: RuleClassifierProvider
 

diff --git a/domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel
@@ -12,6 +12,7 @@ oppia_android_test(
     test_manifest = "//domain:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//config/src/java/org/oppia/android/config:all_languages_config",
         "//domain/src/main/java/org/oppia/android/domain/locale:content_locale_impl",
         "//model/src/main/proto:languages_java_proto_lite",
@@ -32,6 +33,7 @@ oppia_android_test(
     test_manifest = "//domain:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//config/src/java/org/oppia/android/config:all_languages_config",
         "//domain/src/main/java/org/oppia/android/domain/locale:language_config_retriever",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
@@ -57,6 +59,7 @@ oppia_android_test(
     test_manifest = "//domain:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//config/src/java/org/oppia/android/config:production_languages_config",
         "//domain/src/main/java/org/oppia/android/domain/locale:language_config_retriever",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
@@ -82,6 +85,7 @@ oppia_android_test(
     test_manifest = "//domain:test_manifest",
     deps = [
         "//:dagger",
+        "//testing",
         "//config/src/java/org/oppia/android/config:all_languages_config",
         "//domain/src/main/java/org/oppia/android/domain/locale:language_config_retriever",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",

diff --git a/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt
@@ -12,7 +12,6 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.AppStartupState.BuildFlavorNoticeMode.FLAVOR_NOTICE_MODE_UNSPECIFIED
@@ -44,7 +43,6 @@ import org.oppia.android.domain.platformparameter.PlatformParameterController
 import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
 import org.oppia.android.testing.FakeAnalyticsEventLogger
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
@@ -87,9 +85,6 @@ import javax.inject.Singleton
 @SelectRunnerPlatform(ParameterizedRobolectricTestRunner::class)
 @Config(application = AppStartupStateControllerTest.TestApplication::class)
 class AppStartupStateControllerTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
   @Inject lateinit var context: Context
   @Inject lateinit var appStartupStateController: AppStartupStateController
   @Inject lateinit var platformParameterController: PlatformParameterController

diff --git a/domain/src/test/java/org/oppia/android/domain/onboarding/DeprecationControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/onboarding/DeprecationControllerTest.kt
@@ -11,7 +11,6 @@ import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.AppStartupState.StartupMode
@@ -29,7 +28,6 @@ import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
 import org.oppia.android.domain.platformparameter.PlatformParameterController
 import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
@@ -69,9 +67,6 @@ import javax.inject.Singleton
 @SelectRunnerPlatform(ParameterizedRobolectricTestRunner::class)
 @Config(application = DeprecationControllerTest.TestApplication::class)
 class DeprecationControllerTest {
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
   @Inject lateinit var context: Context
   @Inject lateinit var deprecationController: DeprecationController
   @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers

diff --git a/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerImplTest.kt b/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerImplTest.kt
@@ -10,11 +10,9 @@ import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.CoroutineDispatcher
 import org.junit.Before
-import org.junit.Rule
 import org.junit.runner.RunWith
 import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.domain.platformparameter.PlatformParameterModule
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.networking.NetworkConnectionTestUtil

diff --git a/...src/test/java/org/oppia/android/util/math/ExpressionToComparableOperationConverterTest.kt b/...src/test/java/org/oppia/android/util/math/ExpressionToComparableOperationConverterTest.kt
@@ -1,14 +1,12 @@
 package org.oppia.android.util.math
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.ComparableOperation
 import org.oppia.android.app.model.ComparableOperation.CommutativeAccumulation.AccumulationType.PRODUCT
 import org.oppia.android.app.model.ComparableOperation.CommutativeAccumulation.AccumulationType.SUMMATION
 import org.oppia.android.app.model.MathExpression
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter

diff --git a/utility/src/test/java/org/oppia/android/util/math/FractionParserTest.kt b/utility/src/test/java/org/oppia/android/util/math/FractionParserTest.kt
@@ -3,11 +3,9 @@ package org.oppia.android.util.math
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.Fraction
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.assertThrows
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode

diff --git a/utility/src/test/java/org/oppia/android/util/math/MathExpressionExtensionsTest.kt b/utility/src/test/java/org/oppia/android/util/math/MathExpressionExtensionsTest.kt
@@ -1,12 +1,10 @@
 package org.oppia.android.util.math
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.MathEquation
 import org.oppia.android.app.model.MathExpression
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter

diff --git a/utility/src/test/java/org/oppia/android/util/math/MathExpressionParserTest.kt b/utility/src/test/java/org/oppia/android/util/math/MathExpressionParserTest.kt
@@ -1,7 +1,6 @@
 package org.oppia.android.util.math
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.MathBinaryOperation.Operator.ADD
@@ -11,7 +10,6 @@ import org.oppia.android.app.model.MathBinaryOperation.Operator.MULTIPLY
 import org.oppia.android.app.model.MathBinaryOperation.Operator.SUBTRACT
 import org.oppia.android.app.model.MathEquation
 import org.oppia.android.app.model.MathExpression
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter

diff --git a/utility/src/test/java/org/oppia/android/util/math/MathTokenizerTest.kt b/utility/src/test/java/org/oppia/android/util/math/MathTokenizerTest.kt
@@ -1,10 +1,8 @@
 package org.oppia.android.util.math
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter

diff --git a/utility/src/test/java/org/oppia/android/util/math/PolynomialExtensionsTest.kt b/utility/src/test/java/org/oppia/android/util/math/PolynomialExtensionsTest.kt
@@ -1,15 +1,13 @@
 package org.oppia.android.util.math
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.Fraction
 import org.oppia.android.app.model.Polynomial
 import org.oppia.android.app.model.Polynomial.Term
 import org.oppia.android.app.model.Polynomial.Term.Variable
 import org.oppia.android.app.model.Real
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter

diff --git a/utility/src/test/java/org/oppia/android/util/math/RealExtensionsTest.kt b/utility/src/test/java/org/oppia/android/util/math/RealExtensionsTest.kt
@@ -1,12 +1,10 @@
 package org.oppia.android.util.math
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.Fraction
 import org.oppia.android.app.model.Real
-import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.assertThrows
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration