Migrate tests to Truth.

RELNOTES: None.
PiperOrigin-RevId: 156983366

6 files changed, 201 insertions, 213 deletions

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 a06521393e..9afaf68798 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
@@ -15,11 +15,8 @@ package com.google.devtools.build.lib.rules.android;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.getFirstArtifactEndingWith;
-import static junit.framework.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
@@ -158,11 +155,12 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
     assertThat(javacAction.getProcessorNames()).contains("com.google.process.stuff");
     assertThat(javacAction.getProcessorNames()).hasSize(1);
 
-    assertEquals("libplugin.jar libplugin_dep.jar", ActionsTestUtil.baseNamesOf(
-        javacAction.getProcessorpath()));
-    assertEquals("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java",
-        actionsTestUtil().predecessorClosureOf(getFilesToBuild(target),
-            JavaSemantics.JAVA_SOURCE));
+    assertThat(ActionsTestUtil.baseNamesOf(javacAction.getProcessorpath()))
+        .isEqualTo("libplugin.jar libplugin_dep.jar");
+    assertThat(
+            actionsTestUtil()
+                .predecessorClosureOf(getFilesToBuild(target), JavaSemantics.JAVA_SOURCE))
+        .isEqualTo("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java");
   }
 
   // Same test as above, enabling the plugin through the command line.
@@ -186,11 +184,12 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
     assertThat(javacAction.getProcessorNames()).contains("com.google.process.stuff");
     assertThat(javacAction.getProcessorNames()).hasSize(1);
-    assertEquals("libplugin.jar libplugin_dep.jar",
-        ActionsTestUtil.baseNamesOf(javacAction.getProcessorpath()));
-    assertEquals("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java",
-        actionsTestUtil().predecessorClosureOf(getFilesToBuild(target),
-            JavaSemantics.JAVA_SOURCE));
+    assertThat(ActionsTestUtil.baseNamesOf(javacAction.getProcessorpath()))
+        .isEqualTo("libplugin.jar libplugin_dep.jar");
+    assertThat(
+            actionsTestUtil()
+                .predecessorClosureOf(getFilesToBuild(target), JavaSemantics.JAVA_SOURCE))
+        .isEqualTo("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java");
   }
 
   @Test
@@ -314,11 +313,12 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
   private void assertNativeLibraryLinked(ConfiguredTarget target, String... srcNames) {
     Artifact linkedLib = getOnlyElement(getNativeLibrariesInApk(target));
-    assertEquals(
-        "lib" + target.getLabel().toPathFragment().getBaseName() + ".so", linkedLib.getFilename());
-    assertFalse(linkedLib.isSourceArtifact());
-    assertEquals("Native libraries were not linked to produce " + linkedLib,
-        target.getLabel(), getGeneratingLabelForArtifact(linkedLib));
+    assertThat(linkedLib.getFilename())
+        .isEqualTo("lib" + target.getLabel().toPathFragment().getBaseName() + ".so");
+    assertThat(linkedLib.isSourceArtifact()).isFalse();
+    assertWithMessage("Native libraries were not linked to produce " + linkedLib)
+        .that(getGeneratingLabelForArtifact(linkedLib))
+        .isEqualTo(target.getLabel());
     assertThat(artifactsToStrings(actionsTestUtil().artifactClosureOf(linkedLib)))
         .containsAllIn(ImmutableSet.copyOf(Arrays.asList(srcNames)));
   }
@@ -692,26 +692,28 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
     assertThat(getFirstArtifactEndingWith(artifacts, "signed_hello.apk")).isNull();
     SpawnAction unsignedApkAction = (SpawnAction) actionsTestUtil()
         .getActionForArtifactEndingWith(artifacts, "/hello_unsigned.apk");
-    assertTrue(
-        Iterables.any(
-            unsignedApkAction.getInputs(),
-            new Predicate<Artifact>() {
-              @Override
-              public boolean apply(Artifact artifact) {
-                return artifact.getFilename().equals("SingleJar_deploy.jar");
-              }
-            }));
+    assertThat(
+            Iterables.any(
+                unsignedApkAction.getInputs(),
+                new Predicate<Artifact>() {
+                  @Override
+                  public boolean apply(Artifact artifact) {
+                    return artifact.getFilename().equals("SingleJar_deploy.jar");
+                  }
+                }))
+        .isTrue();
     SpawnAction compressedUnsignedApkAction = (SpawnAction) actionsTestUtil()
         .getActionForArtifactEndingWith(artifacts, "compressed_hello_unsigned.apk");
