diff options
author | 2018-01-30 11:04:53 -0800 | |
---|---|---|
committer | 2018-01-30 11:06:58 -0800 | |
commit | be55e1181fd49ef78c24255f66f8d26882730af1 (patch) | |
tree | 606dadfa48c2f3b0065da45d20c382f8ddc1f590 /src/test/java | |
parent | 34c9b65a873dd9b79bafe3202571e6de81af1b50 (diff) |
Rename Transition to ConfigurationTransition.
PiperOrigin-RevId: 183859414
Diffstat (limited to 'src/test/java')
2 files changed, 11 insertions, 10 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/ConfigurationFragmentPolicyTest.java b/src/test/java/com/google/devtools/build/lib/packages/ConfigurationFragmentPolicyTest.java index 7324889e46..18857c7306 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/ConfigurationFragmentPolicyTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/ConfigurationFragmentPolicyTest.java @@ -16,8 +16,8 @@ package com.google.devtools.build.lib.packages; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableSet; +import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; -import com.google.devtools.build.lib.analysis.config.transitions.Transition; import com.google.devtools.build.lib.packages.ConfigurationFragmentPolicy.MissingFragmentPolicy; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import org.junit.Test; @@ -71,12 +71,13 @@ public final class ConfigurationFragmentPolicyTest { .containsExactly(Integer.class, String.class, Long.class); } - private static final Transition TEST_HOST_TRANSITION = new Transition() { - @Override - public boolean isHostTransition() { - return true; - } - }; + private static final ConfigurationTransition TEST_HOST_TRANSITION = + new ConfigurationTransition() { + @Override + public boolean isHostTransition() { + return true; + } + }; @Test public void testRequiresConfigurationFragments_RequiredAndLegalForSpecifiedConfiguration() diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java index b9ece45acd..9424090c53 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java @@ -30,9 +30,9 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.ConfigurationResolver; import com.google.devtools.build.lib.analysis.config.TransitionResolver; +import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition; import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition; import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; -import com.google.devtools.build.lib.analysis.config.transitions.Transition; import com.google.devtools.build.lib.analysis.test.TestConfiguration; import com.google.devtools.build.lib.analysis.util.MockRule; import com.google.devtools.build.lib.analysis.util.MockRuleDefaults; @@ -147,7 +147,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest private static class SetsTestFilterFromAttributeTransitionFactory implements RuleTransitionFactory { @Override - public Transition buildTransitionFor(Rule rule) { + public ConfigurationTransition buildTransitionFor(Rule rule) { NonconfigurableAttributeMapper attributes = NonconfigurableAttributeMapper.of(rule); String value = attributes.get("sets_test_filter_to", STRING); if (Strings.isNullOrEmpty(value)) { @@ -381,7 +381,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest * Returns the value of {@link TestConfiguration.TestOptions#testFilter} for a transition * applied over the target configuration. */ - private List<String> getTestFilterOptionValue(Transition transition) + private List<String> getTestFilterOptionValue(ConfigurationTransition transition) throws Exception { ImmutableList.Builder<String> outValues = ImmutableList.builder(); for (BuildOptions toOptions : ConfigurationResolver.applyTransition( |