commit 0df4d14dda2a56ece01533c424608d9dcd3d5b1b
author pcloudy <pcloudy@google.com> Wed Sep 01 01:58:07 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 01 01:59:33 2021 -0700
tree 26a67f372f4e775582bde4b83b9b583d228d68fa
parent 0b77360b54496de916bfe36ae8e97af1804ea9ea

bzlmod: Refactor repository mapping with a new class

To support strict repository dependency in Bzlmod, we need to distinguish repo mapping behaviour between repos generated from Bzlmod and WORKSPACE, therefore we have to refactor the repo mapping from a ImmutableMap to the RepositoryMapping class.

Working towards: https://github.com/bazelbuild/bazel/issues/13793
Related: https://github.com/bazelbuild/bazel/issues/13316

RELNOTES: None
PiperOrigin-RevId: 394180770

src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
index 2e92de0..fdf64e6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
@@ -18,6 +18,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.LocationExpander.LocationFunction;
+import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import java.util.ArrayList;
 import java.util.List;
@@ -73,7 +74,7 @@
         ImmutableMap.<String, LocationFunction>of(
             "location", f1,
             "locations", f2),
-        ImmutableMap.of());
+        RepositoryMapping.ALWAYS_FALLBACK);
   }
 
   private String expand(String input) throws Exception {
@@ -133,10 +134,11 @@
         RepositoryName.create("@foo"),
         RepositoryName.create("@bar"));
 
-    LocationExpander locationExpander = new LocationExpander(
-        new Capture(),
-        ImmutableMap.<String, LocationFunction>of("location", f1),
-        repositoryMapping);
+    LocationExpander locationExpander =
+        new LocationExpander(
+            new Capture(),
+            ImmutableMap.<String, LocationFunction>of("location", f1),
+            RepositoryMapping.createAllowingFallback(repositoryMapping));
 
     String value = locationExpander.expand("$(location @foo//a)");
     assertThat(value).isEqualTo("src/a");