-    assertTrue(
-        Iterables.any(
-            compressedUnsignedApkAction.getInputs(),
-            new Predicate<Artifact>() {
-              @Override
-              public boolean apply(Artifact artifact) {
-                return artifact.getFilename().equals("SingleJar_deploy.jar");
-              }
-            }));
+    assertThat(
+            Iterables.any(
+                compressedUnsignedApkAction.getInputs(),
+                new Predicate<Artifact>() {
+                  @Override
+                  public boolean apply(Artifact artifact) {
+                    return artifact.getFilename().equals("SingleJar_deploy.jar");
+                  }
+                }))
+        .isTrue();
     SpawnAction zipalignAction = (SpawnAction) actionsTestUtil()
         .getActionForArtifactEndingWith(artifacts, "zipaligned_hello.apk");
     assertThat(zipalignAction.getCommandFilename()).endsWith("sdk/zipalign");
@@ -811,15 +813,16 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
     // Assert that the ProGuard executable set in the android_sdk rule appeared in the command-line
     // of the SpawnAction that generated the _proguard.jar.
-    assertTrue(
-        Iterables.any(
-            action.getArguments(),
-            new Predicate<String>() {
-              @Override
-              public boolean apply(String s) {
-                return s.endsWith("ProGuard");
-              }
-            }));
+    assertThat(
+            Iterables.any(
+                action.getArguments(),
+                new Predicate<String>() {
+                  @Override
+                  public boolean apply(String s) {
+                    return s.endsWith("ProGuard");
+                  }
+                }))
+        .isTrue();
     assertThat(action.getArguments())
         .containsAllOf(
             "-injars",
@@ -832,8 +835,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
     // Checks that the output files are produced.
     assertProguardUsed(output);
-    assertNotNull(getBinArtifact("b_proguard.usage", output));
-    assertNotNull(getBinArtifact("b_proguard.seeds", output));
+    assertThat(getBinArtifact("b_proguard.usage", output)).isNotNull();
+    assertThat(getBinArtifact("b_proguard.seeds", output)).isNotNull();
   }
 
   @Test
@@ -861,9 +864,9 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
         getHostConfiguredTarget("//java/com/google/devtools/build/jkrunchy")
             .getProvider(FilesToRunProvider.class)
             .getExecutable();
-    assertEquals("ProGuard implementation was not correctly taken from the configuration",
-        jkrunchyExecutable.getExecPathString(),
-        proguardAction.getCommandFilename());
+    assertWithMessage("ProGuard implementation was not correctly taken from the configuration")
+        .that(proguardAction.getCommandFilename())
+        .isEqualTo(jkrunchyExecutable.getExecPathString());
   }
 
   @Test
@@ -966,7 +969,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
     int start = args.indexOf("--dex") + 1;
     assertThat(start).isNotEqualTo(0);
     int end = Math.min(args.size(), start + expectedArgs.size());
-    assertEquals(expectedArgs, args.subList(start, end));
+    assertThat(args.subList(start, end)).isEqualTo(expectedArgs);
   }
 
   @Test
@@ -1789,22 +1792,22 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget binary = getConfiguredTarget("//java/android:app");
     SpawnAction action = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith(
         actionsTestUtil().artifactClosureOf(getFilesToBuild(binary)), "zipaligned_app.apk");
-    assertEquals("AndroidZipAlign", action.getMnemonic());
+    assertThat(action.getMnemonic()).isEqualTo("AndroidZipAlign");
 
     List<String> arguments = action.getArguments();
-    assertEquals(1, Iterables.frequency(arguments, "4"));
+    assertThat(Iterables.frequency(arguments, "4")).isEqualTo(1);
 
     Artifact zipAlignTool =
         getFirstArtifactEndingWith(action.getInputs(), "/zipalign");
