Update integration tests to pass providers instead of configured targets
in preparation for https://github.com/bazelbuild/bazel/issues/7186
PiperOrigin-RevId: 234608164
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
index a78cd61..acb9d719 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
@@ -789,8 +789,12 @@
" exports = dp_exports,",
" jdeps = ctx.file.jdeps,",
useIJar || sourceFiles ? " actions = ctx.actions," : "",
- useIJar || sourceFiles ? " java_toolchain = ctx.attr._toolchain," : "",
- sourceFiles ? " host_javabase = ctx.attr._host_javabase," : "",
+ useIJar || sourceFiles
+ ? " java_toolchain = ctx.attr._toolchain[java_common.JavaToolchainInfo],"
+ : "",
+ sourceFiles
+ ? " host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo],"
+ : "",
" )",
" return [result(property = javaInfo)]"
};
@@ -804,7 +808,7 @@
" compile_jar = java_common.run_ijar(",
" ctx.actions,",
" jar = ctx.outputs.output_jar,",
- " java_toolchain = ctx.attr._toolchain,",
+ " java_toolchain = ctx.attr._toolchain[java_common.JavaToolchainInfo],",
" )");
} else if (stampJar) {
lines.add(
@@ -812,7 +816,7 @@
" ctx.actions,",
" jar = ctx.outputs.output_jar,",
" target_label = ctx.label,",
- " java_toolchain = ctx.attr._toolchain,",
+ " java_toolchain = ctx.attr._toolchain[java_common.JavaToolchainInfo],",
" )");
} else {
lines.add(" compile_jar = ctx.outputs.output_jar");
@@ -824,8 +828,8 @@
" output_jar = ctx.outputs.output_jar,",
" sources = ctx.files.sources,",
" source_jars = ctx.files.source_jars,",
- " java_toolchain = ctx.attr._toolchain,",
- " host_javabase = ctx.attr._host_javabase,",
+ " java_toolchain = ctx.attr._toolchain[java_common.JavaToolchainInfo],",
+ " host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo],",
")");
} else {
lines.add(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index 185c58a..5304554 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -807,8 +807,8 @@
" ctx,",
" output = output_jar,",
" exported_plugins = [p[JavaInfo] for p in ctx.attr.exported_plugins],",
- " java_toolchain = ctx.attr._java_toolchain,",
- " host_javabase = ctx.attr._host_javabase",
+ " java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo],",
+ " host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo]",
" )",
" return [DefaultInfo(files=depset([output_jar])), compilation_provider]",
"java_custom_library = rule(",
@@ -2332,7 +2332,7 @@
"def _impl(ctx):",
" return struct(",
" javac_opts = java_common.default_javac_opts(",
- " ctx, java_toolchain_attr = '_java_toolchain')",
+ " java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo])",
" )",
"get_javac_opts = rule(",
" _impl,",
