diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
6 files changed, 9 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java index 17588a6504..d9cd78d682 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java @@ -240,7 +240,7 @@ public class SpawnActionTemplateTest { assertThat(expandedActions).hasSize(3); for (int i = 0; i < expandedActions.size(); ++i) { - assertThat(expandedActions.get(i).getEnvironment()).containsExactly("env", "value"); + assertThat(expandedActions.get(i).getIncompleteEnvironmentForTesting()).containsExactly("env", "value"); assertThat(expandedActions.get(i).getExecutionInfo()).containsExactly("local", ""); } } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java index 2fdc15f929..017cc1f003 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java @@ -489,7 +489,7 @@ public class SpawnActionTest extends BuildViewTestCase { assertThat(spawnInfo.getInputFileList()).containsExactlyElementsIn(inputPaths); assertThat(spawnInfo.getOutputFileList()).containsExactlyElementsIn(outputPaths); - Map<String, String> environment = action.getEnvironment(); + Map<String, String> environment = action.getIncompleteEnvironmentForTesting(); assertThat(spawnInfo.getVariableCount()).isEqualTo(environment.size()); for (EnvironmentVariable variable : spawnInfo.getVariableList()) { diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 8aaefcc460..fda3b53507 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -281,7 +281,7 @@ public class CppLinkActionTest extends BuildViewTestCase { ImmutableList.<LibraryToLink>of(), featureConfiguration) .build(); - assertThat(linkAction.getEnvironment()).containsEntry("foo", "bar"); + assertThat(linkAction.getIncompleteEnvironmentForTesting()).containsEntry("foo", "bar"); } private enum NonStaticAttributes { diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java index 895a4d9861..2880f76d93 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java @@ -1766,7 +1766,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { ActionsTestUtil.getFirstArtifactEndingWith(cppLibLinkAction.getInputs(), ".o"); CppCompileAction action = (CppCompileAction) getGeneratingAction(cppLibArtifact); - assertAppleSdkVersionEnv(action.getEnvironment()); + assertAppleSdkVersionEnv(action.getIncompleteEnvironmentForTesting()); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 4b72583b21..0783ad2cf3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -396,16 +396,16 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { } protected void assertAppleSdkVersionEnv(CommandAction action, String versionString) { - assertThat(action.getEnvironment()) + assertThat(action.getIncompleteEnvironmentForTesting()) .containsEntry("APPLE_SDK_VERSION_OVERRIDE", versionString); } protected void assertAppleSdkPlatformEnv(CommandAction action, String platformName) { - assertThat(action.getEnvironment()).containsEntry("APPLE_SDK_PLATFORM", platformName); + assertThat(action.getIncompleteEnvironmentForTesting()).containsEntry("APPLE_SDK_PLATFORM", platformName); } protected void assertXcodeVersionEnv(CommandAction action, String versionNumber) { - assertThat(action.getEnvironment()).containsEntry("XCODE_VERSION_OVERRIDE", versionNumber); + assertThat(action.getIncompleteEnvironmentForTesting()).containsEntry("XCODE_VERSION_OVERRIDE", versionNumber); } protected ObjcProvider providerForTarget(String label) throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java index a414b32649..2aad0eb709 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java @@ -258,7 +258,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { action.getArguments(), "-c", "dummy_command", "", "--a", "--b"); assertThat(action.getMnemonic()).isEqualTo("DummyMnemonic"); assertThat(action.getProgressMessage()).isEqualTo("dummy_message"); - assertThat(action.getEnvironment()).isEqualTo(targetConfig.getLocalShellEnvironment()); + assertThat(action.getIncompleteEnvironmentForTesting()).isEqualTo(targetConfig.getLocalShellEnvironment()); } @Test @@ -350,7 +350,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { (SpawnAction) Iterables.getOnlyElement( ruleContext.getRuleContext().getAnalysisEnvironment().getRegisteredActions()); - assertThat(action.getEnvironment()).containsExactly("a", "b"); + assertThat(action.getIncompleteEnvironmentForTesting()).containsExactly("a", "b"); // We expect "timeout" to be filtered by TargetUtils. assertThat(action.getExecutionInfo()).containsExactly("block-network", "foo"); } |