-    assertEquals(1, Iterables.frequency(arguments, zipAlignTool.getExecPathString()));
+    assertThat(Iterables.frequency(arguments, zipAlignTool.getExecPathString())).isEqualTo(1);
 
     Artifact unsignedApk =
         getFirstArtifactEndingWith(action.getInputs(), "/app_unsigned.apk");
-    assertEquals(1, Iterables.frequency(arguments, unsignedApk.getExecPathString()));
+    assertThat(Iterables.frequency(arguments, unsignedApk.getExecPathString())).isEqualTo(1);
 
     Artifact zipalignedApk =
         getFirstArtifactEndingWith(action.getOutputs(), "/zipaligned_app.apk");
-    assertEquals(1, Iterables.frequency(arguments, zipalignedApk.getExecPathString()));
+    assertThat(Iterables.frequency(arguments, zipalignedApk.getExecPathString())).isEqualTo(1);
   }
 
   @Test
@@ -2304,8 +2307,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
     List<String> args = getGeneratingSpawnAction(getResourceApk(resource)).getArguments();
     assertPrimaryResourceDirs(ImmutableList.of("java/android/resources/bin-res"), args);
-    assertThat(getDirectDependentResourceDirs(args)).containsAllIn(ImmutableList.of(
-        "java/android/resources/d1/d1-res", "java/android/resources/d2/d2-res"));
+    assertThat(getDirectDependentResourceDirs(args))
+        .containsAllOf("java/android/resources/d1/d1-res", "java/android/resources/d2/d2-res");
     assertNoEvents();
   }
 
@@ -2423,8 +2426,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
       "               resource_files = ['res/values/strings.xml'],",
       "               )");
     ConfiguredTarget r = getConfiguredTarget("//java/android/resources:r");
-    assertEquals(getTargetConfiguration().getBinDirectory(RepositoryName.MAIN),
-        getFirstArtifactEndingWith(getFilesToBuild(r), ".apk").getRoot());
+    assertThat(getFirstArtifactEndingWith(getFilesToBuild(r), ".apk").getRoot())
+        .isEqualTo(getTargetConfiguration().getBinDirectory(RepositoryName.MAIN));
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
index 185f52892c..ce74662be6 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
@@ -17,7 +17,6 @@ import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.getFirstArtifactEndingWith;
-import static org.junit.Assert.assertNotNull;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
@@ -132,9 +131,11 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase {
   }
 
   protected void assertProguardUsed(ConfiguredTarget binary) {
-    assertNotNull("proguard.jar is not in the rule output",
-        actionsTestUtil().getActionForArtifactEndingWith(
-            getFilesToBuild(binary), "_proguard.jar"));
+    assertWithMessage("proguard.jar is not in the rule output")
+        .that(
+            actionsTestUtil()
+                .getActionForArtifactEndingWith(getFilesToBuild(binary), "_proguard.jar"))
+        .isNotNull();
   }
 
   protected List<String> resourceArguments(ResourceContainer resource) {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java
index ee96569b72..8c36bdde81 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidCommonTest.java
@@ -14,12 +14,9 @@
 package com.google.devtools.build.lib.rules.android;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.MultidexMode;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -91,14 +88,14 @@ public class AndroidCommonTest extends BuildViewTestCase {
   public void testMultidexModeEnum() throws Exception {
     assertThat(MultidexMode.getValidValues()).containsExactly("native", "legacy", "manual_main_dex",
         "off");
-    assertSame(MultidexMode.NATIVE, MultidexMode.fromValue("native"));
-    assertEquals("native", MultidexMode.NATIVE.getAttributeValue());
-    assertSame(MultidexMode.LEGACY, MultidexMode.fromValue("legacy"));
-    assertEquals("legacy", MultidexMode.LEGACY.getAttributeValue());
-    assertSame(MultidexMode.MANUAL_MAIN_DEX, MultidexMode.fromValue("manual_main_dex"));
-    assertEquals("manual_main_dex", MultidexMode.MANUAL_MAIN_DEX.getAttributeValue());
-    assertSame(MultidexMode.OFF, MultidexMode.fromValue("off"));
-    assertEquals("off", MultidexMode.OFF.getAttributeValue());
+    assertThat(MultidexMode.fromValue("native")).isSameAs(MultidexMode.NATIVE);
+    assertThat(MultidexMode.NATIVE.getAttributeValue()).isEqualTo("native");
+    assertThat(MultidexMode.fromValue("legacy")).isSameAs(MultidexMode.LEGACY);
+    assertThat(MultidexMode.LEGACY.getAttributeValue()).isEqualTo("legacy");
+    assertThat(MultidexMode.fromValue("manual_main_dex")).isSameAs(MultidexMode.MANUAL_MAIN_DEX);
+    assertThat(MultidexMode.MANUAL_MAIN_DEX.getAttributeValue()).isEqualTo("manual_main_dex");
+    assertThat(MultidexMode.fromValue("off")).isSameAs(MultidexMode.OFF);
+    assertThat(MultidexMode.OFF.getAttributeValue()).isEqualTo("off");
   }
 
   /**
@@ -106,8 +103,8 @@ public class AndroidCommonTest extends BuildViewTestCase {
    */
   @Test
   public void testOutputDexforMultidexModes() throws Exception {
-    assertEquals("classes.dex", MultidexMode.OFF.getOutputDexFilename());
-    assertEquals("classes.dex.zip", MultidexMode.LEGACY.getOutputDexFilename());
-    assertEquals("classes.dex.zip", MultidexMode.NATIVE.getOutputDexFilename());
+    assertThat(MultidexMode.OFF.getOutputDexFilename()).isEqualTo("classes.dex");
+    assertThat(MultidexMode.LEGACY.getOutputDexFilename()).isEqualTo("classes.dex.zip");
+    assertThat(MultidexMode.NATIVE.getOutputDexFilename()).isEqualTo("classes.dex.zip");
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java
index 694031ac43..a594abe3ee 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDeviceTest.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.android;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertNotNull;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -168,7 +167,7 @@ public class AndroidDeviceTest extends BuildViewTestCase {
             getToolDependencyExecPathString("//tools/android/emulator:support_file1"),
             getToolDependencyExecPathString("//tools/android/emulator:support_file2"));
 
-    assertNotNull(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey()));
+    assertThat(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey())).isNotNull();
     ExecutionInfoProvider executionInfoProvider =
         (ExecutionInfoProvider) target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey());
     assertThat(executionInfoProvider.getExecutionInfo()).doesNotContainKey(REQUIRES_KVM);
