diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
7 files changed, 40 insertions, 60 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java index cc9f49aaaa..5d95e66e8d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java @@ -41,7 +41,7 @@ public class AliasTest extends BuildViewTestCase { "alias(name='b', actual='a')"); ConfiguredTarget b = getConfiguredTarget("//a:b"); - assertThat(b.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo()).isNotNull(); + assertThat(b.get(CcCompilationInfo.PROVIDER).getCcCompilationContext()).isNotNull(); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index 656a64a76b..d2be295616 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -253,10 +253,7 @@ public class CcCommonTest extends BuildViewTestCase { " srcs = ['defines.cc'],", " defines = ['FOO', 'BAR'])"); assertThat( - isolatedDefines - .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo() - .getDefines()) + isolatedDefines.get(CcCompilationInfo.PROVIDER).getCcCompilationContext().getDefines()) .containsExactly("FOO", "BAR") .inOrder(); } @@ -424,10 +421,7 @@ public class CcCommonTest extends BuildViewTestCase { ConfiguredTarget foo = getConfiguredTarget("//bang:bang"); String includesRoot = "bang/bang_includes"; - assertThat( - foo.get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo() - .getSystemIncludeDirs()) + assertThat(foo.get(CcCompilationInfo.PROVIDER).getCcCompilationContext().getSystemIncludeDirs()) .containsAllOf( PathFragment.create(includesRoot), targetConfig.getGenfilesFragment().getRelative(includesRoot)); @@ -457,16 +451,13 @@ public class CcCommonTest extends BuildViewTestCase { .addAll( noIncludes .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo() + .getCcCompilationContext() .getSystemIncludeDirs()) .add(PathFragment.create(includesRoot)) .add(targetConfig.getGenfilesFragment().getRelative(includesRoot)) .add(targetConfig.getBinFragment().getRelative(includesRoot)) .build(); - assertThat( - foo.get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo() - .getSystemIncludeDirs()) + assertThat(foo.get(CcCompilationInfo.PROVIDER).getCcCompilationContext().getSystemIncludeDirs()) .containsExactlyElementsIn(expected); } @@ -875,12 +866,11 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name='a', hdrs=['v1/b/c.h'], strip_include_prefix='v1', include_prefix='lib')"); ConfiguredTarget lib = getConfiguredTarget("//third_party/a"); - CcCompilationContextInfo ccCompilationContextInfo = - lib.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo(); - assertThat( - ActionsTestUtil.prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) + CcCompilationContext ccCompilationContext = + lib.get(CcCompilationInfo.PROVIDER).getCcCompilationContext(); + assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs())) .containsExactly("third_party/a/_virtual_includes/a/lib/b/c.h"); - assertThat(ccCompilationContextInfo.getIncludeDirs()) + assertThat(ccCompilationContext.getIncludeDirs()) .containsExactly( getTargetConfiguration() .getBinFragment() @@ -916,14 +906,14 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name='relative', hdrs=['v1/b.h'], strip_include_prefix='v1')", "cc_library(name='absolute', hdrs=['v1/b.h'], strip_include_prefix='/third_party')"); - CcCompilationContextInfo relative = + CcCompilationContext relative = getConfiguredTarget("//third_party/a:relative") .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo(); - CcCompilationContextInfo absolute = + .getCcCompilationContext(); + CcCompilationContext absolute = getConfiguredTarget("//third_party/a:absolute") .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo(); + .getCcCompilationContext(); assertThat(ActionsTestUtil.prettyArtifactNames(relative.getDeclaredIncludeSrcs())) .containsExactly("third_party/a/_virtual_includes/relative/b.h"); @@ -950,12 +940,11 @@ public class CcCommonTest extends BuildViewTestCase { "licenses(['notice'])", "cc_library(name='a', hdrs=['a.h'], include_prefix='third_party')"); - CcCompilationContextInfo ccCompilationContextInfo = + CcCompilationContext ccCompilationContext = getConfiguredTarget("//third_party:a") .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo(); - assertThat( - ActionsTestUtil.prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) + .getCcCompilationContext(); + assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs())) .doesNotContain("third_party/_virtual_includes/a/third_party/a.h"); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java index 1926d1fee7..1e096b4ff7 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java @@ -314,7 +314,7 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase { "foo", "cc_import(name = 'foo', static_library = 'libfoo.a', hdrs = ['foo.h'])") .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo() + .getCcCompilationContext() .getDeclaredIncludeSrcs(); assertThat(artifactsToStrings(headers)).containsExactly("src a/foo.h"); } 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 5ab844b922..d860ba6d03 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,14 +91,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { private CppModuleMapAction getCppModuleMapAction(String label) throws Exception { ConfiguredTarget target = getConfiguredTarget(label); CppModuleMap cppModuleMap = - target.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo().getCppModuleMap(); + target.get(CcCompilationInfo.PROVIDER).getCcCompilationContext().getCppModuleMap(); return (CppModuleMapAction) getGeneratingAction(cppModuleMap.getArtifact()); } private void assertNoCppModuleMapAction(String label) throws Exception { ConfiguredTarget target = getConfiguredTarget(label); - assertThat( - target.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo().getCppModuleMap()) + assertThat(target.get(CcCompilationInfo.PROVIDER).getCcCompilationContext().getCppModuleMap()) .isNull(); } @@ -107,7 +106,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.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo().getDefines()) + assertThat(l.get(CcCompilationInfo.PROVIDER).getCcCompilationContext().getDefines()) .contains("V=BAR"); } @@ -572,7 +571,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { CppCompileAction aObjectAction = (CppCompileAction) getGeneratingAction(aObjectArtifact); assertThat(aObjectAction.getIncludeScannerSources()).containsExactly( getSourceArtifact("module/a.cc")); - assertThat(aObjectAction.getCcCompilationContextInfo().getTransitiveModules(true)) + assertThat(aObjectAction.getCcCompilationContext().getTransitiveModules(true)) .contains(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); assertThat(aObjectAction.getInputs()).contains( getGenfilesArtifactWithNoOwner("module/b.cppmap")); @@ -770,9 +769,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.getCcCompilationContextInfo().getTransitiveModules(true))) + assertThat(getHeaderModules(jObjectAction.getCcCompilationContext().getTransitiveModules(true))) .containsExactly( getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"), getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g")); @@ -780,9 +777,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { getSourceArtifact("module/j.cc")); assertThat(jObjectAction.getMainIncludeScannerSource()).isEqualTo( getSourceArtifact("module/j.cc")); - assertThat( - getHeaderModules( - jObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) + assertThat(getHeaderModules(jObjectAction.getCcCompilationContext().getTransitiveModules(true))) .containsExactly( getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"), getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g")); @@ -812,9 +807,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly( getGenfilesArtifact("b.cppmap", "//module:b"), getGenfilesArtifact("c.cppmap", "//nomodule:e")); - assertThat( - getHeaderModules( - cObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) + assertThat(getHeaderModules(cObjectAction.getCcCompilationContext().getTransitiveModules(true))) .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); getConfiguredTarget("//nomodule:d"); @@ -824,9 +817,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly( getGenfilesArtifact("c.cppmap", "//nomodule:c"), getGenfilesArtifact("d.cppmap", "//nomodule:d")); - assertThat( - getHeaderModules( - dObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) + assertThat(getHeaderModules(dObjectAction.getCcCompilationContext().getTransitiveModules(true))) .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java index fa367f0ab9..d039539178 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java @@ -57,7 +57,7 @@ public class CcToolchainProviderTest { /* dynamicRuntimeLinkInputs= */ NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), /* dynamicRuntimeLinkMiddleman= */ null, /* dynamicRuntimeSolibDir= */ PathFragment.EMPTY_FRAGMENT, - CcCompilationContextInfo.EMPTY, + CcCompilationContext.EMPTY, /* supportsParamFiles= */ false, /* supportsHeaderParsing= */ false, Variables.EMPTY, @@ -94,7 +94,7 @@ public class CcToolchainProviderTest { /* dynamicRuntimeLinkInputs= */ NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), /* dynamicRuntimeLinkMiddleman= */ null, /* dynamicRuntimeSolibDir= */ PathFragment.EMPTY_FRAGMENT, - CcCompilationContextInfo.EMPTY, + CcCompilationContext.EMPTY, /* supportsParamFiles= */ false, /* supportsHeaderParsing= */ false, Variables.EMPTY, diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java index f1ab983aee..699275f721 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java @@ -38,8 +38,8 @@ public final class MockCppSemantics implements CppSemantics { RuleContext ruleContext, CppCompileActionBuilder actionBuilder) {} @Override - public void setupCcCompilationContextInfo( - RuleContext ruleContext, CcCompilationContextInfo.Builder ccCompilationContextInfoBuilder) {} + public void setupCcCompilationContext( + RuleContext ruleContext, CcCompilationContext.Builder ccCompilationContextBuilder) {} @Override public NestedSet<Artifact> getAdditionalPrunableIncludes() { diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java index e2309ba184..d7bf3eaf99 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java @@ -24,7 +24,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; -import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContext; import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; import com.google.devtools.build.lib.vfs.FileSystemUtils; import org.junit.Before; @@ -108,27 +108,27 @@ public class CcProtoLibraryTest extends BuildViewTestCase { "proto_library(name = 'alias_proto', deps = [':foo_proto'])", "proto_library(name = 'foo_proto', srcs = ['foo.proto'])"); - CcCompilationContextInfo ccCompilationContextInfo = + CcCompilationContext ccCompilationContext = getConfiguredTarget("//x:foo_cc_proto") .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo(); - assertThat(prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) + .getCcCompilationContext(); + assertThat(prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs())) .containsExactly("x/foo.pb.h"); } @Test - public void ccCompilationContextInfo() throws Exception { + public void ccCompilationContext() throws Exception { scratch.file( "x/BUILD", "cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])", "proto_library(name = 'foo_proto', srcs = ['foo.proto'], deps = [':bar_proto'])", "proto_library(name = 'bar_proto', srcs = ['bar.proto'])"); - CcCompilationContextInfo ccCompilationContextInfo = + CcCompilationContext ccCompilationContext = getConfiguredTarget("//x:foo_cc_proto") .get(CcCompilationInfo.PROVIDER) - .getCcCompilationContextInfo(); - assertThat(prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) + .getCcCompilationContext(); + assertThat(prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs())) .containsExactly("x/foo.pb.h", "x/bar.pb.h"); } @@ -178,9 +178,9 @@ public class CcProtoLibraryTest extends BuildViewTestCase { getTargetConfiguration().getGenfilesFragment().toString())); Artifact headerFile = getGenfilesArtifactWithNoOwner("external/bla/foo/bar.pb.h"); - CcCompilationContextInfo ccCompilationContextInfo = - target.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo(); - assertThat(ccCompilationContextInfo.getDeclaredIncludeSrcs()).containsExactly(headerFile); + CcCompilationContext ccCompilationContext = + target.get(CcCompilationInfo.PROVIDER).getCcCompilationContext(); + assertThat(ccCompilationContext.getDeclaredIncludeSrcs()).containsExactly(headerFile); } @Test |