From 18871fbaa591cd322bb61f0c4d00c3e65a85b5b5 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Thu, 22 Aug 2024 12:45:31 +0200
Subject: [PATCH] Fix tests

---
 .../bzlmod/ModuleExtensionResolutionTest.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
index 761270682044cd..340a7fb3184113 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
@@ -1384,8 +1384,8 @@ public void invalidAttributeValue() throws Exception {
         evaluator.evaluate(ImmutableList.of(skyKey), evaluationContext);
     assertThat(result.hasError()).isTrue();
     assertContainsEvent(
-        "ERROR /ws/defs.bzl:3:12: //:+ext+ext: expected value of type 'string' for attribute 'data'"
-            + " of 'data_repo', but got 42 (int)");
+        "ERROR /ws/defs.bzl:3:12: //:_main~ext~ext: expected value of type 'string' for attribute 'data'"
+            + " in 'data_repo' rule, but got 42 (int)");
     assertThat(result.getError().getException())
         .hasMessageThat()
         .isEqualTo("error evaluating module extension ext in //:defs.bzl");
@@ -2976,14 +2976,14 @@ public void innate_invalidAttributeValue() throws Exception {
         "module(name='foo',version='1.0')",
         "data_repo = use_repo_rule('//:repo.bzl', 'data_repo')",
         "data_repo(name='data', data='go to bed at 11pm.')");
-    scratch.file(modulesRoot.getRelative("foo+1.0/WORKSPACE").getPathString());
-    scratch.file(modulesRoot.getRelative("foo+1.0/BUILD").getPathString());
+    scratch.file(modulesRoot.getRelative("foo~v1.0/WORKSPACE").getPathString());
+    scratch.file(modulesRoot.getRelative("foo~v1.0/BUILD").getPathString());
     scratch.file(
-        modulesRoot.getRelative("foo+1.0/data.bzl").getPathString(),
+        modulesRoot.getRelative("foo~v1.0/data.bzl").getPathString(),
         "load('@data//:data.bzl',repo_data='data')",
         "data=repo_data");
     scratch.file(
-        modulesRoot.getRelative("foo+1.0/repo.bzl").getPathString(),
+        modulesRoot.getRelative("foo~v1.0/repo.bzl").getPathString(),
         "def _data_repo_impl(ctx):",
         "  ctx.file('BUILD.bazel')",
         "  ctx.file('data.bzl', 'data='+json.encode(ctx.attr.data))",
@@ -2996,8 +2996,8 @@ public void innate_invalidAttributeValue() throws Exception {
         evaluator.evaluate(ImmutableList.of(skyKey), evaluationContext);
     assertThat(result.hasError()).isTrue();
     assertContainsEvent(
-        "ERROR /ws/MODULE.bazel:3:10: //:+_repo_rules+data: expected value of type 'string' for"
-            + " attribute 'data' of 'data_repo', but got 5 (int)");
+        "ERROR /ws/MODULE.bazel:3:10: //:_main~_repo_rules~data: expected value"
+            + " of type 'string' for attribute 'data' in 'data_repo' rule, but got 5 (int)");
     assertThat(result.getError().getException())
         .hasMessageThat()
         .isEqualTo(