@@ -228,7 +227,7 @@ public class AndroidDeviceTest extends BuildViewTestCase {
 
     assertThat(action.getExecutionInfo())
         .containsEntry(REQUIRES_KVM, "");
-    assertNotNull(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey()));
+    assertThat(target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey())).isNotNull();
     assertThat(
             ((ExecutionInfoProvider) target.get(ExecutionInfoProvider.SKYLARK_CONSTRUCTOR.getKey()))
                 .getExecutionInfo())
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 706c08c748..3f92a65f4b 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
@@ -15,10 +15,6 @@ package com.google.devtools.build.lib.rules.android;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -169,7 +165,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
         "android_library(name = 'b', srcs = ['B.java'])");
     Artifact artifact = getFileConfiguredTarget("//java/android/strict:libb.jar").getArtifact();
     JavaCompileAction compileAction = (JavaCompileAction) getGeneratingAction(artifact);
-    assertEquals(BuildConfiguration.StrictDepsMode.OFF, compileAction.getStrictJavaDepsMode());
+    assertThat(compileAction.getStrictJavaDepsMode())
+        .isEqualTo(BuildConfiguration.StrictDepsMode.OFF);
   }
 
   @Test
@@ -178,7 +175,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
         "android_library(name = 'b', srcs = ['B.java'])");
     Artifact artifact = getFileConfiguredTarget("//java/android/strict:libb.jar").getArtifact();
     JavaCompileAction compileAction = (JavaCompileAction) getGeneratingAction(artifact);
-    assertEquals(BuildConfiguration.StrictDepsMode.ERROR, compileAction.getStrictJavaDepsMode());
+    assertThat(compileAction.getStrictJavaDepsMode())
+        .isEqualTo(BuildConfiguration.StrictDepsMode.ERROR);
   }
 
   @Test
@@ -188,7 +186,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
         "android_library(name = 'b', srcs = ['B.java'])");
     Artifact artifact = getFileConfiguredTarget("//java/android/strict:libb.jar").getArtifact();
     JavaCompileAction compileAction = (JavaCompileAction) getGeneratingAction(artifact);
