Remove Override from BranchDetailAnalyzer

Related to #11674 Closes #13334. PiperOrigin-RevId: 367977250
bazelbuild · Apr 12, 2021 · ca47b27 · ca47b27
1 parent 93055b2
commit ca47b27
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BranchDetailAnalyzer.java b/src/java_tools/junitrunner/java/com/google/testing/coverage/BranchDetailAnalyzer.java
@@ -72,7 +72,6 @@ public void analyzeClass(final byte[] buffer, final String location) throws IOEx
     }
   }
 
-  @Override
   public void analyzeClass(final ClassReader reader) {
     final Map<Integer, BranchExp> lineToBranchExp = mapProbes(reader);
 

diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
@@ -508,7 +508,11 @@ sh_test(
             "//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
             "//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:coverage_output_generator_repo",
         ],
-        tags = ["no_windows"],
+        # TODO(#11674) reenable after the upgrade
+        tags = [
+            "manual",
+            "no_windows",
+        ],
     )
     for java_version in JAVA_VERSIONS
 ]

diff --git a/src/test/shell/bazel/bazel_java_tools_dist_test.sh b/src/test/shell/bazel/bazel_java_tools_dist_test.sh
@@ -138,7 +138,8 @@ function test_java_tools_has_javac() {
   expect_path_in_java_tools "javac-9+181-r4173-1.srcjar"
 }
 
-function test_java_tools_has_jacocoagent() {
+# TODO(#11674) reenable after the upgrade
+function disable_test_java_tools_has_jacocoagent() {
   expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-0.8.3-sources.jar"
   expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-0.8.3-sources.jar"
   expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-0.8.3-sources.jar"

diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -176,7 +176,8 @@ function test_java_tools_has_BUILD() {
   expect_path_in_java_tools "BUILD"
 }
 
-function test_java_tools_has_jacocoagent() {
+# TODO(#11674) reenable after the upgrade
+function disable_test_java_tools_has_jacocoagent() {
   expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"
   expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar"
   expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"