diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
20 files changed, 106 insertions, 72 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapperTest.java index 872fe99585..bf0860fd3e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapperTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapperTest.java @@ -43,7 +43,7 @@ public class AspectAwareAttributeMapperTest extends BuildViewTestCase { @Before public final void createMapper() throws Exception { ConfiguredTargetAndData ctad = - scratchConfiguredTargetAndTarget( + scratchConfiguredTargetAndData( "foo", "myrule", "cc_binary(", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index 8ffa3cea0d..3ad68c02d7 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -151,16 +151,15 @@ public class BuildViewTest extends BuildViewTestBase { public void testGeneratedArtifact() throws Exception { setupDummyRule(); update("//pkg:a.out"); - OutputFileConfiguredTarget output = - (OutputFileConfiguredTarget) getConfiguredTarget("//pkg:a.out"); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData("//pkg:a.out"); + OutputFileConfiguredTarget output = (OutputFileConfiguredTarget) ctad.getConfiguredTarget(); Artifact outputArtifact = output.getArtifact(); assertThat(outputArtifact.getRoot()) .isEqualTo( - output - .getConfiguration() + ctad.getConfiguration() .getBinDirectory(output.getLabel().getPackageIdentifier().getRepository())); assertThat(outputArtifact.getExecPath()) - .isEqualTo(output.getConfiguration().getBinFragment().getRelative("pkg/a.out")); + .isEqualTo(ctad.getConfiguration().getBinFragment().getRelative("pkg/a.out")); assertThat(outputArtifact.getRootRelativePath()).isEqualTo(PathFragment.create("pkg/a.out")); Action action = getGeneratingAction(outputArtifact); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/CompilationHelperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/CompilationHelperTest.java index 23f23bee41..44a4b561c5 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/CompilationHelperTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/CompilationHelperTest.java @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.analysis.util.AnalysisTestUtil; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.cpp.CppHelper; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import java.io.IOException; import java.util.List; import org.junit.Before; @@ -59,9 +60,9 @@ public class CompilationHelperTest extends BuildViewTestCase { configuration); } - private List<Artifact> getAggregatingMiddleman(ConfiguredTarget rule, boolean withSolib) + private List<Artifact> getAggregatingMiddleman(ConfiguredTargetAndData rule, boolean withSolib) throws Exception { - return getAggregatingMiddleman(rule, rule.getConfiguration(), withSolib); + return getAggregatingMiddleman(rule.getConfiguredTarget(), rule.getConfiguration(), withSolib); } /** @@ -71,8 +72,9 @@ public class CompilationHelperTest extends BuildViewTestCase { */ @Test public void testDuplicateCallsReturnSameObject() throws Exception { - ConfiguredTarget rule = - scratchConfiguredTarget("package", "a", "cc_binary(name = 'a'," + " srcs = ['a.cc'])"); + ConfiguredTargetAndData rule = + scratchConfiguredTargetAndData( + "package", "a", "cc_binary(name = 'a'," + " srcs = ['a.cc'])"); List<Artifact> middleman1 = getAggregatingMiddleman(rule, false); assertThat(middleman1).hasSize(1); List<Artifact> middleman2 = getAggregatingMiddleman(rule, false); @@ -88,8 +90,9 @@ public class CompilationHelperTest extends BuildViewTestCase { */ @Test public void testMiddlemanAndSolibMiddlemanAreDistinct() throws Exception { - ConfiguredTarget rule = scratchConfiguredTarget("package", "liba.so", - "cc_binary(name = 'liba.so', srcs = ['a.cc'], linkshared = 1)"); + ConfiguredTargetAndData rule = + scratchConfiguredTargetAndData( + "package", "liba.so", "cc_binary(name = 'liba.so', srcs = ['a.cc'], linkshared = 1)"); List<Artifact> middleman = getAggregatingMiddleman(rule, false); assertThat(middleman).hasSize(1); @@ -109,10 +112,10 @@ public class CompilationHelperTest extends BuildViewTestCase { // Equivalent cc / Python configurations: - ConfiguredTarget ccRuleA = getConfiguredTarget("//foo:liba.so"); + ConfiguredTargetAndData ccRuleA = getConfiguredTargetAndData("//foo:liba.so"); List<Artifact> middleman1 = getAggregatingMiddleman(ccRuleA, true); try { - ConfiguredTarget ccRuleB = getConfiguredTarget("//foo:libb.so"); + ConfiguredTargetAndData ccRuleB = getConfiguredTargetAndData("//foo:libb.so"); getAggregatingMiddleman(ccRuleB, true); analysisEnvironment.registerWith(getMutableActionGraph()); fail("Expected ActionConflictException due to same middleman artifact with different files"); @@ -124,9 +127,9 @@ public class CompilationHelperTest extends BuildViewTestCase { // This should succeed because the py_binary's middleman is under the Python configuration's // internal directory, while the cc_binary's middleman is under the cc config's directory, // and both configurations are the same. - ConfiguredTarget pyRuleB = getDirectPrerequisite( - getConfiguredTarget("//foo:c"), "//foo:libb.so"); - + ConfiguredTargetAndData pyRuleB = + getConfiguredTargetAndDataDirectPrerequisite( + getConfiguredTargetAndData("//foo:c"), "//foo:libb.so"); List<Artifact> middleman2 = getAggregatingMiddleman(pyRuleB, true); assertThat(Iterables.getOnlyElement(middleman2).getExecPathString()) @@ -144,10 +147,10 @@ public class CompilationHelperTest extends BuildViewTestCase { // Equivalent cc / Java configurations: - ConfiguredTarget ccRuleA = getConfiguredTarget("//foo:liba.so"); + ConfiguredTargetAndData ccRuleA = getConfiguredTargetAndData("//foo:liba.so"); List<Artifact> middleman1 = getAggregatingMiddleman(ccRuleA, true); try { - ConfiguredTarget ccRuleB = getConfiguredTarget("//foo:libb.so"); + ConfiguredTargetAndData ccRuleB = getConfiguredTargetAndData("//foo:libb.so"); getAggregatingMiddleman(ccRuleB, true); analysisEnvironment.registerWith(getMutableActionGraph()); fail("Expected ActionConflictException due to same middleman artifact with different files"); @@ -158,8 +161,9 @@ public class CompilationHelperTest extends BuildViewTestCase { // This should succeed because the java_binary's middleman is under the Java configuration's // internal directory, while the cc_binary's middleman is under the cc config's directory. - ConfiguredTarget javaRuleB = getDirectPrerequisite( - getConfiguredTarget("//foo:d"), "//foo:libb.so"); + ConfiguredTargetAndData javaRuleB = + getConfiguredTargetAndDataDirectPrerequisite( + getConfiguredTargetAndData("//foo:d"), "//foo:libb.so"); List<Artifact> middleman2 = getAggregatingMiddleman(javaRuleB, false); assertThat( Iterables.getOnlyElement(middleman1) diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java index a616efceb9..18f4c9303d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java @@ -448,13 +448,13 @@ public class ConfigurableAttributesTest extends BuildViewTestCase { // Configuration a: useConfiguration("--test_arg=a"); - ConfiguredTargetAndData binary = getConfiguredTargetAndTarget("//test:the_rule"); + ConfiguredTargetAndData binary = getConfiguredTargetAndData("//test:the_rule"); AttributeMap attributes = getMapperFromConfiguredTargetAndTarget(binary); assertThat(attributes.get("$computed_attr", Type.STRING)).isEqualTo("a2"); // configuration b: useConfiguration("--test_arg=b"); - binary = getConfiguredTargetAndTarget("//test:the_rule"); + binary = getConfiguredTargetAndData("//test:the_rule"); attributes = getMapperFromConfiguredTargetAndTarget(binary); assertThat(attributes.get("$computed_attr", Type.STRING)).isEqualTo("b2"); } @@ -1094,7 +1094,7 @@ public class ConfigurableAttributesTest extends BuildViewTestCase { " }))"); useConfiguration("--test_arg=a"); - ConfiguredTargetAndData ctad = getConfiguredTargetAndTarget("//srctest:gen"); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData("//srctest:gen"); AttributeMap attributes = getMapperFromConfiguredTargetAndTarget(ctad); assertThat(attributes.get("srcs", BuildType.LABEL_LIST)).isEmpty(); } @@ -1113,7 +1113,7 @@ public class ConfigurableAttributesTest extends BuildViewTestCase { " boolean_attr = 1)"); useConfiguration("--test_arg=a"); - ConfiguredTargetAndData ctad = getConfiguredTargetAndTarget("//foo:rule"); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData("//foo:rule"); AttributeMap attributes = getMapperFromConfiguredTargetAndTarget(ctad); assertThat(attributes.get("dep", BuildType.LABEL)).isEqualTo( Label.parseAbsolute("//foo:default")); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java index 10f01718d1..237b1f0c6c 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapperTest.java @@ -46,7 +46,7 @@ public class ConfiguredAttributeMapperTest extends BuildViewTestCase { * Returns a ConfiguredAttributeMapper bound to the given rule with the target configuration. */ private ConfiguredAttributeMapper getMapper(String label) throws Exception { - ConfiguredTargetAndData ctad = getConfiguredTargetAndTarget(label); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData(label); return getMapperFromConfiguredTargetAndTarget(ctad); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java index 5ed9d80166..be97295b71 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/OutputFileConfiguredTargetTest.java @@ -18,8 +18,8 @@ import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestBase; import com.google.devtools.build.lib.skyframe.BuildConfigurationValue; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import com.google.devtools.build.lib.skyframe.SkyframeBuildView; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -101,9 +101,10 @@ public class OutputFileConfiguredTargetTest extends BuildViewTestBase { useConfiguration(); update("//foo:gen3"); - OutputFileConfiguredTarget hostSrc3 = (OutputFileConfiguredTarget) - getConfiguredTarget("//foo:host_src3.cc", getHostConfiguration()); - TransitiveInfoCollection hostGeneratedFileConsumer3 = hostSrc3.getGeneratingRule(); + ConfiguredTargetAndData hostSrc3 = + getConfiguredTargetAndData("//foo:host_src3.cc", getHostConfiguration()); + TransitiveInfoCollection hostGeneratedFileConsumer3 = + ((OutputFileConfiguredTarget) hostSrc3.getConfiguredTarget()).getGeneratingRule(); assertThat(hostSrc3.getConfiguration()) .isEqualTo(hostGeneratedFileConsumer3.getConfiguration()); // TODO(gregce): enable below for Bazel tests, which for some reason realize the same instance diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 2b4cdbb7b0..faf596966b 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -404,7 +404,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { } catch (LabelSyntaxException e) { throw new AssertionError(e); } - return skyframeExecutor.getConfiguredTargetAndTargetForTesting(reporter, parsedLabel, config); + return skyframeExecutor.getConfiguredTargetAndDataForTesting(reporter, parsedLabel, config); } protected Target getTarget(String label) throws InterruptedException { @@ -416,11 +416,23 @@ public abstract class AnalysisTestCase extends FoundationTestCase { } } - protected ConfiguredTarget getConfiguredTarget(String label, BuildConfiguration configuration) { + protected final ConfiguredTargetAndData getConfiguredTargetAndData( + String label, BuildConfiguration configuration) { ensureUpdateWasCalled(); return getConfiguredTargetForSkyframe(label, configuration); } + protected final ConfiguredTargetAndData getConfiguredTargetAndData(String label) + throws InterruptedException { + return getConfiguredTargetAndData(label, getTargetConfiguration()); + } + + protected final ConfiguredTarget getConfiguredTarget( + String label, BuildConfiguration configuration) { + ConfiguredTargetAndData result = getConfiguredTargetAndData(label, configuration); + return result == null ? null : result.getConfiguredTarget(); + } + /** * Returns the corresponding configured target, if it exists. Note that this will only return * anything useful after a call to update() with the same label. @@ -429,15 +441,16 @@ public abstract class AnalysisTestCase extends FoundationTestCase { return getConfiguredTarget(label, getTargetConfiguration()); } - private ConfiguredTarget getConfiguredTargetForSkyframe(String label, - BuildConfiguration configuration) { + private ConfiguredTargetAndData getConfiguredTargetForSkyframe( + String label, BuildConfiguration configuration) { Label parsedLabel; try { parsedLabel = Label.parseAbsolute(label); } catch (LabelSyntaxException e) { throw new AssertionError(e); } - return skyframeExecutor.getConfiguredTargetForTesting(reporter, parsedLabel, configuration); + return skyframeExecutor.getConfiguredTargetAndDataForTesting( + reporter, parsedLabel, configuration); } /** diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index d4684d9a7f..818b717417 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -530,12 +530,18 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * used; instead tests should only assert on properties of the exposed provider instances and / or * the action graph. */ - protected Iterable<ConfiguredTarget> getDirectPrerequisites(ConfiguredTarget target) + protected final Collection<ConfiguredTarget> getDirectPrerequisites(ConfiguredTarget target) throws Exception { return view.getDirectPrerequisitesForTesting(reporter, target, masterConfig); } - protected ConfiguredTarget getDirectPrerequisite(ConfiguredTarget target, String label) + protected final Collection<ConfiguredTargetAndData> getDirectPrerequisites( + ConfiguredTargetAndData ctad) throws Exception { + return view.getConfiguredTargetAndDataDirectPrerequisitesForTesting( + reporter, ctad, masterConfig); + } + + protected final ConfiguredTarget getDirectPrerequisite(ConfiguredTarget target, String label) throws Exception { Label candidateLabel = Label.parseAbsolute(label); for (ConfiguredTarget candidate : getDirectPrerequisites(target)) { @@ -547,6 +553,17 @@ public abstract class BuildViewTestCase extends FoundationTestCase { return null; } + protected final ConfiguredTargetAndData getConfiguredTargetAndDataDirectPrerequisite( + ConfiguredTargetAndData ctad, String label) throws Exception { + Label candidateLabel = Label.parseAbsolute(label); + for (ConfiguredTargetAndData candidate : getDirectPrerequisites(ctad)) { + if (candidate.getConfiguredTarget().getLabel().equals(candidateLabel)) { + return candidate; + } + } + return null; + } + /** * Asserts that two configurations are the same. * @@ -764,9 +781,9 @@ public abstract class BuildViewTestCase extends FoundationTestCase { /** * Returns a ConfiguredTargetAndData for the specified label, using the given build configuration. */ - protected ConfiguredTargetAndData getConfiguredTargetAndTarget( + protected ConfiguredTargetAndData getConfiguredTargetAndData( Label label, BuildConfiguration config) { - return view.getConfiguredTargetAndTargetForTesting(reporter, label, config); + return view.getConfiguredTargetAndDataForTesting(reporter, label, config); } /** @@ -774,9 +791,9 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * target with a top-level configuration transition, that transition is applied to the given * config in the ConfiguredTargetAndData's ConfiguredTarget. */ - public ConfiguredTargetAndData getConfiguredTargetAndTarget(String label) + public ConfiguredTargetAndData getConfiguredTargetAndData(String label) throws LabelSyntaxException { - return getConfiguredTargetAndTarget(Label.parseAbsolute(label), targetConfig); + return getConfiguredTargetAndData(Label.parseAbsolute(label), targetConfig); } /** @@ -854,12 +871,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase { String packageName, String ruleName, BuildConfiguration config, String... lines) throws IOException, Exception { ConfiguredTargetAndData ctad = - scratchConfiguredTargetAndTarget(packageName, ruleName, config, lines); + scratchConfiguredTargetAndData(packageName, ruleName, config, lines); return ctad == null ? null : ctad.getConfiguredTarget(); } /** - * Creates and returns a configured scratch rule and it's target. + * Creates and returns a configured scratch rule and its data. * * @param packageName the package name of the rule. * @param rulename the name of the rule. @@ -867,13 +884,13 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * @return the configured tatarget and target instance for the created rule. * @throws Exception */ - protected ConfiguredTargetAndData scratchConfiguredTargetAndTarget( + protected ConfiguredTargetAndData scratchConfiguredTargetAndData( String packageName, String rulename, String... lines) throws Exception { - return scratchConfiguredTargetAndTarget(packageName, rulename, targetConfig, lines); + return scratchConfiguredTargetAndData(packageName, rulename, targetConfig, lines); } /** - * Creates and returns a configured scratch rule and it's target. + * Creates and returns a configured scratch rule and its data. * * @param packageName the package name of the rule. * @param ruleName the name of the rule. @@ -883,11 +900,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * @throws IOException * @throws Exception */ - protected ConfiguredTargetAndData scratchConfiguredTargetAndTarget( + protected ConfiguredTargetAndData scratchConfiguredTargetAndData( String packageName, String ruleName, BuildConfiguration config, String... lines) throws Exception { Target rule = scratchRule(packageName, ruleName, lines); - return view.getConfiguredTargetAndTargetForTesting(reporter, rule.getLabel(), config); + return view.getConfiguredTargetAndDataForTesting(reporter, rule.getLabel(), config); } /** @@ -1100,11 +1117,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase { /** * Gets a derived Artifact for testing in the subdirectory of the {@link - * BuildConfiguration#getBinDirectory} corresponding to the package of {@code owner}. So - * to specify a file foo/foo.o owned by target //foo:foo, {@code packageRelativePath} should just - * be "foo.o". + * BuildConfiguration#getBinDirectory} corresponding to the package of {@code owner}. So to + * specify a file foo/foo.o owned by target //foo:foo, {@code packageRelativePath} should just be + * "foo.o". */ - protected Artifact getBinArtifact(String packageRelativePath, ConfiguredTarget owner) { + protected final Artifact getBinArtifact(String packageRelativePath, ConfiguredTarget owner) { return getPackageRelativeDerivedArtifact( packageRelativePath, owner.getConfiguration().getBinDirectory(RepositoryName.MAIN), @@ -1599,7 +1616,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected AttributeMap attributes(RuleConfiguredTarget ct) { ConfiguredTargetAndData ctad; try { - ctad = getConfiguredTargetAndTarget(ct.getLabel().toString()); + ctad = getConfiguredTargetAndData(ct.getLabel().toString()); } catch (LabelSyntaxException e) { throw new RuntimeException(e); } diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java index 072ba2e9ac..2b329552df 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java @@ -142,7 +142,7 @@ public class SkylarkRepositoryIntegrationTest extends BuildViewTestCase { .add("repo(name='foo', path='/repo2')") .build()); invalidatePackages(); - ConfiguredTargetAndData target = getConfiguredTargetAndTarget("@foo//:bar"); + ConfiguredTargetAndData target = getConfiguredTargetAndData("@foo//:bar"); Object path = target.getTarget().getAssociatedRule().getAttributeContainer().getAttr("path"); assertThat(path).isEqualTo("foo"); } @@ -170,7 +170,7 @@ public class SkylarkRepositoryIntegrationTest extends BuildViewTestCase { .add("repo(name='foo')") .build()); invalidatePackages(); - ConfiguredTargetAndData target = getConfiguredTargetAndTarget("@foo//:bar"); + ConfiguredTargetAndData target = getConfiguredTargetAndData("@foo//:bar"); Object path = target.getTarget().getAssociatedRule().getAttributeContainer().getAttr("path"); assertThat(path).isEqualTo("foo"); } @@ -199,7 +199,7 @@ public class SkylarkRepositoryIntegrationTest extends BuildViewTestCase { .add("repo(name='foo')") .build()); invalidatePackages(); - ConfiguredTargetAndData target = getConfiguredTargetAndTarget("@foo//:bar"); + ConfiguredTargetAndData target = getConfiguredTargetAndData("@foo//:bar"); Object path = target.getTarget().getAssociatedRule().getAttributeContainer().getAttr("path"); assertThat(path).isEqualTo("foo"); } @@ -229,7 +229,7 @@ public class SkylarkRepositoryIntegrationTest extends BuildViewTestCase { .add("repo(name='foobar')") .build()); invalidatePackages(); - ConfiguredTargetAndData target = getConfiguredTargetAndTarget("@foobar//:bar"); + ConfiguredTargetAndData target = getConfiguredTargetAndData("@foobar//:bar"); Object path = target.getTarget().getAssociatedRule().getAttributeContainer().getAttr("path"); assertThat(path).isEqualTo("foobar"); } diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java index dcdea30d08..232a553d5d 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java @@ -170,7 +170,7 @@ public class AndroidNdkRepositoryTest extends BuildViewTestCase { ")"); invalidatePackages(); - ConfiguredTargetAndData cpufeatures = getConfiguredTargetAndTarget("@androidndk//:cpufeatures"); + ConfiguredTargetAndData cpufeatures = getConfiguredTargetAndData("@androidndk//:cpufeatures"); assertThat(cpufeatures).isNotNull(); AttributeContainer attributes = cpufeatures.getTarget().getAssociatedRule().getAttributeContainer(); diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java index ee1810f724..b1c4e75193 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java @@ -93,7 +93,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { invalidatePackages(); ConfiguredTargetAndData aarImportTarget = - getConfiguredTargetAndTarget("@androidsdk//com.google.android:foo-1.0.0"); + getConfiguredTargetAndData("@androidsdk//com.google.android:foo-1.0.0"); assertThat(aarImportTarget).isNotNull(); assertThat(aarImportTarget.getTarget().getAssociatedRule().getRuleClass()) .isEqualTo("aar_import"); diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/SdkMavenRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/SdkMavenRepositoryTest.java index 8f55fcc34e..7541dc9db2 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/SdkMavenRepositoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/SdkMavenRepositoryTest.java @@ -105,7 +105,7 @@ public class SdkMavenRepositoryTest extends BuildViewTestCase { public void testGeneratedAarImport() throws Exception { sdkMavenRepository.writeBuildFiles(workspaceDir); Rule aarImport = - getConfiguredTargetAndTarget("//com.google.android:bar-1.0.0") + getConfiguredTargetAndData("//com.google.android:bar-1.0.0") .getTarget() .getAssociatedRule(); assertThat(aarImport.getRuleClass()).isEqualTo("aar_import"); @@ -120,7 +120,7 @@ public class SdkMavenRepositoryTest extends BuildViewTestCase { public void testGeneratedJavaImport() throws Exception { sdkMavenRepository.writeBuildFiles(workspaceDir); Rule javaImport = - getConfiguredTargetAndTarget("//com.google.android:foo-1.0.0") + getConfiguredTargetAndData("//com.google.android:foo-1.0.0") .getTarget() .getAssociatedRule(); assertThat(javaImport.getRuleClass()).isEqualTo("java_import"); @@ -134,7 +134,7 @@ public class SdkMavenRepositoryTest extends BuildViewTestCase { public void testGeneratedRuleForInvalidPackaging() throws Exception { sdkMavenRepository.writeBuildFiles(workspaceDir); Rule invalidPackagingGenrule = - getConfiguredTargetAndTarget("//com.google.android:baz-1.0.0") + getConfiguredTargetAndData("//com.google.android:baz-1.0.0") .getTarget() .getAssociatedRule(); assertThat(invalidPackagingGenrule.getRuleClass()).isEqualTo("genrule"); diff --git a/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java b/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java index 26cf80cde9..2dba95fdf6 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java @@ -101,7 +101,7 @@ public class ExternalPackageTest extends BuildViewTestCase { "java_library(name = 'c', srcs = [])"); invalidatePackages(); useConfiguration("--define", "foo=bar"); - ConfiguredTargetAndData ctad = getConfiguredTargetAndTarget("//:a"); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData("//:a"); ConfiguredAttributeMapper configuredAttributeMapper = getMapperFromConfiguredTargetAndTarget(ctad); assertThat(configuredAttributeMapper.get("runtime_deps", BuildType.LABEL_LIST)) diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index 478149674c..e839a35278 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -2016,7 +2016,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { "<resources><string name = 'lib_string'>Libs!</string></resources>"); scratch.file("java/r/android/res/values/strings.xml", "<resources><string name = 'hello'>Hello Android!</string></resources>"); - Artifact jar = getResourceClassJar(getConfiguredTargetAndTarget("//java/r/android:r")); + Artifact jar = getResourceClassJar(getConfiguredTargetAndData("//java/r/android:r")); assertThat(getGeneratingAction(jar).getMnemonic()).isEqualTo("RClassGenerator"); assertThat(getGeneratingSpawnActionArgs(jar)) .containsAllOf("--primaryRTxt", "--primaryManifest", "--library", "--classJarOutput"); @@ -2031,7 +2031,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " )"); scratch.file("java/r/android/res/values/strings.xml", "<resources><string name = 'hello'>Hello Android!</string></resources>"); - Artifact jar = getResourceClassJar(getConfiguredTargetAndTarget("//java/r/android:r")); + Artifact jar = getResourceClassJar(getConfiguredTargetAndData("//java/r/android:r")); assertThat(getGeneratingAction(jar).getMnemonic()).isEqualTo("RClassGenerator"); List<String> args = getGeneratingSpawnActionArgs(jar); assertThat(args).containsAllOf("--primaryRTxt", "--primaryManifest", "--classJarOutput"); @@ -2056,7 +2056,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { "<resources><string name = 'lib_string'>Libs!</string></resources>"); scratch.file("java/r/android/res/values/strings.xml", "<resources><string name = 'hello'>Hello Android!</string></resources>"); - ConfiguredTargetAndData binary = getConfiguredTargetAndTarget("//java/r/android:r"); + ConfiguredTargetAndData binary = getConfiguredTargetAndData("//java/r/android:r"); Artifact jar = getResourceClassJar(binary); assertThat(getGeneratingAction(jar).getMnemonic()).isEqualTo("RClassGenerator"); List<String> args = getGeneratingSpawnActionArgs(jar); diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java index da6d287447..f5358ea72b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java @@ -119,7 +119,7 @@ public class AndroidInstrumentationTestTest extends AndroidBuildViewTestCase { @Test public void testTestExecutableRunfiles() throws Exception { ConfiguredTargetAndData androidInstrumentationTest = - getConfiguredTargetAndTarget("//javatests/com/app/ait"); + getConfiguredTargetAndData("//javatests/com/app/ait"); NestedSet<Artifact> runfiles = androidInstrumentationTest .getConfiguredTarget() diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java index 366522783a..5ef83c87a1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java @@ -805,7 +805,7 @@ public class XcodeConfigTest extends BuildViewTestCase { * Returns a ConfiguredAttributeMapper bound to the given rule with the target configuration. */ private ConfiguredAttributeMapper getMapper(String label) throws Exception { - ConfiguredTargetAndData ctad = getConfiguredTargetAndTarget(label); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData(label); return getMapperFromConfiguredTargetAndTarget(ctad); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java index f9cb224efb..411294abbd 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java @@ -133,7 +133,7 @@ public final class ConfigFeatureFlagTest extends SkylarkTestCase { " '//conditions:default': 'error'", " }))"); - ConfiguredTargetAndData ctad = getConfiguredTargetAndTarget("//test:gen"); + ConfiguredTargetAndData ctad = getConfiguredTargetAndData("//test:gen"); ConfiguredAttributeMapper attributeMapper = getMapperFromConfiguredTargetAndTarget(ctad); assertThat(attributeMapper.get("cmd", Type.STRING)).isEqualTo("hello"); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index c2cef00e5b..6ed2c99103 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -1138,7 +1138,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { // This shared library has the same name as the archive generated by this rule, so it should // override said archive. However, said archive should still be put in files to build. ConfiguredTargetAndData target = - scratchConfiguredTargetAndTarget("a", "b", "cc_library(name = 'b', srcs = ['libb.so'])"); + scratchConfiguredTargetAndData("a", "b", "cc_library(name = 'b', srcs = ['libb.so'])"); if (target.getTarget().getAssociatedRule().getImplicitOutputsFunction() != ImplicitOutputsFunction.NONE) { diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java index 78fd333fae..a76546fd69 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java @@ -108,7 +108,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { } private AttributeContainer getContainerForTarget(String targetName) throws Exception { - ConfiguredTargetAndData target = getConfiguredTargetAndTarget("//test/skylark:" + targetName); + ConfiguredTargetAndData target = getConfiguredTargetAndData("//test/skylark:" + targetName); return target.getTarget().getAssociatedRule().getAttributeContainer(); } diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index cb5a2b5ea8..2e0f7b0bc8 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -1404,7 +1404,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { invalidatePackages(/*alsoConfigs=*/false); // Repository shuffling messes with toolchain labels. assertThat( (List<Label>) - getConfiguredTargetAndTarget("@foo//:baz") + getConfiguredTargetAndData("@foo//:baz") .getTarget() .getAssociatedRule() .getAttributeContainer() |