diff options
author | mjhalupka <mjhalupka@google.com> | 2018-02-07 12:22:17 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-07 12:24:35 -0800 |
commit | 2fff952bbccc4c8436223314e3636fdd05e2073d (patch) | |
tree | bf1fdf3b8089148f2c9ffb6e0c4fc0c88f71b2a8 /src/test/java/com/google/devtools/build/lib/skylark | |
parent | e40603fecbc13380dd9648cf3bf1e31f6ce74c0f (diff) |
Refactor to get rid of some getConfiguredTarget() calls in tests and replace
them with getConfiguredTargetAndTarget() so we can get rid of
ConfiguredTarget.getTarget() callers. This should be a test only change.
PiperOrigin-RevId: 184877255
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skylark')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java | 3 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java | 21 |
2 files changed, 14 insertions, 10 deletions
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 40500e66b6..6f8e3843b0 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 @@ -39,6 +39,7 @@ import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.Provider; import com.google.devtools.build.lib.packages.SkylarkProvider; import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; import com.google.devtools.build.lib.skyframe.PackageFunction; import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.skyframe.SkylarkImportLookupFunction; @@ -107,7 +108,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { } private AttributeContainer getContainerForTarget(String targetName) throws Exception { - ConfiguredTarget target = getConfiguredTarget("//test/skylark:" + targetName); + ConfiguredTargetAndTarget target = getConfiguredTargetAndTarget("//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 bc6a903e13..61dd892ff6 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 @@ -20,6 +20,7 @@ import static com.google.devtools.build.lib.packages.Attribute.attr; import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; import static org.junit.Assert.fail; +import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; @@ -1401,7 +1402,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { invalidatePackages(/*alsoConfigs=*/false); // Repository shuffling messes with toolchain labels. assertThat( (List<Label>) - getConfiguredTarget("@foo//:baz") + getConfiguredTargetAndTarget("@foo//:baz") .getTarget() .getAssociatedRule() .getAttributeContainer() @@ -2035,10 +2036,11 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { } catch (AssertionError e) { assertThat(e) .hasMessageThat() - .contains("cannot access field or method '" - + attribute.split("\\(")[0] - + "' of rule context for '//test:dep' outside of its own rule implementation " - + "function"); + .contains( + "cannot access field or method '" + + Iterables.get(Splitter.on('(').split(attribute), 0) + + "' of rule context for '//test:dep' outside of its own rule implementation " + + "function"); } } } @@ -2083,10 +2085,11 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { } catch (AssertionError e) { assertThat(e) .hasMessageThat() - .contains("cannot access field or method '" - + attribute.split("\\(")[0] - + "' of rule context for '//test:dep' outside of its own rule implementation " - + "function"); + .contains( + "cannot access field or method '" + + Iterables.get(Splitter.on('(').split(attribute), 0) + + "' of rule context for '//test:dep' outside of its own rule implementation " + + "function"); } } } |