diff options
author | plf <plf@google.com> | 2018-02-21 03:23:11 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-21 03:25:17 -0800 |
commit | 840b3e434866f002421c059226047c524f0dd997 (patch) | |
tree | b8fbd041906c4d0c724ec1874c4c3cbaee98669f /src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | |
parent | 404a670678503db2f9a3baaf89399d687d00a2c7 (diff) |
C++: Renames CppCompilationContext to CcCompilationInfo
This is in preparation for migrating to the new way of specifying providers as described in[]
RELNOTES:none
PiperOrigin-RevId: 186436462
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index 36fcadf028..0504464bc7 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -91,13 +91,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { private CppModuleMapAction getCppModuleMapAction(String label) throws Exception { ConfiguredTarget target = getConfiguredTarget(label); - CppModuleMap cppModuleMap = target.getProvider(CppCompilationContext.class).getCppModuleMap(); + CppModuleMap cppModuleMap = target.getProvider(CcCompilationInfo.class).getCppModuleMap(); return (CppModuleMapAction) getGeneratingAction(cppModuleMap.getArtifact()); } private void assertNoCppModuleMapAction(String label) throws Exception { ConfiguredTarget target = getConfiguredTarget(label); - assertThat(target.getProvider(CppCompilationContext.class).getCppModuleMap()).isNull(); + assertThat(target.getProvider(CcCompilationInfo.class).getCppModuleMap()).isNull(); } @Test @@ -105,7 +105,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { ConfiguredTarget l = scratchConfiguredTarget("a", "l", "cc_library(name='l', srcs=['l.cc'], defines=['V=$(FOO)'], toolchains=[':v'])", "make_variable_tester(name='v', variables={'FOO': 'BAR'})"); - assertThat(l.getProvider(CppCompilationContext.class).getDefines()).contains("V=BAR"); + assertThat(l.getProvider(CcCompilationInfo.class).getDefines()).contains("V=BAR"); } @Test @@ -556,8 +556,8 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { CppCompileAction aObjectAction = (CppCompileAction) getGeneratingAction(aObjectArtifact); assertThat(aObjectAction.getIncludeScannerSources()).containsExactly( getSourceArtifact("module/a.cc")); - assertThat(aObjectAction.getContext().getTransitiveModules(true)).contains( - getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); + assertThat(aObjectAction.getCcCompilationInfo().getTransitiveModules(true)) + .contains(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); assertThat(aObjectAction.getInputs()).contains( getGenfilesArtifactWithNoOwner("module/b.cppmap")); assertNoEvents(); @@ -692,7 +692,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { getConfiguredTarget("//module:j"); Artifact jObjectArtifact = getBinArtifact("_objs/j/module/j.pic.o", "//module:j"); CppCompileAction jObjectAction = (CppCompileAction) getGeneratingAction(jObjectArtifact); - assertThat(getHeaderModules(jObjectAction.getContext().getTransitiveModules(true))) + assertThat(getHeaderModules(jObjectAction.getCcCompilationInfo().getTransitiveModules(true))) .containsExactly( getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"), getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g")); @@ -700,7 +700,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { getSourceArtifact("module/j.cc")); assertThat(jObjectAction.getMainIncludeScannerSource()).isEqualTo( getSourceArtifact("module/j.cc")); - assertThat(getHeaderModules(jObjectAction.getContext().getTransitiveModules(true))) + assertThat(getHeaderModules(jObjectAction.getCcCompilationInfo().getTransitiveModules(true))) .containsExactly( getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"), getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g")); @@ -730,9 +730,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly( getGenfilesArtifact("b.cppmap", "//module:b"), getGenfilesArtifact("c.cppmap", "//nomodule:e")); - assertThat(getHeaderModules(cObjectAction.getContext().getTransitiveModules(true))) + assertThat(getHeaderModules(cObjectAction.getCcCompilationInfo().getTransitiveModules(true))) .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); - + getConfiguredTarget("//nomodule:d"); Artifact dObjectArtifact = getBinArtifact("_objs/d/nomodule/d.pic.o", "//nomodule:d"); CppCompileAction dObjectAction = (CppCompileAction) getGeneratingAction(dObjectArtifact); @@ -740,7 +740,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly( getGenfilesArtifact("c.cppmap", "//nomodule:c"), getGenfilesArtifact("d.cppmap", "//nomodule:d")); - assertThat(getHeaderModules(dObjectAction.getContext().getTransitiveModules(true))) + assertThat(getHeaderModules(dObjectAction.getCcCompilationInfo().getTransitiveModules(true))) .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); } |