diff options
| author |  dannark <dannark@google.com> | 2018-06-27 13:35:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-27 13:36:25 -0700 |
| commit | 90e2b4b5e745fe2de9ca82bc8163c198e5be8ca9 (patch) | |
| tree | f827defac036acf55c4253c01f11126e0c502572 /src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | |
| parent | 116971c08caa3f9bd94fc91066cd4cd1e432cafe (diff) | |
Automated refactor of Label.parseAbsolute() to always pass a repository mapping
RELNOTES: None
PiperOrigin-RevId: 202360925
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 19 |
1 files changed, 11 insertions, 8 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 4f44f850d1..9e6f5f865b 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 @@ -22,6 +22,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.truth.Truth; @@ -478,9 +479,11 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ConfiguredTarget target = getConfiguredTarget("//java/com/google/exports:dummy"); List<Label> exports = ImmutableList.copyOf( target.getProvider(JavaExportsProvider.class).getTransitiveExports()); - assertThat(exports).containsExactly(Label.parseAbsolute("//java/com/google/exports:dummy2"), - Label.parseAbsolute("//java/com/google/exports:dummy3"), - Label.parseAbsolute("//java/com/google/exports:dummy4")); + assertThat(exports) + .containsExactly( + Label.parseAbsolute("//java/com/google/exports:dummy2", ImmutableMap.of()), + Label.parseAbsolute("//java/com/google/exports:dummy3", ImmutableMap.of()), + Label.parseAbsolute("//java/com/google/exports:dummy4", ImmutableMap.of())); assertNoEvents(); } @@ -943,22 +946,22 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { Iterables.transform( foo.get(AndroidResourcesInfo.PROVIDER).getTransitiveAndroidResources(), getLabel)) .containsExactly( - Label.parseAbsolute("//java/apps/android:lib"), - Label.parseAbsolute("//java/apps/android:bar")); + Label.parseAbsolute("//java/apps/android:lib", ImmutableMap.of()), + Label.parseAbsolute("//java/apps/android:bar", ImmutableMap.of())); assertThat( Iterables.transform( foo.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources(), getLabel)) - .containsExactly(Label.parseAbsolute("//java/apps/android:foo")); + .containsExactly(Label.parseAbsolute("//java/apps/android:foo", ImmutableMap.of())); ConfiguredTarget lib = getConfiguredTarget("//java/apps/android:lib"); assertThat( Iterables.transform( lib.get(AndroidResourcesInfo.PROVIDER).getTransitiveAndroidResources(), getLabel)) - .containsExactly(Label.parseAbsolute("//java/apps/android:bar")); + .containsExactly(Label.parseAbsolute("//java/apps/android:bar", ImmutableMap.of())); assertThat( Iterables.transform( lib.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources(), getLabel)) - .containsExactly(Label.parseAbsolute("//java/apps/android:lib")); + .containsExactly(Label.parseAbsolute("//java/apps/android:lib", ImmutableMap.of())); ConfiguredTarget libNeverlink = getConfiguredTarget("//java/apps/android:lib_neverlink"); assertThat(libNeverlink.get(AndroidResourcesInfo.PROVIDER).getTransitiveAndroidResources()) |