commit c1934b827e91a47ba4fe18baad4be6d46807de41
author ajmichael <ajmichael@google.com> Wed Aug 23 04:10:59 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Wed Aug 23 13:31:43 2017 +0200
tree 9d4e7e18b8b70c0baa8c54cb1b911bd34fd8a844
parent 30fd060da6d7bd894e158e63ecca0fdfce0a9e81

Remove unnecessary custom android_sdk from apksigner tests.

RELNOTES: None
PiperOrigin-RevId: 166147838

src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 2eba0f6..f011f05 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Streams;
 import com.google.common.eventbus.EventBus;
 import com.google.common.truth.Truth;
 import com.google.devtools.build.lib.actions.Action;
@@ -665,28 +666,11 @@
 
   private void actualSignerToolTests(String apkSigningMethod, String signV1, String signV2)
       throws Exception {
-    scratch.file(
-        "sdk/BUILD",
-        "android_sdk(",
-        "    name = 'sdk',",
-        "    aapt = 'aapt',",
-        "    adb = 'adb',",
-        "    aidl = 'aidl',",
-        "    android_jar = 'android.jar',",
-        "    annotations_jar = 'annotations_jar',",
-        "    apksigner = 'apksigner',",
-        "    dx = 'dx',",
-        "    framework_aidl = 'framework_aidl',",
-        "    main_dex_classes = 'main_dex_classes',",
-        "    main_dex_list_creator = 'main_dex_list_creator',",
-        "    proguard = 'proguard',",
-        "    shrinked_android_jar = 'shrinked_android_jar',",
-        "    zipalign = 'zipalign')");
     scratch.file("java/com/google/android/hello/BUILD",
         "android_binary(name = 'hello',",
         "               srcs = ['Foo.java'],",
         "               manifest = 'AndroidManifest.xml',)");
-    useConfiguration("--android_sdk=//sdk:sdk", "--apk_signing_method=" + apkSigningMethod);
+    useConfiguration("--apk_signing_method=" + apkSigningMethod);
     ConfiguredTarget binary = getConfiguredTarget("//java/com/google/android/hello:hello");
 
     Set<Artifact> artifacts = actionsTestUtil().artifactClosureOf(getFilesToBuild(binary));
@@ -694,32 +678,22 @@
     SpawnAction unsignedApkAction = (SpawnAction) actionsTestUtil()
         .getActionForArtifactEndingWith(artifacts, "/hello_unsigned.apk");
     assertThat(
-            Iterables.any(
-                unsignedApkAction.getInputs(),
-                new Predicate<Artifact>() {
-                  @Override
-                  public boolean apply(Artifact artifact) {
-                    return artifact.getFilename().equals("SingleJar_deploy.jar");
-                  }
-                }))
+            Streams.stream(unsignedApkAction.getInputs())
+                .map(Artifact::getFilename)
+                .anyMatch("SingleJar_deploy.jar"::equals))
         .isTrue();
     SpawnAction compressedUnsignedApkAction = (SpawnAction) actionsTestUtil()
         .getActionForArtifactEndingWith(artifacts, "compressed_hello_unsigned.apk");
     assertThat(
-            Iterables.any(
-                compressedUnsignedApkAction.getInputs(),
-                new Predicate<Artifact>() {
-                  @Override
-                  public boolean apply(Artifact artifact) {
-                    return artifact.getFilename().equals("SingleJar_deploy.jar");
-                  }
-                }))
+            Streams.stream(compressedUnsignedApkAction.getInputs())
+                .map(Artifact::getFilename)
+                .anyMatch("SingleJar_deploy.jar"::equals))
         .isTrue();
     SpawnAction zipalignAction = (SpawnAction) actionsTestUtil()
         .getActionForArtifactEndingWith(artifacts, "zipaligned_hello.apk");
-    assertThat(zipalignAction.getCommandFilename()).endsWith("sdk/zipalign");
+    assertThat(zipalignAction.getCommandFilename()).endsWith("zipalign");
     Artifact a = ActionsTestUtil.getFirstArtifactEndingWith(artifacts, "hello.apk");
-    assertThat(getGeneratingSpawnAction(a).getCommandFilename()).endsWith("sdk/apksigner");
+    assertThat(getGeneratingSpawnAction(a).getCommandFilename()).endsWith("ApkSignerBinary");
     List<String> args = getGeneratingSpawnActionArgs(a);
 
     assertThat(flagValue("--v1-signing-enabled", args)).isEqualTo(signV1);