aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java6
3 files changed, 5 insertions, 5 deletions
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 {