-    assertEquals(BuildConfiguration.StrictDepsMode.WARN, compileAction.getStrictJavaDepsMode());
+    assertThat(compileAction.getStrictJavaDepsMode())
+        .isEqualTo(BuildConfiguration.StrictDepsMode.WARN);
   }
 
   @Test
@@ -213,11 +212,12 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     assertThat(javacAction.getProcessorNames()).contains("com.google.process.stuff");
     assertThat(javacAction.getProcessorNames()).hasSize(1);
 
-    assertEquals("libplugin.jar libplugin_dep.jar", ActionsTestUtil.baseNamesOf(
-        javacAction.getProcessorpath()));
-    assertEquals("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java",
-        actionsTestUtil().predecessorClosureOf(getFilesToBuild(target),
-            JavaSemantics.JAVA_SOURCE));
+    assertThat(ActionsTestUtil.baseNamesOf(javacAction.getProcessorpath()))
+        .isEqualTo("libplugin.jar libplugin_dep.jar");
+    assertThat(
+            actionsTestUtil()
+                .predecessorClosureOf(getFilesToBuild(target), JavaSemantics.JAVA_SOURCE))
+        .isEqualTo("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java");
   }
 
   // Same test as above, enabling the plugin through the command line.
@@ -241,11 +241,12 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
 
     assertThat(javacAction.getProcessorNames()).contains("com.google.process.stuff");
     assertThat(javacAction.getProcessorNames()).hasSize(1);
-    assertEquals("libplugin.jar libplugin_dep.jar",
-        ActionsTestUtil.baseNamesOf(javacAction.getProcessorpath()));
-    assertEquals("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java",
-        actionsTestUtil().predecessorClosureOf(getFilesToBuild(target),
-            JavaSemantics.JAVA_SOURCE));
+    assertThat(ActionsTestUtil.baseNamesOf(javacAction.getProcessorpath()))
+        .isEqualTo("libplugin.jar libplugin_dep.jar");
+    assertThat(
+            actionsTestUtil()
+                .predecessorClosureOf(getFilesToBuild(target), JavaSemantics.JAVA_SOURCE))
+        .isEqualTo("ToBeProcessed.java AnnotationProcessor.java ProcessorDep.java");
   }
 
   @Test
@@ -380,11 +381,11 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget bTarget = getConfiguredTarget("//java/exports:b");
     ConfiguredTarget cTarget = getConfiguredTarget("//java/exports:c");
 
-    assertEquals(Arrays.asList("liba.jar"),
-        ActionsTestUtil.baseArtifactNames(getDefaultRunfiles(bTarget).getArtifacts()));
+    assertThat(ActionsTestUtil.baseArtifactNames(getDefaultRunfiles(bTarget).getArtifacts()))
+        .isEqualTo(Arrays.asList("liba.jar"));
 
-    assertEquals(Arrays.asList("liba.jar", "libc.jar"),
-        ActionsTestUtil.baseArtifactNames(getDefaultRunfiles(cTarget).getArtifacts()));
+    assertThat(ActionsTestUtil.baseArtifactNames(getDefaultRunfiles(cTarget).getArtifacts()))
+        .isEqualTo(Arrays.asList("liba.jar", "libc.jar"));
 
     assertNoEvents();
   }
@@ -414,9 +415,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
 
     ConfiguredTarget bTarget = getConfiguredTarget("//java/exports:b");
 
-    assertEquals(
-        ActionsTestUtil.baseArtifactNames(getDefaultRunfiles(bTarget).getArtifacts()),
-        Arrays.asList("data.txt", "liba.jar", "libb.jar"));
+    assertThat(Arrays.asList("data.txt", "liba.jar", "libb.jar"))
+        .isEqualTo(ActionsTestUtil.baseArtifactNames(getDefaultRunfiles(bTarget).getArtifacts()));
     assertNoEvents();
   }
 
@@ -481,7 +481,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     SpawnAction sourceJarAction = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith(
         actionsTestUtil().artifactClosureOf(outputGroup), "libidl-idl.srcjar");
 
-    assertSame(classJarAction, sourceJarAction);
+    assertThat(sourceJarAction).isSameAs(classJarAction);
 
     PathFragment genfilesPath =
         getTargetConfiguration()
