diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index 5b803e0761..bb9d76d744 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -477,9 +477,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " srcs = ['dummy4.java'])"); ConfiguredTarget target = getConfiguredTarget("//java/com/google/exports:dummy"); - List<Label> exports = - ImmutableList.copyOf( - JavaInfo.getProvider(JavaExportsProvider.class, target).getTransitiveExports()); + List<Label> exports = ImmutableList.copyOf( + target.getProvider(JavaExportsProvider.class).getTransitiveExports()); assertThat(exports) .containsExactly( Label.parseAbsolute("//java/com/google/exports:dummy2", ImmutableMap.of()), @@ -1751,13 +1750,11 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { Iterable<String> c1Jars = ActionsTestUtil.baseArtifactNames( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, c1Target) - .getCompilationClasspath()); + c1Target.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); Iterable<String> c2Jars = ActionsTestUtil.baseArtifactNames( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, c2Target) - .getCompilationClasspath()); + c2Target.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); assertThat(c1Jars).containsExactly("liba-hjar.jar"); assertThat(c2Jars).containsExactly("liba-hjar.jar"); @@ -1777,12 +1774,10 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ImmutableList<Artifact> bClasspath = ImmutableList.copyOf( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, bTarget) - .getCompilationClasspath()); + bTarget.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); ImmutableList<Artifact> cClasspath = ImmutableList.copyOf( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, cTarget) - .getCompilationClasspath()); + cTarget.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); assertThat(bClasspath).isEmpty(); assertThat(cClasspath) |