tests for artifact with plus (#1053)

Related to #962, reproducing base case that works.
Added maven_install stanzas for an artifact that contains plus in its
version.

Also fixed some test issues related to deleting generated files.
File names changed after switching to bzlmod.
Added a sanity check in expect_not_in_file() to ensure it's being called
for a good file (and not reporting missing string due to missing file).

Moved around one test for proper grouping.

Author: gergelyfabian

MODULE.bazel

@@ -1,7 +1,7 @@
 module(
     name = "rules_jvm_external",
-    version = "6.0",
     compatibility_level = 2,
+    version = "6.0",
 )
 
 bazel_dep(
@@ -349,6 +349,27 @@ dev_maven.install(
     ],
 )
 
+dev_maven.install(
+    name = "artifact_with_plus",
+    artifacts = [
+        "ch.epfl.scala:compiler-interface:1.3.0-M4+47-d881fa2f",
+    ],
+    repositories = [
+        "https://repo1.maven.org/maven2",
+    ],
+)
+
+dev_maven.install(
+    name = "artifact_with_plus_repin",
+    artifacts = [
+        "ch.epfl.scala:compiler-interface:1.3.0-M4+47-d881fa2f",
+    ],
+    lock_file = "//tests/custom_maven_install:artifact_with_plus_repin_install.json",
+    repositories = [
+        "https://repo1.maven.org/maven2",
+    ],
+)
+
 dev_maven.install(
     name = "manifest_stamp_testing",
     artifacts = [
@@ -635,6 +656,9 @@ use_repo(
     "m2local_testing_repin",
     "m2local_testing_without_checksum",
     "unpinned_m2local_testing_repin",
+    "artifact_with_plus",
+    "artifact_with_plus_repin",
+    "unpinned_artifact_with_plus_repin",
 
     # Pinned repo
     "maven",

WORKSPACE

@@ -538,9 +538,9 @@ maven_install(
     ],
 )
 
-load("@m2local_testing_repin//:defs.bzl", "pinned_maven_install")
+load("@m2local_testing_repin//:defs.bzl", m2local_testing_repin_maven_install = "pinned_maven_install")
 
-pinned_maven_install()
+m2local_testing_repin_maven_install()
 
 maven_install(
     name = "m2local_testing_without_checksum",
@@ -588,6 +588,35 @@ maven_install(
     ],
 )
 
+load("@m2local_testing_ignore_empty_files_repin//:defs.bzl", m2local_testing_ignore_empty_files_repin_maven_install = "pinned_maven_install")
+
+m2local_testing_ignore_empty_files_repin_maven_install()
+
+maven_install(
+    name = "artifact_with_plus",
+    artifacts = [
+        "ch.epfl.scala:compiler-interface:1.3.0-M4+47-d881fa2f",
+    ],
+    repositories = [
+        "https://repo1.maven.org/maven2",
+    ],
+)
+
+maven_install(
+    name = "artifact_with_plus_repin",
+    artifacts = [
+        "ch.epfl.scala:compiler-interface:1.3.0-M4+47-d881fa2f",
+    ],
+    maven_install_json = "//tests/custom_maven_install:artifact_with_plus_repin_install.json",
+    repositories = [
+        "https://repo1.maven.org/maven2",
+    ],
+)
+
+load("@artifact_with_plus_repin//:defs.bzl", artifact_with_plus_maven_install = "pinned_maven_install")
+
+artifact_with_plus_maven_install()
+
 maven_install(
     name = "v1_lock_file_format",
     artifacts = [

tests/bazel_run_tests.sh

@@ -21,14 +21,24 @@ function test_dependency_aggregation() {
 
 function test_duplicate_version_warning() {
   bazel run @duplicate_version_warning//:pin >> "$TEST_LOG" 2>&1
-  rm -f duplicate_version_warning_install.json
+  rm -f *duplicate_version_warning_install.json
 
   expect_log "Found duplicate artifact versions"
   expect_log "com.fasterxml.jackson.core:jackson-annotations has multiple versions"
   expect_log "com.github.jnr:jffi:native has multiple versions"
   expect_log "Successfully pinned resolved artifacts"
 }
 
+function test_duplicate_version_warning_same_version() {
+  bazel run @duplicate_version_warning_same_version//:pin >> "$TEST_LOG" 2>&1
+  rm -f *duplicate_version_warning_same_version_install.json
+
+  expect_not_log "Found duplicate artifact versions"
+  expect_not_log "com.fasterxml.jackson.core:jackson-annotations has multiple versions"
+  expect_not_log "com.github.jnr:jffi:native has multiple versions"
+  expect_log "Successfully pinned resolved artifacts"
+}
+
 function test_m2local_testing_ignore_empty_files() {
   # Testing ignore_empty_files with m2local, as it's the easiest way to imitate an empty jar file.
   m2local_dir="${HOME}/.m2/repository"
@@ -47,9 +57,9 @@ function test_m2local_testing_ignore_empty_files() {
   force_bzlmod_lock_file_to_be_regenerated
 
   bazel run @m2local_testing_ignore_empty_files//:pin >> "$TEST_LOG" 2>&1
-  expect_not_in_file '"sources": "' m2local_testing_ignore_empty_files_install.json
+  expect_not_in_file '"sources": "' *m2local_testing_ignore_empty_files_install.json
 
-  rm -f m2local_testing_ignore_empty_files_install.json
+  rm -f *m2local_testing_ignore_empty_files_install.json
   rm -rf ${jar_dir}
 
   expect_log "Assuming maven local for artifact: com.example:kt:1.0.0"
@@ -95,7 +105,7 @@ function test_m2local_testing_found_local_artifact_through_pin_and_build() {
   force_bzlmod_lock_file_to_be_regenerated
 
   bazel build @m2local_testing//:com_example_kt >> "$TEST_LOG" 2>&1
-  rm -f m2local_testing_install.json
+  rm -f *m2local_testing_install.json
   rm -rf ${jar_dir}
 
   expect_log "Assuming maven local for artifact: com.example:kt:1.0.0"
@@ -118,7 +128,6 @@ function test_unpinned_m2local_testing_found_local_artifact_through_pin_and_buil
   force_bzlmod_lock_file_to_be_regenerated
 
   bazel build @m2local_testing_repin//:com_example_kt >> "$TEST_LOG" 2>&1
-  rm -f m2local_testing_install.json
   rm -rf ${jar_dir}
 
   expect_log "Assuming maven local for artifact: com.example:kt:1.0.0"
@@ -174,13 +183,28 @@ function test_m2local_testing_found_local_artifact_after_build_copy() {
   expect_log "Assuming maven local for artifact: com.example:kt:1.0.0"
 }
 
-function test_duplicate_version_warning_same_version() {
-  bazel run @duplicate_version_warning_same_version//:pin >> "$TEST_LOG" 2>&1
-  rm -f duplicate_version_warning_same_version_install.json
+function test_found_artifact_with_plus_through_pin_and_build() {
+  bazel clean --expunge >> "$TEST_LOG" 2>&1 # for https://github.com/bazelbuild/rules_jvm_external/issues/800
+  bazel run @artifact_with_plus//:pin >> "$TEST_LOG" 2>&1
+
+  force_bzlmod_lock_file_to_be_regenerated
+
+  bazel build @artifact_with_plus//:ch_epfl_scala_compiler_interface >> "$TEST_LOG" 2>&1
+  rm -f *artifact_with_plus_install.json
+
+  expect_log "Successfully pinned resolved artifacts"
+}
+
+function test_unpinned_found_artifact_with_plus_through_pin_and_build() {
+  # Force the repo rule to be evaluated again. Without this, the "assuming maven local..." message will not be printed
+  bazel clean --expunge >/dev/null 2>&1
+
+  bazel run @unpinned_artifact_with_plus_repin//:pin >> "$TEST_LOG" 2>&1
+
+  force_bzlmod_lock_file_to_be_regenerated
+
+  bazel build @artifact_with_plus_repin//:ch_epfl_scala_compiler_interface >> "$TEST_LOG" 2>&1
 
-  expect_not_log "Found duplicate artifact versions"
-  expect_not_log "com.fasterxml.jackson.core:jackson-annotations has multiple versions"
-  expect_not_log "com.github.jnr:jffi:native has multiple versions"
   expect_log "Successfully pinned resolved artifacts"
 }
 
@@ -223,6 +247,8 @@ TESTS=(
   "test_m2local_testing_found_local_artifact_after_build_copy"
   "test_m2local_testing_ignore_empty_files"
   "test_unpinned_m2local_testing_ignore_empty_files"
+  "test_found_artifact_with_plus_through_pin_and_build"
+  "test_unpinned_found_artifact_with_plus_through_pin_and_build"
   "test_v1_lock_file_format"
   "test_dependency_pom_exclusion"
 )
@@ -243,6 +269,11 @@ function run_tests() {
 function expect_not_in_file() {
   local pattern=$1
   local file=$2
+  if [ ! -f $file ]; then
+    printf "NOT FOUND: $file (most probably wrong test configuration)\n"
+    return 1
+  fi
+
   local message=${3:-Expected not to find regexp \""$pattern"\", but it was found}
   grep -sq -- "$pattern" $file || return 0
 

tests/custom_maven_install/BUILD

@@ -4,4 +4,5 @@ exports_files([
     "policy_pinned_testing_install.json",
     "regression_testing_install.json",
     "m2local_testing_with_pinned_file_install.json",
+    "artifact_with_plus_repin_install.json",
 ])

tests/custom_maven_install/artifact_with_plus_repin_install.json

@@ -0,0 +1,54 @@
+{
+  "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
+  "__INPUT_ARTIFACTS_HASH": -1776930339,
+  "__RESOLVED_ARTIFACTS_HASH": 1980085895,
+  "artifacts": {
+    "ch.epfl.scala:compiler-interface": {
+      "shasums": {
+        "jar": "d27afc405d935ba055d10f2c8aa2b884e5a090961bc9d1b0af596b3b547238e5"
+      },
+      "version": "1.3.0-M4+47-d881fa2f"
+    },
+    "com.google.protobuf:protobuf-java": {
+      "shasums": {
+        "jar": "dc7f93e3a3dc2c11be5ba9672af3e26410f0a3289312dbf2260d4d8a0c711a51"
+      },
+      "version": "3.7.0"
+    },
+    "org.scala-sbt:util-interface": {
+      "shasums": {
+        "jar": "adb18e5f79a028f2b33506ccc6a4b24500dd985628b05308a7af5acbd1ee2cd7"
+      },
+      "version": "1.2.2"
+    }
+  },
+  "dependencies": {
+    "ch.epfl.scala:compiler-interface": [
+      "com.google.protobuf:protobuf-java",
+      "org.scala-sbt:util-interface"
+    ]
+  },
+  "packages": {
+    "ch.epfl.scala:compiler-interface": [
+      "xsbti",
+      "xsbti.api",
+      "xsbti.compile",
+      "xsbti.compile.analysis"
+    ],
+    "com.google.protobuf:protobuf-java": [
+      "com.google.protobuf",
+      "com.google.protobuf.compiler"
+    ],
+    "org.scala-sbt:util-interface": [
+      "xsbti"
+    ]
+  },
+  "repositories": {
+    "https://repo1.maven.org/maven2/": [
+      "ch.epfl.scala:compiler-interface",
+      "com.google.protobuf:protobuf-java",
+      "org.scala-sbt:util-interface"
+    ]
+  },
+  "version": "2"
+}