From de2e8e31e4ac9b4e5892f0d49e63b0e8b47fc5b3 Mon Sep 17 00:00:00 2001 From: Rd Date: Tue, 7 Jan 2025 01:39:58 +0530 Subject: [PATCH] Lint fixes and a few more dep additions --- .../java/org/oppia/android/app/application/alpha/BUILD.bazel | 1 + .../java/org/oppia/android/app/application/beta/BUILD.bazel | 1 + .../java/org/oppia/android/app/application/dev/BUILD.bazel | 1 + .../java/org/oppia/android/app/application/ga/BUILD.bazel | 1 + .../org/oppia/android/app/application/testing/BUILD.bazel | 1 + .../DeveloperOptionsTestParsersViewModelTest.kt | 4 ---- ...ssionInputMatchesExactlyWithRuleClassifierProviderTest.kt | 4 ---- ...chesUpToTrivialManipulationsRuleClassifierProviderTest.kt | 4 ---- .../classify/rules/algebraicexpressioninput/BUILD.bazel | 1 + .../domain/classify/rules/mathequationinput/BUILD.bazel | 1 + ...hEquationInputIsEquivalentToRuleClassifierProviderTest.kt | 4 ---- ...ationInputMatchesExactlyWithRuleClassifierProviderTest.kt | 4 ---- ...chesUpToTrivialManipulationsRuleClassifierProviderTest.kt | 4 ---- .../test/java/org/oppia/android/domain/locale/BUILD.bazel | 4 ++++ .../domain/onboarding/AppStartupStateControllerTest.kt | 5 ----- .../android/domain/onboarding/DeprecationControllerTest.kt | 5 ----- .../oppia/android/util/logging/SyncStatusManagerImplTest.kt | 2 -- .../math/ExpressionToComparableOperationConverterTest.kt | 2 -- .../java/org/oppia/android/util/math/FractionParserTest.kt | 2 -- .../oppia/android/util/math/MathExpressionExtensionsTest.kt | 2 -- .../org/oppia/android/util/math/MathExpressionParserTest.kt | 2 -- .../java/org/oppia/android/util/math/MathTokenizerTest.kt | 2 -- .../org/oppia/android/util/math/PolynomialExtensionsTest.kt | 2 -- .../java/org/oppia/android/util/math/RealExtensionsTest.kt | 2 -- 24 files changed, 11 insertions(+), 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 index e8cc91483e3..a8f73a86a68 100644 --- 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 index 16a2e88e15c..d253eddd828 100644 --- 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 index 47e7ca2b31b..6d59582c92a 100644 --- 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 index a15268016f6..086edffdcf3 100644 --- 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 index 20c624701ff..1fb8dd6c04c 100644 --- 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/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/DeveloperOptionsTestParsersViewModelTest.kt b/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/DeveloperOptionsTestParsersViewModelTest.kt index 9d98fc02a80..6516a0d68ae 100644 --- a/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/DeveloperOptionsTestParsersViewModelTest.kt +++ b/app/src/test/java/org/oppia/android/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/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest.kt index 29dc3da3153..7710376e9da 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest.kt @@ -9,7 +9,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.InteractionObject @@ -17,7 +16,6 @@ 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/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt index a765fd77246..6d46171f09f 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt @@ -9,7 +9,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.InteractionObject @@ -17,7 +16,6 @@ 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/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel index 60ea68740a9..ba0daf576a6 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel +++ b/domain/src/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 index 8170eefb44e..de98da6405d 100644 --- 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/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputIsEquivalentToRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputIsEquivalentToRuleClassifierProviderTest.kt index eb57638c91d..23e9cac2419 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputIsEquivalentToRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputIsEquivalentToRuleClassifierProviderTest.kt @@ -9,7 +9,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.InteractionObject @@ -17,7 +16,6 @@ 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/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesExactlyWithRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesExactlyWithRuleClassifierProviderTest.kt index b1f445c0c75..6a696e11496 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesExactlyWithRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesExactlyWithRuleClassifierProviderTest.kt @@ -9,7 +9,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.InteractionObject @@ -17,7 +16,6 @@ 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/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt index 90834134f19..030f8dfc78f 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest.kt @@ -9,7 +9,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.InteractionObject @@ -17,7 +16,6 @@ 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 index 7b02bf08e9c..59b69ccc519 100644 --- 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 index 686a5c81050..64aafa421d5 100644 --- 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 index b96118e4518..ddec4a04d86 100644 --- 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 index 51f3bf13eac..8a2fb917f9d 100644 --- 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/utility/src/test/java/org/oppia/android/util/math/ExpressionToComparableOperationConverterTest.kt b/utility/src/test/java/org/oppia/android/util/math/ExpressionToComparableOperationConverterTest.kt index 4c1682f5ae2..5a20ba0cc07 100644 --- a/utility/src/test/java/org/oppia/android/util/math/ExpressionToComparableOperationConverterTest.kt +++ b/utility/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 index 5126c6738c6..81d07c867fa 100644 --- 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 index dd5e3407aea..371048728af 100644 --- 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 index 477f4b05078..3a164f810f1 100644 --- 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 index aa6cbd79033..05f65cd71f0 100644 --- 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 index fbb56557822..1f9824e2b1d 100644 --- 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,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.Fraction @@ -9,7 +8,6 @@ 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 index f3cd9c28c8f..f39b7a75d9a 100644 --- 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