@@ -598,16 +598,20 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget binary = getConfiguredTarget("//java/com/google/android/hello:binary");
     Action action = actionsTestUtil().getActionForArtifactEndingWith(
         getFilesToBuild(binary), "_proguard.jar");
-    assertNotNull(ActionsTestUtil.getFirstArtifactEndingWith(action.getInputs(),
-        "sdk/aidl_lib.cfg_valid"));
+    assertThat(
+            ActionsTestUtil.getFirstArtifactEndingWith(
+                action.getInputs(), "sdk/aidl_lib.cfg_valid"))
+        .isNotNull();
 
     // Targets without AIDL-generated sources don't care
     ConfiguredTarget binaryNoIdl =
         getConfiguredTarget("//java/com/google/android/hello:binary_no_idl");
     Action actionNoIdl = actionsTestUtil().getActionForArtifactEndingWith(
         getFilesToBuild(binaryNoIdl), "_proguard.jar");
-    assertNull(ActionsTestUtil.getFirstArtifactEndingWith(actionNoIdl.getInputs(),
-        "sdk/aidl_lib.cfg_valid"));
+    assertThat(
+            ActionsTestUtil.getFirstArtifactEndingWith(
+                actionNoIdl.getInputs(), "sdk/aidl_lib.cfg_valid"))
+        .isNull();
   }
 
   private List<String> getTransitiveDependentResourceDirs(
@@ -879,8 +883,9 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
         "                manifest = 'AndroidManifest.xml',",
         "                )");
     ConfiguredTarget foo = getConfiguredTarget("//java/android:r");
-    assertEquals(getTargetConfiguration().getBinDirectory(RepositoryName.MAIN),
-        ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(foo), "r.srcjar").getRoot());
+    assertThat(
+            ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(foo), "r.srcjar").getRoot())
+        .isEqualTo(getTargetConfiguration().getBinDirectory(RepositoryName.MAIN));
   }
 
   // regression test for #3294893
@@ -1055,7 +1060,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget foo = getConfiguredTarget(target);
     SpawnAction action = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith(
         getFilesToBuild(foo), "r.srcjar");
-    assertEquals(isDebug, action.getArguments().contains("--debug"));
+    assertThat(action.getArguments().contains("--debug")).isEqualTo(isDebug);
   }
 
   @Test
@@ -1106,7 +1111,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     SpawnAction action = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith(
         actionsTestUtil().artifactClosureOf(getFilesToBuild(target)), "MyInterface.java");
     assertThat(action.getArguments())
-        .containsAllIn(ImmutableList.of("-Ijava", "-I" + genfilesJavaPath.getPathString()));
+        .containsAllOf("-Ijava", "-I" + genfilesJavaPath.getPathString());
   }
 
   @Test
@@ -1137,36 +1142,34 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
         "Nabu nabu!");
     ConfiguredTarget target = getConfiguredTarget("//java/android:r");
     final AndroidIdeInfoProvider provider = target.getProvider(AndroidIdeInfoProvider.class);
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create("java/android/assets")),
-            SourceDirectory.fromRoot(
-                targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
-                PathFragment.create("java/android/assets"))),
-        provider.getAssetDirs());
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create("java/android/res"))),
-        provider.getResourceDirs());
-
-    assertEquals(ImmutableList.of(SourceDirectory.fromSourceRoot(
-        rootDirectory.asFragment(),
-        PathFragment.create("java/android")
-    )), provider.getIdlImports());
+    assertThat(provider.getAssetDirs())
+        .isEqualTo(
+            ImmutableList.of(
+                SourceDirectory.fromSourceRoot(
+                    rootDirectory.asFragment(), PathFragment.create("java/android/assets")),
+                SourceDirectory.fromRoot(
+                    targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
+                    PathFragment.create("java/android/assets"))));
+    assertThat(provider.getResourceDirs())
+        .isEqualTo(
+            ImmutableList.of(
+                SourceDirectory.fromSourceRoot(
+                    rootDirectory.asFragment(), PathFragment.create("java/android/res"))));
+
+    assertThat(provider.getIdlImports())
+        .isEqualTo(
+            ImmutableList.of(
+                SourceDirectory.fromSourceRoot(
+                    rootDirectory.asFragment(), PathFragment.create("java/android"))));
 
     Set<Artifact> artifactClosure = actionsTestUtil().artifactClosureOf(getFilesToBuild(target));
