Refactoring with test file exemption removal

Would probably need to fix failing test cases first to actually see coverage workflows in action, will switch to PR 2.2
oppia · Aug 8, 2024 · e527dd9 · e527dd9
1 parent 30f3e97
commit e527dd9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/scripts/BUILD.bazel b/scripts/BUILD.bazel
@@ -258,7 +258,6 @@ kt_jvm_binary(
 kt_jvm_binary(
     name = "compute_changed_files",
     testonly = True,
-    data = TEST_FILE_EXEMPTION_ASSETS,
     main_class = "org.oppia.android.scripts.ci.ComputeChangedFilesKt",
     runtime_deps = ["//scripts/src/java/org/oppia/android/scripts/ci:compute_changed_files_lib"],
 )

diff --git a/scripts/src/java/org/oppia/android/scripts/ci/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/ci/BUILD.bazel
@@ -44,7 +44,6 @@ kt_jvm_library(
         "//scripts/src/java/org/oppia/android/scripts/common:proto_string_encoder",
         "//scripts/src/java/org/oppia/android/scripts/common:repository_file",
         "//scripts/src/java/org/oppia/android/scripts/proto:changed_files_java_proto",
-        "//scripts/src/java/org/oppia/android/scripts/proto:script_exemptions_java_proto",
     ],
 )
 

diff --git a/scripts/src/java/org/oppia/android/scripts/ci/ComputeChangedFiles.kt b/scripts/src/java/org/oppia/android/scripts/ci/ComputeChangedFiles.kt
@@ -7,7 +7,6 @@ import org.oppia.android.scripts.common.ProtoStringEncoder.Companion.toCompresse
 import org.oppia.android.scripts.common.RepositoryFile
 import org.oppia.android.scripts.common.ScriptBackgroundCoroutineDispatcher
 import org.oppia.android.scripts.proto.ChangedFilesBucket
-import org.oppia.android.scripts.proto.TestFileExemptions
 import java.io.File
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -313,11 +312,3 @@ class ComputeChangedFiles(
     SMALL_PARTITIONS
   }
 }
-
-private fun loadTestFileExemptionsProto(testFileExemptiontextProto: String): TestFileExemptions {
-  return File("$testFileExemptiontextProto.pb").inputStream().use { stream ->
-    TestFileExemptions.newBuilder().also { builder ->
-      builder.mergeFrom(stream)
-    }.build()
-  }
-}
diff --git a/scripts/src/javatests/org/oppia/android/scripts/ci/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/ci/BUILD.bazel
@@ -36,7 +36,6 @@ kt_jvm_test(
     name = "ComputeChangedFilesTest",
     size = "large",
     srcs = ["ComputeChangedFilesTest.kt"],
-#    shard_count = 24,
     deps = [
         "//scripts/src/java/org/oppia/android/scripts/ci:compute_changed_files_lib",
         "//scripts/src/java/org/oppia/android/scripts/common:proto_string_encoder",

diff --git a/scripts/src/javatests/org/oppia/android/scripts/ci/RetrieveChangedFilesTest.kt b/scripts/src/javatests/org/oppia/android/scripts/ci/RetrieveChangedFilesTest.kt
@@ -223,4 +223,4 @@ class RetrieveChangedFilesTest {
       scriptBgDispatcher, processTimeout = 5, processTimeoutUnit = TimeUnit.MINUTES
     )
   }
-}
+}