Skip to content

Commit c62ee1b

Browse files
committed
Attempt to use a regular bazel_dep in tests
1 parent cd2578b commit c62ee1b

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

src/test/java/com/google/devtools/build/lib/starlark/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ java_test(
8282
"//src/test/java/com/google/devtools/build/lib/actions/util",
8383
"//src/test/java/com/google/devtools/build/lib/analysis/testing",
8484
"//src/test/java/com/google/devtools/build/lib/analysis/util",
85+
"//src/test/java/com/google/devtools/build/lib/bazel/bzlmod:util",
8586
"//src/test/java/com/google/devtools/build/lib/exec/util",
8687
"//src/test/java/com/google/devtools/build/lib/rules/python:PythonTestUtils",
8788
"//src/test/java/com/google/devtools/build/lib/starlark/util",

src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import static com.google.common.truth.Truth.assertThat;
1818
import static com.google.common.truth.Truth.assertWithMessage;
19+
import static com.google.devtools.build.lib.bazel.bzlmod.BzlmodTestUtil.createModuleKey;
1920
import static org.junit.Assert.assertThrows;
2021
import static org.junit.Assert.fail;
2122

@@ -2634,18 +2635,19 @@ public void testArgsCanonicalRepoLabel() throws Exception {
26342635

26352636
@Test
26362637
public void testArgsApparentRepoLabel() throws Exception {
2637-
scratch.file("MODULE.bazel");
2638+
scratch.overwriteFile("MODULE.bazel", "bazel_dep(name = 'foo', version = '1.0')");
2639+
registry.addModule(createModuleKey("foo", "1.0"), "module(name='foo', version='1.0')");
2640+
26382641
StarlarkRuleContext ruleContext = createRuleContext("//foo:foo");
26392642
setRuleContext(ruleContext);
26402643
ev.exec(
26412644
"actions = ruleContext.actions",
26422645
"a = []",
2643-
// bazel_tools is a well-known Bazel module whose canonical repo name is bazel_tools.
2644-
"a.append(actions.args().add(Label('@bazel_tools')))",
2645-
"a.append(actions.args().add('-flag', Label('@@bazel_tools//:foo')))",
2646-
"a.append(actions.args().add('-flag', Label('@@bazel_tools//:foo'), format = '_%s_'))",
2647-
"a.append(actions.args().add_all(['foo', Label('@@bazel_tools//:foo')]))",
2648-
"a.append(actions.args().add_all(depset([Label('@@repo~//:foo'), Label('@@bazel_tools//:foo')])))",
2646+
"a.append(actions.args().add(Label('@foo')))",
2647+
"a.append(actions.args().add('-flag', Label('@@foo~//:foo')))",
2648+
"a.append(actions.args().add('-flag', Label('@@foo~//:foo'), format = '_%s_'))",
2649+
"a.append(actions.args().add_all(['foo', Label('@@foo~//:foo')]))",
2650+
"a.append(actions.args().add_all(depset([Label('@@repo~//:foo'), Label('@@foo~//:foo')])))",
26492651
"ruleContext.actions.run(",
26502652
" inputs = depset(ruleContext.files.srcs),",
26512653
" outputs = ruleContext.files.srcs,",
@@ -2660,15 +2662,15 @@ public void testArgsApparentRepoLabel() throws Exception {
26602662
assertThat(action.getArguments())
26612663
.containsExactly(
26622664
"foo/t.exe",
2663-
"@bazel_tools//:bazel_tools",
2665+
"@foo//:foo",
26642666
"-flag",
2665-
"@bazel_tools//:foo",
2667+
"@foo//:foo",
26662668
"-flag",
2667-
"_@bazel_tools//:foo_",
2669+
"_@foo//:foo_",
26682670
"foo",
2669-
"@bazel_tools//:foo",
2671+
"@foo//:foo",
26702672
"@@repo~//:foo",
2671-
"@bazel_tools//:foo")
2673+
"@foo//:foo")
26722674
.inOrder();
26732675
}
26742676

0 commit comments

Comments
 (0)