diff options
author | gregce <gregce@google.com> | 2018-01-30 06:57:42 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-30 06:59:52 -0800 |
commit | c13c91dc350c0061ef0fc401febc8459396264ef (patch) | |
tree | 62d64a658b93cc9bac0a577cf11b646b84a1aa09 /src/test/java/com/google/devtools/build/lib/analysis | |
parent | ad835fb69aab2af390dfcd699c26ed3aeca1cd50 (diff) |
Remove DynamicTransitionMapper, ConfigurationTransitionProxy.
PiperOrigin-RevId: 183826311
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java index fc44c70cbd..419f042ce4 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java @@ -59,9 +59,7 @@ public class DependencyResolverTest extends AnalysisTestCase { @Before public final void createResolver() throws Exception { - dependencyResolver = - new DependencyResolver(ruleClassProvider.getDynamicTransitionMapper()) { - + dependencyResolver = new DependencyResolver() { @Override protected void invalidVisibilityReferenceHook(TargetAndConfiguration node, Label label) { throw new IllegalStateException(); 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 6059bc7165..38738a2899 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 @@ -78,7 +78,6 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; import com.google.devtools.build.lib.analysis.config.transitions.NullTransition; import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition; -import com.google.devtools.build.lib.analysis.config.transitions.Transition; import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.extra.ExtraAction; @@ -1508,16 +1507,14 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * Returns the configuration created by applying the given transition to the source configuration. */ protected BuildConfiguration getConfiguration(BuildConfiguration fromConfig, - Transition transition) throws InterruptedException { + PatchTransition transition) throws InterruptedException { if (transition == NoTransition.INSTANCE) { return fromConfig; } else if (transition == NullTransition.INSTANCE) { return null; } else { - PatchTransition patchTransition = - (PatchTransition) ruleClassProvider.getDynamicTransitionMapper().map(transition); - return skyframeExecutor.getConfigurationForTesting(reporter, fromConfig.fragmentClasses(), - patchTransition.apply(fromConfig.getOptions())); + return skyframeExecutor.getConfigurationForTesting( + reporter, fromConfig.fragmentClasses(), transition.apply(fromConfig.getOptions())); } } |