diff options
| author |  cparsons <cparsons@google.com> | 2017-10-11 00:14:19 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-10-11 10:57:39 +0200 |
| commit | 78927792c77a6468607e215034c22b0641553f77 (patch) | |
| tree | 697c57e08b9c705ac26ab322b0ffdce82fd0e162 /src/test/java/com/google/devtools/build/lib/rules/config | |
| parent | a3868a40224ac639bd37fe7c874772cf72f6451a (diff) | |
Refactor ConfiguredAttributeMapper to lib/packages from lib/analysis.
This requires moving the convenience constructor using RuleConfiguredTarget to be owned by RuleConfiguredTarget.
This refactoring is required by later work to allow SplitTransitionProvider to use configurable attributes. This would require packages/Attribute.java -> analysis/ConfiguredAttributeMapper.java, where in general, the 'analysis' package depends on the 'packages' package. This is the easiest way to prevent a circular dependency.
RELNOTES: None.
PiperOrigin-RevId: 171741620
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/config')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 ccdeb2d17b..9629bbd54e 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 @@ -19,11 +19,11 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.testing.EqualsTester; -import com.google.devtools.build.lib.analysis.ConfiguredAttributeMapper; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper; import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; @@ -114,8 +114,8 @@ public final class ConfigFeatureFlagTest extends SkylarkTestCase { " '//conditions:default': 'error'", " }))"); - ConfiguredAttributeMapper attributeMapper = ConfiguredAttributeMapper.of( - (RuleConfiguredTarget) getConfiguredTarget("//test:gen")); + ConfiguredAttributeMapper attributeMapper = + ((RuleConfiguredTarget) getConfiguredTarget("//test:gen")).getAttributeMapper(); assertThat(attributeMapper.get("cmd", Type.STRING)).isEqualTo("hello"); } |