Fixes part of #59: Testing module builds with both Bazel + Gradle [BLOCKED: #1482]

WORKSPACE

@@ -112,30 +112,24 @@ maven_install(
         "org.robolectric:annotations:4.3",
         "androidx.appcompat:appcompat:1.0.2",
         "androidx.annotation:annotation:1.1.0",
-        "com.android.support:support-annotations:28.0.0",
-        "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2",
-        "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8",
         "androidx.core:core-ktx:1.0.1",
-        "junit:junit:4.12",
-        "com.google.truth:truth:0.43",
-        "com.github.bumptech.glide:glide:4.11.0",
-        "com.github.bumptech.glide:compiler:4.11.0",
-        "com.caverock:androidsvg-aar:1.4",
-        "com.crashlytics.sdk.android:crashlytics:2.9.8",
-        "io.fabric.sdk.android:fabric:1.4.7",
-        "com.google.gms:google-services:4.3.3",
         "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03",
-        "com.google.firebase:firebase-analytics-ktx:17.4.2",
-        "org.mockito:mockito-core:2.19.0",
         "androidx.test.ext:junit:1.1.1",
+        "com.android.support:support-annotations:28.0.0",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2",
         "org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.3.72",
         "org.jetbrains.kotlin:kotlin-test-junit:1.3.72",
-        "org.robolectric:annotations:4.3",
-        "com.crashlytics.sdk.android:crashlytics:2.9.8",
-        "io.fabric.sdk.android:fabric:1.4.7",
+        "org.jetbrains.kotlin:kotlin-reflect:1.3.41",
+        "com.google.truth:truth:0.43",
         "com.google.firebase:firebase-analytics:17.4.4",
         "com.google.firebase:firebase-crashlytics:17.1.1",
-        "org.jetbrains.kotlin:kotlin-reflect:1.3.41",
+        "com.crashlytics.sdk.android:crashlytics:2.9.8",
+        "io.fabric.sdk.android:fabric:1.4.7",
+        "com.github.bumptech.glide:glide:4.11.0",
+        "com.caverock:androidsvg-aar:1.4",
+        "org.mockito:mockito-core:2.19.0",
+        "junit:junit:4.12",
     ],
     repositories = DAGGER_REPOSITORIES + [
         "https://maven.google.com",

firebase/BUILD.bazel

@@ -29,7 +29,7 @@ android_library(
     exports = [
         artifact("com.crashlytics.sdk.android:crashlytics"),
         artifact("io.fabric.sdk.android:fabric"),
-        artifact("com.google.firebase:firebase-analytics:17.4.4"),
-        artifact("com.google.firebase:firebase-crashlytics:17.1.1"),
+        artifact("com.google.firebase:firebase-analytics"),
+        artifact("com.google.firebase:firebase-crashlytics"),
     ],
 )

oppia_android_test.bzl

@@ -1,45 +1,33 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
 
-def oppia_android_test(name, srcs, test_manifest, custom_package, resource_files,
-                       test_class, src_library_name):
+def oppia_android_test(name, srcs, test_manifest, custom_package, test_class, deps):
   '''
-  This macro exists as a way to set up a test in Oppia Android to be run with Bazel.
-  This macro creates a library for an individual test that is fed as a dependency into an
-  android_local_test() rule which configures the test to be run with Roboletric and Bazel.
+  Creates an Oppia test target for running the specified test as an Android local test with Kotlin
+  support. Note that this creates an additional, internal library.
 
   Args:
       name: str. The name of the Kotlin test file without the '.kt' suffix.
-      srcs: str. The name of the Kotlin test file to be run.
+      srcs: list of str. The name of the Kotlin test files to be run.
       test_manifest: str. The path to the test manifest file.
       custom_package: str. The module's package. Example: 'org.oppia.utility'.
-      resource_files: str. The path to the resource files. This is typically a glob([]).
       test_class: The package of the src file. For example, if the src is 'FakeEventLoggerTest.kt',
           then the test_class would be "org.oppia.testing.FakeEventLoggerTest".
-      src_library_name: str. The name of the library that builds the module's test files.
+      deps: list of str. The list of dependencies needed to run the tests.
   '''
 
   kt_android_library(
     name = name + "_lib",
     custom_package = custom_package,
     srcs = srcs,
-    resource_files = resource_files,
-    manifest = test_manifest,
-    deps = [
-        ":" + src_library_name,
-    ],
+    deps = deps,
+    testonly = True,
   )
 
   native.android_local_test(
     name = name,
     custom_package = custom_package,
     test_class = test_class,
     manifest = test_manifest,
-    deps = [
-       ":" + name + "_lib",
-       ":dagger",
-       "@robolectric//bazel:android-all",
-       artifact("org.jetbrains.kotlin:kotlin-reflect"),
-       artifact("org.robolectric:robolectric"),
-    ],
+    deps = [ ":" + name + "_lib",] + deps,
   )

testing/BUILD.bazel

@@ -1,11 +1,6 @@
 # TODO(#1532): Rename file to 'BUILD' post-Gradle.
 '''
 This library contains fake objects used for testing as well as tests for these objects.
-In Bazel, Kotlin source files are built into a library using the kt_android_library() rule.
-Individual Kotlin test files must be built in their own kt_android_library() rules and added as a
-dependency to an android_local_test() rule which configures instrumentation tests in Bazel.
-In order to eliminate duplicate code, a custom macro testing_test() has been written to streamline
-testing in this module.
 '''
 
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
@@ -18,7 +13,7 @@ load("//testing:testing_test.bzl", "testing_test")
 kt_android_library(
      name = "testing",
      custom_package = "org.oppia.testing",
-     srcs = glob(["src/main/java/**/*.kt"]),
+     srcs = glob(["src/main/java/org/oppia/testing/*.kt"]),
      manifest = "src/main/AndroidManifest.xml",
      deps = [
          ":dagger",
@@ -29,31 +24,27 @@ kt_android_library(
      visibility = ["//visibility:public"],
  )
 
-# Library for tests of testing fakes.
-kt_android_library(
-     name = "testing_tests",
-     custom_package = "org.oppia.testing",
-     srcs = glob(["src/test/java/org/oppia/testing/*.kt"]),
-     manifest = "src/main/AndroidManifest.xml",
-     deps = [
-         ":testing",
-         ":dagger",
-         artifact("com.google.truth:truth"),
-         artifact("androidx.test.ext:junit"),
-     ],
-     visibility = ["//visibility:private"],
-)
+TEST_DEPS = [
+    ":testing",
+    ":dagger",
+    "@robolectric//bazel:android-all",
+    artifact("org.jetbrains.kotlin:kotlin-reflect"),
+    artifact("com.google.truth:truth"),
+    artifact("androidx.test.ext:junit"),
+]
 
 testing_test(
     name = "FakeEventLoggerTest",
-    src = ["src/test/java/org/oppia/testing/FakeEventLoggerTest.kt"],
+    srcs = ["src/test/java/org/oppia/testing/FakeEventLoggerTest.kt"],
     test_class = "org.oppia.testing.FakeEventLoggerTest",
+    deps = TEST_DEPS,
 )
 
 testing_test(
     name = "FakeExceptionLoggerTest",
-    src = ["src/test/java/org/oppia/testing/FakeExceptionLoggerTest.kt"],
+    srcs = ["src/test/java/org/oppia/testing/FakeExceptionLoggerTest.kt"],
     test_class = "org.oppia.testing.FakeExceptionLoggerTest",
+    deps = TEST_DEPS,
 )
 
 dagger_rules()

testing/src/test/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.testing">
   <uses-sdk android:minSdkVersion="19"
-    android:maxSdkVersion="28" />
+    android:maxSdkVersion="29" />
 </manifest>

testing/testing_test.bzl

@@ -1,24 +1,22 @@
 load("//:oppia_android_test.bzl", "oppia_android_test")
 
-def testing_test(name, src, test_class):
+def testing_test(name, srcs, test_class, deps):
   '''
-  This macro exists as a way to customize the oppia_android_test() macro for the testing module.
-  This macro calls the oppia_android_test() macro such that the only necessary parameters for this
-  macro are the parameters specific to the individual test being run.
+  Creates individual tests for test files in the testing module.
 
   Args:
       name: str. The name of the Kotlin test file without the '.kt' suffix.
-      src: str. The name of the Kotlin test file to be run.
+      src: list of str. The list of test files to be run.
       test_class: str. The package of the src file. Example: If the src is 'FakeEventLoggerTest.kt',
           then the test_class would be "org.oppia.testing.FakeEventLoggerTest".
+      deps: list of str. The list of dependencies needed to build and run this test.
   '''
 
   oppia_android_test(
     name = name,
-    srcs = src,
-    resource_files = native.glob(["src/main/res/**/*.xml"]),
-    src_library_name = "testing_tests",
+    srcs = srcs,
     custom_package = "org.oppia.testing",
     test_class = test_class,
     test_manifest = "src/test/AndroidManifest.xml",
+    deps = deps,
   )

utility/BUILD.bazel

@@ -1,10 +1,6 @@
 # TODO(#1532): Rename file to 'BUILD' post-Gradle.
 '''
 This library contains utilities that all other modules, minus model, depend on.
-It also contains Robolectric and JUnit tests for it's utilities.
-In Bazel, Kotlin source files are built into a library using the kt_android_library() rule.
-Kotlin test files must be built in their own kt_android_library() rule and added as a dependency to
-an android_local_test() rule which configures instrumentation tests in Bazel.
 '''
 
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
@@ -31,8 +27,8 @@ kt_android_library(
     visibility = ["//visibility:public"],
 )
 
+# TODO(#59): Write a kt_android_library() rule to build test files and an android_local_test() rule.
 '''
-TODO(#59): Write a kt_android_library() rule to build test files and an android_local_test() rule.
 Because test files depend on the testing module source files being built, these rules have been left
 for a later PR.
 '''

utility/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.util">
-  <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="28" />
+  <uses-sdk
+    android:targetSdkVersion="29" />
 </manifest>

utility/src/test/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.util">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="28" />
+    android:targetSdkVersion="29" />
 </manifest>