-    assertEquals(
-        ActionsTestUtil.getFirstArtifactEndingWith(artifactClosure,
-            "java/android/AndroidManifest.xml"),
-        provider.getManifest());
+    assertThat(provider.getManifest())
+        .isEqualTo(
+            ActionsTestUtil.getFirstArtifactEndingWith(
+                artifactClosure, "java/android/AndroidManifest.xml"));
     ResourceContainer resources = getOnlyElement(getConfiguredTarget("//java/android:r")
         .getProvider(AndroidResourcesProvider.class).getDirectAndroidResources());
-    assertEquals(resources.getManifest(),
-        provider.getGeneratedManifest());
+    assertThat(provider.getGeneratedManifest()).isEqualTo(resources.getManifest());
   }
 
   @Test
@@ -1188,44 +1191,42 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget target = getConfiguredTarget(
         "//research/handwriting/java/com/google/research/handwriting:r");
     final AndroidIdeInfoProvider provider = target.getProvider(AndroidIdeInfoProvider.class);
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create(
-                    "research/handwriting/java/com/google/research/handwriting/assets")
-            ),
-            SourceDirectory.fromRoot(
-                targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
-                PathFragment.create(
-                    "research/handwriting/java/com/google/research/handwriting/assets")
-            )
-        ),
-        provider.getAssetDirs());
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create("research/handwriting/java/com/google/research/handwriting/res")
-            )
-        ),
-        provider.getResourceDirs());
-
-    assertEquals(ImmutableList.of(SourceDirectory.fromSourceRoot(
-        rootDirectory.asFragment(),
-        PathFragment.create("research/handwriting/java/com/google/research/handwriting")
-    )), provider.getIdlImports());
+    assertThat(provider.getAssetDirs())
+        .isEqualTo(
+            ImmutableList.of(
+                SourceDirectory.fromSourceRoot(
+                    rootDirectory.asFragment(),
+                    PathFragment.create(
+                        "research/handwriting/java/com/google/research/handwriting/assets")),
+                SourceDirectory.fromRoot(
+                    targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
+                    PathFragment.create(
+                        "research/handwriting/java/com/google/research/handwriting/assets"))));
+    assertThat(provider.getResourceDirs())
+        .isEqualTo(
+            ImmutableList.of(
+                SourceDirectory.fromSourceRoot(
+                    rootDirectory.asFragment(),
+                    PathFragment.create(
+                        "research/handwriting/java/com/google/research/handwriting/res"))));
+
+    assertThat(provider.getIdlImports())
+        .isEqualTo(
+            ImmutableList.of(
+                SourceDirectory.fromSourceRoot(
+                    rootDirectory.asFragment(),
+                    PathFragment.create(
+                        "research/handwriting/java/com/google/research/handwriting"))));
 
     Set<Artifact> artifactClosure = actionsTestUtil().artifactClosureOf(getFilesToBuild(target));
-    assertEquals(
-        ActionsTestUtil.getFirstArtifactEndingWith(artifactClosure,
-            "handwriting/AndroidManifest.xml"),
-        provider.getManifest());
+    assertThat(provider.getManifest())
+        .isEqualTo(
+            ActionsTestUtil.getFirstArtifactEndingWith(
+                artifactClosure, "handwriting/AndroidManifest.xml"));
     ResourceContainer resources = getOnlyElement(
         getConfiguredTarget("//research/handwriting/java/com/google/research/handwriting:r")
             .getProvider(AndroidResourcesProvider.class).getDirectAndroidResources());
-    assertEquals(resources.getManifest(),
-        provider.getGeneratedManifest());
+    assertThat(provider.getGeneratedManifest()).isEqualTo(resources.getManifest());
   }
 
   @Test
