commit 4a30885f2be6931fe6b94d54521ca39502aa060a
author Ivo List <ilist@google.com> Thu Sep 23 01:07:13 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 23 01:08:37 2021 -0700
tree f2b263433cb79029fd775525c590ac617d3f06e1
parent f5d308d6984552822d56f9b7f897be6e1bbafc79

Make jacoco and asm tests version independent.

Issue https://github.com/bazelbuild/bazel/issues/13987

Closes #14026.

PiperOrigin-RevId: 398428334

src/test/shell/bazel/bazel_java_tools_dist_test.sh

diff --git a/src/test/shell/bazel/bazel_java_tools_dist_test.sh b/src/test/shell/bazel/bazel_java_tools_dist_test.sh
index b972764..163758d 100755
--- a/src/test/shell/bazel/bazel_java_tools_dist_test.sh
+++ b/src/test/shell/bazel/bazel_java_tools_dist_test.sh
@@ -139,12 +139,12 @@
 }
 
 function test_java_tools_has_jacocoagent() {
-  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-0.8.6-sources.jar"
-  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-0.8.6-sources.jar"
-  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-0.8.6-sources.jar"
-  expect_path_in_java_tools "third_party/asm/asm-analysis-9.1-sources.jar"
-  expect_path_in_java_tools "third_party/asm/asm-commons-9.1-sources.jar"
-  expect_path_in_java_tools "third_party/asm/asm-9.1-sources.jar"
+  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.agent-.*-sources.jar"
+  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.core-.*-sources.jar"
+  expect_path_in_java_tools "third_party/java/jacoco/org.jacoco.report-.*-sources.jar"
+  expect_path_in_java_tools "third_party/asm/asm-analysis-.*-sources.jar"
+  expect_path_in_java_tools "third_party/asm/asm-commons-.*-sources.jar"
+  expect_path_in_java_tools "third_party/asm/asm-.*-sources.jar"
 }
 
 function test_java_tools_has_proguard() {

src/test/shell/bazel/bazel_java_tools_test.sh

diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
index 9c330df..1c43de6 100755
--- a/src/test/shell/bazel/bazel_java_tools_test.sh
+++ b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -177,13 +177,13 @@
 }
 
 function test_java_tools_has_jacocoagent() {
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.6.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.6.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.6.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.6.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-9.1.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-9.1.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-9.1.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-.*.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-.*.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-.*.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-.*.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-.*.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-.*.jar"
+  expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-.*.jar"
   expect_path_in_java_tools "java_tools/third_party/java/jacoco/LICENSE"
 }