diff options
author | 2017-07-27 23:48:56 +0200 | |
---|---|---|
committer | 2017-07-28 10:44:54 +0200 | |
commit | 11da2203a00bb8121275d9a110190d7f70df1073 (patch) | |
tree | 97a5aab8d40af86af9a7068c91c17d2fdca1201c /src/test/java/com/google | |
parent | da4c959603280ded71ad8fbc2d30d4917b175750 (diff) |
Assert that declared providers are not TransitiveInfoProviders.
Also fix the remaining violations.
RELNOTES: None.
PiperOrigin-RevId: 163391215
Diffstat (limited to 'src/test/java/com/google')
4 files changed, 10 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java index 3f51d80979..ceb0ad73bd 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureTest.java @@ -60,7 +60,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase { ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture"); assertThat(fixture).isNotNull(); AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider = - fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO); + fixture.get(AndroidDeviceScriptFixtureInfoProvider.SKYLARK_CONSTRUCTOR); assertThat(deviceScriptFixtureInfoProvider).isNotNull(); assertThat(deviceScriptFixtureInfoProvider.getFixtureScript()).isNotNull(); assertThat(deviceScriptFixtureInfoProvider.getFixtureScript().prettyPrint()) @@ -78,7 +78,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase { ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture"); assertThat(fixture).isNotNull(); AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider = - fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO); + fixture.get(AndroidDeviceScriptFixtureInfoProvider.SKYLARK_CONSTRUCTOR); assertThat(deviceScriptFixtureInfoProvider).isNotNull(); assertThat(deviceScriptFixtureInfoProvider.getFixtureScript()).isNotNull(); assertThat(deviceScriptFixtureInfoProvider.getFixtureScript().prettyPrint()) @@ -129,7 +129,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase { ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture"); assertThat(fixture).isNotNull(); AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider = - fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO); + fixture.get(AndroidDeviceScriptFixtureInfoProvider.SKYLARK_CONSTRUCTOR); assertThat(deviceScriptFixtureInfoProvider).isNotNull(); assertThat( @@ -163,7 +163,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase { ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture"); assertThat(fixture).isNotNull(); AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider = - fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO); + fixture.get(AndroidDeviceScriptFixtureInfoProvider.SKYLARK_CONSTRUCTOR); assertThat(deviceScriptFixtureInfoProvider).isNotNull(); assertThat(deviceScriptFixtureInfoProvider.getDaemon()).isTrue(); } @@ -180,7 +180,7 @@ public class AndroidDeviceScriptFixtureTest extends AndroidBuildViewTestCase { ConfiguredTarget fixture = getConfiguredTarget("//javatests/com/app:fixture"); assertThat(fixture).isNotNull(); AndroidDeviceScriptFixtureInfoProvider deviceScriptFixtureInfoProvider = - fixture.get(AndroidDeviceScriptFixtureInfoProvider.ANDROID_DEVICE_SCRIPT_FIXTURE_INFO); + fixture.get(AndroidDeviceScriptFixtureInfoProvider.SKYLARK_CONSTRUCTOR); assertThat(deviceScriptFixtureInfoProvider).isNotNull(); assertThat(deviceScriptFixtureInfoProvider.getStrictExit()).isTrue(); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java index 03c3deac40..a8939a54d1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java @@ -114,7 +114,6 @@ public class CcToolchainTest extends BuildViewTestCase { public void testToolchainAlias() throws Exception { ConfiguredTarget reference = scratchConfiguredTarget("a", "ref", "cc_toolchain_alias(name='ref')"); - assertThat(reference.getProvider(CcToolchainProvider.class)).isNotNull(); assertThat(reference.get(CcToolchainProvider.SKYLARK_CONSTRUCTOR.getKey())).isNotNull(); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index a2924f116d..fdceebd699 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -161,7 +161,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { private CcToolchainProvider getCcToolchainProvider(CppConfiguration cppConfiguration) throws Exception { - return getCcToolchainTarget(cppConfiguration).getProvider(CcToolchainProvider.class); + return getCcToolchainTarget(cppConfiguration).get(CcToolchainProvider.SKYLARK_CONSTRUCTOR); } /** @@ -488,7 +488,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { CppConfiguration toolchainA = create(loader, "--cpu=piii", "--host_cpu=piii", "--android_cpu=", "--fat_apk_cpu="); ConfiguredTarget ccToolchainA = getCcToolchainTarget(toolchainA); - CcToolchainProvider ccProviderA = ccToolchainA.getProvider(CcToolchainProvider.class); + CcToolchainProvider ccProviderA = ccToolchainA.get(CcToolchainProvider.SKYLARK_CONSTRUCTOR); MakeVariableProvider makeProviderA = ccToolchainA.get(MakeVariableProvider.SKYLARK_CONSTRUCTOR); assertThat(toolchainA.getToolchainIdentifier()).isEqualTo("toolchain-identifier-A"); assertThat(toolchainA.getHostSystemName()).isEqualTo("host-system-name-A"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java index fbd5fbc410..c81d7ed2e3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java @@ -512,7 +512,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { myRuleTarget.get(myProviderKey); Object javaProvider = declaredProvider.getValue("p"); assertThat(javaProvider).isInstanceOf(JavaProvider.class); - assertThat(javaLibraryTarget.getProvider(JavaProvider.class)).isEqualTo(javaProvider); + assertThat(javaLibraryTarget.get(JavaProvider.JAVA_PROVIDER)).isEqualTo(javaProvider); } @Test @@ -537,11 +537,11 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { Object javaProvider = myRuleTarget.get(JavaProvider.JAVA_PROVIDER.getKey()); assertThat(javaProvider).isInstanceOf(JavaProvider.class); - JavaProvider jlJavaProvider = javaLibraryTarget.getProvider(JavaProvider.class); + JavaProvider jlJavaProvider = javaLibraryTarget.get(JavaProvider.JAVA_PROVIDER); assertThat(jlJavaProvider == javaProvider).isTrue(); - JavaProvider jlTopJavaProvider = topJavaLibraryTarget.getProvider(JavaProvider.class); + JavaProvider jlTopJavaProvider = topJavaLibraryTarget.get(JavaProvider.JAVA_PROVIDER); javaCompilationArgsHaveTheSameParent( jlJavaProvider.getProvider(JavaCompilationArgsProvider.class).getJavaCompilationArgs(), |