@@ -1249,44 +1250,31 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
         "Nabu nabu!");
     ConfiguredTarget target = getConfiguredTarget("//java/android:r");
     final AndroidIdeInfoProvider provider = target.getProvider(AndroidIdeInfoProvider.class);
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create("java/android/assets")),
-            SourceDirectory.fromRoot(
-                targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
-                PathFragment.create("java/android/assets"))
-        ),
-        provider.getAssetDirs());
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create("java/android/res"))
-        ),
-        provider.getResourceDirs());
-
-    assertEquals(
-        ImmutableList.of(
-            SourceDirectory.fromSourceRoot(
-                rootDirectory.asFragment(),
-                PathFragment.create("java/android")),
-            SourceDirectory.fromRoot(
-                targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
-                PathFragment.create("java/android"))
-        ),
-        provider.getIdlImports());
+    assertThat(provider.getAssetDirs()).containsExactly(
+        SourceDirectory.fromSourceRoot(
+            rootDirectory.asFragment(), PathFragment.create("java/android/assets")),
+        SourceDirectory.fromRoot(
+            targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
+            PathFragment.create("java/android/assets")));
+    assertThat(provider.getResourceDirs()).containsExactly(
+        SourceDirectory.fromSourceRoot(
+            rootDirectory.asFragment(), PathFragment.create("java/android/res")));
+
+    assertThat(provider.getIdlImports()).containsExactly(
+        SourceDirectory.fromSourceRoot(
+            rootDirectory.asFragment(), PathFragment.create("java/android")),
+        SourceDirectory.fromRoot(
+            targetConfig.getGenfilesDirectory(RepositoryName.MAIN),
+            PathFragment.create("java/android")));
 
     Set<Artifact> artifactClosure = actionsTestUtil().artifactClosureOf(getFilesToBuild(target));
-    assertEquals(
-        ActionsTestUtil.getFirstArtifactEndingWith(artifactClosure,
-            "java/android/AndroidManifest.xml"),
-        provider.getManifest());
+    assertThat(provider.getManifest())
+        .isEqualTo(
+            ActionsTestUtil.getFirstArtifactEndingWith(
+                artifactClosure, "java/android/AndroidManifest.xml"));
     ResourceContainer resources = getOnlyElement(getConfiguredTarget("//java/android:r")
         .getProvider(AndroidResourcesProvider.class).getDirectAndroidResources());
-    assertEquals(resources.getManifest(),
-        provider.getGeneratedManifest());
+    assertThat(provider.getGeneratedManifest()).isEqualTo(resources.getManifest());
   }
 
   @Test
@@ -1467,7 +1455,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     assertThat(provider).isNotNull();
     assertThat(provider.getTransitiveAars()).hasSize(1);
   }
-  
+
   @Test
   public void testAndroidLibraryWithTestOnlySetsTestOnly() throws Exception {
     scratch.file(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkSplitTransitionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkSplitTransitionTest.java
index 394ca4f4c2..738356f258 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkSplitTransitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkSplitTransitionTest.java
@@ -108,8 +108,8 @@ public class AndroidSkylarkSplitTransitionTest extends BuildViewTestCase {
     for (ConfiguredTarget ct : attrDeps) {
       attrDepsMap.put(ct.getConfiguration().getCpu(), target);
     }
-    assertThat(attrDepsMap.get("k8")).hasSize(2);
-    assertThat(attrDepsMap.get("armeabi-v7a")).hasSize(2);
+    assertThat(attrDepsMap).valuesForKey("k8").hasSize(2);
+    assertThat(attrDepsMap).valuesForKey("armeabi-v7a").hasSize(2);
 
     // Check that even though my_rule.dep is defined as a single label, ctx.attr.dep is still a list
     // with multiple ConfiguredTarget objects because of the two different CPUs. 
@@ -120,8 +120,8 @@ public class AndroidSkylarkSplitTransitionTest extends BuildViewTestCase {
     for (ConfiguredTarget ct : attrDep) {
       attrDepMap.put(ct.getConfiguration().getCpu(), target);
     }
-    assertThat(attrDepMap.get("k8")).hasSize(1);
-    assertThat(attrDepMap.get("armeabi-v7a")).hasSize(1);
+    assertThat(attrDepMap).valuesForKey("k8").hasSize(1);
+    assertThat(attrDepMap).valuesForKey("armeabi-v7a").hasSize(1);
 
     // Check that the deps were correctly accessed from within Skylark.
     @SuppressWarnings("unchecked")