Automatic code cleanup. PiperOrigin-RevId: 245427797

diff --git a/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java b/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java
index 319fa48..6d6c0cf 100644
--- a/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/android/AaptCommandBuilderTest.java

@@ -297,6 +297,6 @@
                 .map(Splitter.on(' ')::split)
                 .flatMap(Streams::stream)
                 .collect(toList()))
-        .containsAllIn(resources);
+        .containsAtLeastElementsIn(resources);
   }
 }

diff --git a/src/test/java/com/google/devtools/build/android/PathsSubject.java b/src/test/java/com/google/devtools/build/android/PathsSubject.java
index 4abe1fc..d29b566 100644
--- a/src/test/java/com/google/devtools/build/android/PathsSubject.java
+++ b/src/test/java/com/google/devtools/build/android/PathsSubject.java

@@ -77,10 +77,10 @@
     assertThat(
             new ZipFile(actual().toFile())
                 .stream()
-                .map(ZipEntry::getName)
-                .map(n -> n.replaceAll(PATH_NORMALIZER, "$1/$3"))
-                .collect(Collectors.toSet()))
-        .containsAllIn(Arrays.asList(paths));
+                    .map(ZipEntry::getName)
+                    .map(n -> n.replaceAll(PATH_NORMALIZER, "$1/$3"))
+                    .collect(Collectors.toSet()))
+        .containsAtLeastElementsIn(Arrays.asList(paths));
   }
 
   void containsExactlyArchivedFilesIn(String... paths) throws IOException {

diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
index 4a24baa..72aafeb 100644
--- a/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
+++ b/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java

@@ -329,7 +329,7 @@
     if (minimalMainDex) {
       assertThat(dexFiles.get("classes.dex")).containsExactlyElementsIn(mainDexList);
     } else {
-      assertThat(dexFiles.get("classes.dex")).containsAllIn(mainDexList);
+      assertThat(dexFiles.get("classes.dex")).containsAtLeastElementsIn(mainDexList);
     }
   }
 

diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexFileSplitterTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexFileSplitterTest.java
index d70d965..8390215 100644
--- a/src/test/java/com/google/devtools/build/android/dexer/DexFileSplitterTest.java
+++ b/src/test/java/com/google/devtools/build/android/dexer/DexFileSplitterTest.java

@@ -155,7 +155,7 @@
     ImmutableSet<String> expectedEntries = dexEntries(dexArchive);
     assertThat(outputArchives.size()).isGreaterThan(1); // test sanity
     assertThat(dexEntries(outputArchives.get(0)))
-        .containsAllIn(expectedMainDexEntries());
+        .containsAtLeastElementsIn(expectedMainDexEntries());
     assertExpectedEntries(outputArchives, expectedEntries);
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintCollectionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintCollectionTest.java
index 2f5ab66..a6b9839 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintCollectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/ConstraintCollectionTest.java

@@ -95,6 +95,7 @@
     ConstraintCollection collection2 =
         ConstraintCollection.builder().addConstraints(value1, value2b).build();
     assertThat(collection1.diff(collection2)).containsExactly(setting2);
-    assertThat(collection1.diff(collection2)).containsAllIn(collection2.diff(collection1));
+    assertThat(collection1.diff(collection2))
+        .containsAtLeastElementsIn(collection2.diff(collection1));
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/query2/ActionGraphProtoOutputFormatterCallbackTest.java b/src/test/java/com/google/devtools/build/lib/query2/ActionGraphProtoOutputFormatterCallbackTest.java
index 4867a3a..1cbe68d 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/ActionGraphProtoOutputFormatterCallbackTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/ActionGraphProtoOutputFormatterCallbackTest.java

@@ -405,7 +405,7 @@
     ParamFile paramFile = Iterables.getOnlyElement(cppLinkAction.getParamFilesList());
     Set<String> cmdlineArgs = new HashSet<>(cppLinkAction.getArgumentsList());
     Set<String> paramFileArgs = new HashSet<>(paramFile.getArgumentsList());
-    assertThat(cmdlineArgs).containsAllIn(paramFileArgs);
+    assertThat(cmdlineArgs).containsAtLeastElementsIn(paramFileArgs);
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java
index 70d1512..041e655 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java

@@ -196,7 +196,8 @@
 
     // Check for implicit dependencies (late bound attributes, implicit attributes, platforms)
     assertThat(evalToListOfStrings("deps(//test:my_rule)"))
-        .containsAllIn(evalToListOfStrings(explicits + " + " + implicits + " + " + PLATFORM_LABEL));
+        .containsAtLeastElementsIn(
+            evalToListOfStrings(explicits + " + " + implicits + " + " + PLATFORM_LABEL));
 
     helper.setQuerySettings(Setting.NO_IMPLICIT_DEPS);
     assertThat(evalToListOfStrings("deps(//test:my_rule)"))

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 70b7ab3..78a417e 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

@@ -458,7 +458,7 @@
         .that(getGeneratingLabelForArtifact(linkedLib))
         .isEqualTo(target.getLabel());
     assertThat(artifactsToStrings(actionsTestUtil().artifactClosureOf(linkedLib)))
-        .containsAllIn(ImmutableSet.copyOf(Arrays.asList(srcNames)));
+        .containsAtLeastElementsIn(ImmutableSet.copyOf(Arrays.asList(srcNames)));
   }
 
   @Test
@@ -1289,7 +1289,7 @@
     assertThat(resourceContentsPaths(dir, directResources)).containsExactlyElementsIn(resources);
 
     // Validate that the input to resource processing contains all values.
-    assertThat(resourceInputPaths(dir, directResources)).containsAllIn(resources);
+    assertThat(resourceInputPaths(dir, directResources)).containsAtLeastElementsIn(resources);
 
     // Validate that the filters are correctly passed to the resource processing action
     // This includes trimming whitespace and ignoring empty filters.
@@ -1637,7 +1637,8 @@
         .containsExactlyElementsIn(expectedResources);
 
     // Validate that the input to resource processing contains only the filtered values.
-    assertThat(resourceInputPaths(dir, directResources)).containsAllIn(expectedResources);
+    assertThat(resourceInputPaths(dir, directResources))
+        .containsAtLeastElementsIn(expectedResources);
     assertThat(resourceInputPaths(dir, directResources)).containsNoneIn(unexpectedResources);
 
     // Only transitive resources need to be ignored when filtered,, and there aren't any here.

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 ffbf57f..e64d9e9 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

@@ -78,7 +78,7 @@
           .isNotEqualTo(target.getLabel());
     }
     assertThat(artifactsToStrings(copiedLibs))
-        .containsAllIn(ImmutableSet.copyOf(Arrays.asList(expectedLibNames)));
+        .containsAtLeastElementsIn(ImmutableSet.copyOf(Arrays.asList(expectedLibNames)));
   }
 
   protected String flagValue(String flag, List<String> args) {
@@ -173,7 +173,7 @@
     } else {
       fail(String.format("Failed to parse --primaryData: %s", actualFlagValue));
     }
-    assertThat(actualPaths).containsAllIn(expectedPaths);
+    assertThat(actualPaths).containsAtLeastElementsIn(expectedPaths);
   }
 
   protected List<String> getDirectDependentResourceDirs(List<String> actualArgs) {

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
index c031621..3263dd3 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java

@@ -215,14 +215,14 @@
             "-Aandroid.databinding.exportClassListTo=/tmp/exported_classes",
             "-Aandroid.databinding.modulePackage=android.binary",
             "-Aandroid.databinding.minApi=14");
-    assertThat(getJavacArguments(binCompileAction)).containsAllIn(expectedJavacopts);
+    assertThat(getJavacArguments(binCompileAction)).containsAtLeastElementsIn(expectedJavacopts);
 
     // Regression test for b/63134122
     JavaCompileInfo javaCompileInfo =
         binCompileAction
             .getExtraActionInfo(actionKeyContext)
             .getExtension(JavaCompileInfo.javaCompileInfo);
-    assertThat(javaCompileInfo.getJavacOptList()).containsAllIn(expectedJavacopts);
+    assertThat(javaCompileInfo.getJavacOptList()).containsAtLeastElementsIn(expectedJavacopts);
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingV2Test.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingV2Test.java
index 750d63a..c4f2b29 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingV2Test.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingV2Test.java

@@ -246,14 +246,14 @@
             "-Aandroid.databinding.enableV2=1",
             // Note that this includes only android.library and not android.library2
             "-Aandroid.databinding.directDependencyPkgs=[android.library]");
-    assertThat(getJavacArguments(binCompileAction)).containsAllIn(expectedJavacopts);
+    assertThat(getJavacArguments(binCompileAction)).containsAtLeastElementsIn(expectedJavacopts);
 
     // Regression test for b/63134122
     JavaCompileInfo javaCompileInfo =
         binCompileAction
             .getExtraActionInfo(actionKeyContext)
             .getExtension(JavaCompileInfo.javaCompileInfo);
-    assertThat(javaCompileInfo.getJavacOptList()).containsAllIn(expectedJavacopts);
+    assertThat(javaCompileInfo.getJavacOptList()).containsAtLeastElementsIn(expectedJavacopts);
   }
 
   @Test
@@ -287,13 +287,13 @@
             "-Aandroid.databinding.enableV2=1",
             // Note that this includes only android.library and not android.library2
             "-Aandroid.databinding.directDependencyPkgs=[android.library]");
-    assertThat(getJavacArguments(binCompileAction)).containsAllIn(expectedJavacopts);
+    assertThat(getJavacArguments(binCompileAction)).containsAtLeastElementsIn(expectedJavacopts);
 
     JavaCompileInfo javaCompileInfo =
         binCompileAction
             .getExtraActionInfo(actionKeyContext)
             .getExtension(JavaCompileInfo.javaCompileInfo);
-    assertThat(javaCompileInfo.getJavacOptList()).containsAllIn(expectedJavacopts);
+    assertThat(javaCompileInfo.getJavacOptList()).containsAtLeastElementsIn(expectedJavacopts);
   }
 
   @Test
@@ -1015,7 +1015,7 @@
     ImmutableList<String> expectedJavacopts =
         ImmutableList.of(
             "-Aandroid.databinding.directDependencyPkgs=[android.library1,android.library2]");
-    assertThat(getJavacArguments(binCompileAction)).containsAllIn(expectedJavacopts);
+    assertThat(getJavacArguments(binCompileAction)).containsAtLeastElementsIn(expectedJavacopts);
   }
 
   @Test
@@ -1035,7 +1035,7 @@
     ImmutableList<String> expectedJavacopts =
         ImmutableList.of("-Aandroid.databinding.directDependencyPkgs="
             + "[android.lib_with_exports,android.library1,android.library2]");
-    assertThat(getJavacArguments(binCompileAction)).containsAllIn(expectedJavacopts);
+    assertThat(getJavacArguments(binCompileAction)).containsAtLeastElementsIn(expectedJavacopts);
   }
 
   @Test
@@ -1062,7 +1062,7 @@
 
     ImmutableList<String> expectedJavacopts =
         ImmutableList.of("-Aandroid.databinding.directDependencyPkgs=[]");
-    assertThat(getJavacArguments(binCompileAction)).containsAllIn(expectedJavacopts);
+    assertThat(getJavacArguments(binCompileAction)).containsAtLeastElementsIn(expectedJavacopts);
   }
 
 }

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
index 93b6241..517b44a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java

@@ -132,19 +132,19 @@
             .getDefaultRunfiles()
             .getAllArtifacts();
     assertThat(runfiles)
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             getHostConfiguredTarget("//tools/android/emulated_device:nexus_6")
                 .getProvider(RunfilesProvider.class)
                 .getDefaultRunfiles()
                 .getAllArtifacts());
     assertThat(runfiles)
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             getHostConfiguredTarget("//java/com/server")
                 .getProvider(RunfilesProvider.class)
                 .getDefaultRunfiles()
                 .getAllArtifacts());
     assertThat(runfiles)
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             getHostConfiguredTarget(
                     androidInstrumentationTest
                         .getTarget()

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 f6e1da3..382b0f7 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

@@ -2185,11 +2185,11 @@
 
     assertThat(bClasspath).isEmpty();
     assertThat(cClasspath)
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             JavaInfo.getProvider(JavaCompilationArgsProvider.class, aTarget)
                 .getDirectCompileTimeJars());
     assertThat(cClasspath)
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             JavaInfo.getProvider(JavaCompilationArgsProvider.class, bTarget)
                 .getDirectCompileTimeJars());
     assertNoEvents();

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
index 3baaac1..96d8c2c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java

@@ -81,7 +81,9 @@
     ImmutableList<String> userCopts =
         CcToolchainVariables.toStringList(
             variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName());
-    assertThat(userCopts).containsAllIn(ImmutableList.<String>of("-foo", "-bar")).inOrder();
+    assertThat(userCopts)
+        .containsAtLeastElementsIn(ImmutableList.<String>of("-foo", "-bar"))
+        .inOrder();
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index 2813860..ca9b4af 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java

@@ -912,7 +912,7 @@
       Iterable<String> arguments,
       Iterable<String> allowedArguments,
       Iterable<String> disallowedArguments) {
-    assertThat(arguments).containsAllIn(allowedArguments);
+    assertThat(arguments).containsAtLeastElementsIn(allowedArguments);
     assertThat(arguments).containsNoneIn(disallowedArguments);
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index 5a68ab6..94e225c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java

@@ -834,7 +834,8 @@
     Artifact binArtifact = getFirstArtifactEndingWith(lipoAction.getInputs(), "x/x_bin");
     CommandAction linkAction = (CommandAction) getGeneratingAction(binArtifact);
 
-    assertThat(linkAction.getArguments()).containsAllIn(IMPLICIT_NON_MAC_FRAMEWORK_FLAGS);
+    assertThat(linkAction.getArguments())
+        .containsAtLeastElementsIn(IMPLICIT_NON_MAC_FRAMEWORK_FLAGS);
   }
 
   @Test
@@ -849,7 +850,8 @@
     Artifact binArtifact = getFirstArtifactEndingWith(lipoAction.getInputs(), "x/x_bin");
     CommandAction linkAction = (CommandAction) getGeneratingAction(binArtifact);
 
-    assertThat(linkAction.getArguments()).containsAllIn(IMPLICIT_NON_MAC_FRAMEWORK_FLAGS);
+    assertThat(linkAction.getArguments())
+        .containsAtLeastElementsIn(IMPLICIT_NON_MAC_FRAMEWORK_FLAGS);
   }
 
   @Test
@@ -864,7 +866,8 @@
     Artifact binArtifact = getFirstArtifactEndingWith(lipoAction.getInputs(), "x/x_bin");
     CommandAction linkAction = (CommandAction) getGeneratingAction(binArtifact);
 
-    assertThat(linkAction.getArguments()).containsAllIn(IMPLICIT_NON_MAC_FRAMEWORK_FLAGS);
+    assertThat(linkAction.getArguments())
+        .containsAtLeastElementsIn(IMPLICIT_NON_MAC_FRAMEWORK_FLAGS);
   }
 
   @Test
@@ -879,7 +882,7 @@
     Artifact binArtifact = getFirstArtifactEndingWith(lipoAction.getInputs(), "x/x_bin");
     CommandAction linkAction = (CommandAction) getGeneratingAction(binArtifact);
 
-    assertThat(linkAction.getArguments()).containsAllIn(IMPLICIT_MAC_FRAMEWORK_FLAGS);
+    assertThat(linkAction.getArguments()).containsAtLeastElementsIn(IMPLICIT_MAC_FRAMEWORK_FLAGS);
     assertThat(linkAction.getArguments())
         .containsNoneOf(COCOA_FRAMEWORK_FLAG, UIKIT_FRAMEWORK_FLAG);
   }
@@ -897,8 +900,8 @@
     Artifact binArtifact = getFirstArtifactEndingWith(lipoAction.getInputs(), "x/x_bin");
     CommandAction linkAction = (CommandAction) getGeneratingAction(binArtifact);
 
-    assertThat(linkAction.getArguments()).containsAllIn(IMPLICIT_MAC_FRAMEWORK_FLAGS);
-    assertThat(linkAction.getArguments()).containsAllIn(COCOA_FEATURE_FLAGS);
+    assertThat(linkAction.getArguments()).containsAtLeastElementsIn(IMPLICIT_MAC_FRAMEWORK_FLAGS);
+    assertThat(linkAction.getArguments()).containsAtLeastElementsIn(COCOA_FEATURE_FLAGS);
     assertThat(linkAction.getArguments()).doesNotContain(UIKIT_FRAMEWORK_FLAG);
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index c466cd1..7bf4642 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java

@@ -530,7 +530,7 @@
       throws Exception {
     CommandAction compileAction = getObjcCompileAction(archiveFile, objFileName);
     assertThat(Artifact.toRootRelativePaths(compileAction.getPossibleInputsForTesting()))
-        .containsAllIn(compilationInputExecPaths);
+        .containsAtLeastElementsIn(compilationInputExecPaths);
   }
 
   protected CommandAction getObjcCompileAction(Artifact archiveFile, String objFileName)

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index cbca300..f9642e1 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java

@@ -440,15 +440,15 @@
                 compileActionA.getArguments(), "-F" + frameworkDir(ApplePlatform.IOS_SIMULATOR)))
         .isEqualTo(1);
     assertThat(compileActionA.getArguments())
-        .containsAllIn(AppleToolchain.DEFAULT_WARNINGS.values());
+        .containsAtLeastElementsIn(AppleToolchain.DEFAULT_WARNINGS.values());
     assertThat(compileActionA.getArguments())
-        .containsAllIn(CompilationSupport.DEFAULT_COMPILER_FLAGS);
+        .containsAtLeastElementsIn(CompilationSupport.DEFAULT_COMPILER_FLAGS);
     assertThat(compileActionA.getArguments())
-        .containsAllIn(CompilationSupport.SIMULATOR_COMPILE_FLAGS);
+        .containsAtLeastElementsIn(CompilationSupport.SIMULATOR_COMPILE_FLAGS);
     assertThat(compileActionA.getArguments()).contains("-fobjc-arc");
     assertThat(compileActionA.getArguments()).containsAllOf("-c", "objc/a.m");
     assertThat(compileActionNonArc.getArguments()).contains("-fno-objc-arc");
-    assertThat(compileActionA.getArguments()).containsAllIn(FASTBUILD_COPTS);
+    assertThat(compileActionA.getArguments()).containsAtLeastElementsIn(FASTBUILD_COPTS);
     assertThat(compileActionA.getArguments())
         .contains("-mios-simulator-version-min=" + DEFAULT_IOS_SDK_VERSION);
     assertThat(compileActionA.getArguments()).contains("-arch i386");
@@ -489,9 +489,9 @@
                 compileActionA.getArguments(), "-F" + frameworkDir(ApplePlatform.IOS_DEVICE)))
         .isEqualTo(1);
     assertThat(compileActionA.getArguments())
-        .containsAllIn(AppleToolchain.DEFAULT_WARNINGS.values());
+        .containsAtLeastElementsIn(AppleToolchain.DEFAULT_WARNINGS.values());
     assertThat(compileActionA.getArguments())
-        .containsAllIn(CompilationSupport.DEFAULT_COMPILER_FLAGS);
+        .containsAtLeastElementsIn(CompilationSupport.DEFAULT_COMPILER_FLAGS);
     assertThat(compileActionA.getArguments())
         .containsNoneIn(CompilationSupport.SIMULATOR_COMPILE_FLAGS);
 
@@ -499,7 +499,7 @@
     assertThat(compileActionA.getArguments()).containsAllOf("-c", "objc/a.m");
 
     assertThat(compileActionNonArc.getArguments()).contains("-fno-objc-arc");
-    assertThat(compileActionA.getArguments()).containsAllIn(FASTBUILD_COPTS);
+    assertThat(compileActionA.getArguments()).containsAtLeastElementsIn(FASTBUILD_COPTS);
     assertThat(compileActionA.getArguments())
         .contains("-miphoneos-version-min=" + DEFAULT_IOS_SDK_VERSION);
     assertThat(compileActionA.getArguments()).contains("-arch armv7");
@@ -620,7 +620,8 @@
 
     CommandAction compileActionA = compileAction(target, "a.o");
     assertThat(compileActionA.getArguments())
-        .containsAllIn(moduleMapArtifactArguments("//objc/library", "lib@a-foo_foobar"));
+        .containsAtLeastElementsIn(
+            moduleMapArtifactArguments("//objc/library", "lib@a-foo_foobar"));
     assertThat(compileActionA.getArguments()).contains("-fmodule-maps");
     assertThat(Artifact.toRootRelativePaths(compileActionA.getInputs()))
         .doesNotContain("objc/library/lib@a-foo_foobar.modulemaps/module.modulemap");
@@ -1349,7 +1350,7 @@
     CommandAction compileActionA = compileAction("//objc:lib", "a.o");
 
     assertThat(compileActionA.getArguments())
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             new ImmutableList.Builder<String>()
                 .addAll(AppleToolchain.DEFAULT_WARNINGS.values())
                 .add("-fexceptions")
@@ -1466,7 +1467,7 @@
     // for creating binaries but is ignored for libraries.
     CommandAction archiveAction = archiveAction("//depender_lib:lib");
     assertThat(archiveAction.getArguments())
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             new ImmutableList.Builder<String>()
                 .add("-static")
                 .add("-filelist")
@@ -1832,13 +1833,13 @@
         .setAndCreateFiles("srcs", "a.mm", "b.cc", "c.mm", "d.cxx", "e.c", "f.m", "g.C")
         .write();
     List<String> copts = ImmutableList.of("-fprofile-arcs", "-ftest-coverage");
-    assertThat(compileAction("//objc:x", "a.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "b.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "c.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "d.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "e.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "f.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "g.o").getArguments()).containsAllIn(copts);
+    assertThat(compileAction("//objc:x", "a.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "b.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "c.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "d.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "e.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "f.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "g.o").getArguments()).containsAtLeastElementsIn(copts);
   }
 
   @Test
@@ -1851,13 +1852,13 @@
         .setAndCreateFiles("srcs", "a.mm", "b.cc", "c.mm", "d.cxx", "e.c", "f.m", "g.C")
         .write();
     List<String> copts = ImmutableList.of("-fprofile-instr-generate", "-fcoverage-mapping");
-    assertThat(compileAction("//objc:x", "a.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "b.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "c.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "d.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "e.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "f.o").getArguments()).containsAllIn(copts);
-    assertThat(compileAction("//objc:x", "g.o").getArguments()).containsAllIn(copts);
+    assertThat(compileAction("//objc:x", "a.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "b.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "c.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "d.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "e.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "f.o").getArguments()).containsAtLeastElementsIn(copts);
+    assertThat(compileAction("//objc:x", "g.o").getArguments()).containsAtLeastElementsIn(copts);
    }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
index 6c86350..1da5a64 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java

@@ -297,7 +297,8 @@
             TestConstants.TOOLS_REPOSITORY_PATH_PREFIX + "tools/objc/protobuf_compiler_wrapper.sh",
             TestConstants.TOOLS_REPOSITORY_PATH_PREFIX + "tools/objc/protobuf_compiler_helper.py",
             TestConstants.TOOLS_REPOSITORY_PATH_PREFIX + "tools/objc/proto_support");
-    assertThat(Artifact.toRootRelativePaths(action.getInputs())).containsAllIn(protoInputs);
+    assertThat(Artifact.toRootRelativePaths(action.getInputs()))
+        .containsAtLeastElementsIn(protoInputs);
     assertThat(action.getInputs()).contains(inputFileList);
 
     FileWriteAction inputListAction = (FileWriteAction) getGeneratingAction(inputFileList);
@@ -320,7 +321,8 @@
         "package/file_a.proto",
         TestConstants.TOOLS_REPOSITORY_PATH_PREFIX + "objcproto/well_known_type.proto");
 
-    assertThat(Artifact.toRootRelativePaths(action.getInputs())).containsAllIn(protoInputs);
+    assertThat(Artifact.toRootRelativePaths(action.getInputs()))
+        .containsAtLeastElementsIn(protoInputs);
     assertThat(action.getInputs()).contains(inputFileList);
 
     FileWriteAction inputListAction = (FileWriteAction) getGeneratingAction(inputFileList);
@@ -556,7 +558,7 @@
     Artifact objListFile =
         ActionsTestUtil.getFirstArtifactEndingWith(linkedProtosAction.getInputs(), ".objlist");
     assertThat(linkedProtosAction.getArguments())
-        .containsAllIn(
+        .containsAtLeastElementsIn(
             ImmutableList.of(
                 "-static",
                 "-filelist",

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 58d5e72..9c9bff1 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java

@@ -726,10 +726,14 @@
     CommandAction protoActionC = (CommandAction) getGeneratingAction(protoHeaderC);
     CommandAction protoActionD = (CommandAction) getGeneratingAction(protoHeaderD);
 
-    assertThat(protoActionA.getInputs()).containsAllIn(protoProvider.getPortableProtoFilters());
-    assertThat(protoActionB.getInputs()).containsAllIn(protoProvider.getPortableProtoFilters());
-    assertThat(protoActionC.getInputs()).containsAllIn(protoProvider.getPortableProtoFilters());
-    assertThat(protoActionD.getInputs()).containsAllIn(protoProvider.getPortableProtoFilters());
+    assertThat(protoActionA.getInputs())
+        .containsAtLeastElementsIn(protoProvider.getPortableProtoFilters());
+    assertThat(protoActionB.getInputs())
+        .containsAtLeastElementsIn(protoProvider.getPortableProtoFilters());
+    assertThat(protoActionC.getInputs())
+        .containsAtLeastElementsIn(protoProvider.getPortableProtoFilters());
+    assertThat(protoActionD.getInputs())
+        .containsAtLeastElementsIn(protoProvider.getPortableProtoFilters());
 
     assertThat(Artifact.toExecPaths(protoActionA.getInputs())).contains("protos/data_a.proto");
     assertThat(Artifact.toExecPaths(protoActionA.getInputs()))
@@ -1026,7 +1030,7 @@
     CommandAction compileActionA = compileAction("//x:x", "a.o");
 
     assertThat(compileActionA.getArguments())
-        .containsAllIn(allExpectedCoptsBuilder.build());
+        .containsAtLeastElementsIn(allExpectedCoptsBuilder.build());
   }
 
   protected void checkClangCoptsForDebugModeWithoutGlib(RuleType ruleType) throws Exception {
@@ -1043,8 +1047,8 @@
     CommandAction compileActionA = compileAction("//x:x", "a.o");
 
     assertThat(compileActionA.getArguments())
-        .containsAllIn(allExpectedCoptsBuilder.build()).inOrder();
-
+        .containsAtLeastElementsIn(allExpectedCoptsBuilder.build())
+        .inOrder();
   }
 
   private void addTransitiveDefinesUsage(RuleType topLevelRuleType) throws Exception {

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
index 7598ed5..60ce28c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java

@@ -783,7 +783,7 @@
         " Test bar FINISH",
         " Test baz START",
         " Test baz FINISH");
-    assertThat(messages).containsAllIn(expectedMessages);
+    assertThat(messages).containsAtLeastElementsIn(expectedMessages);
 
     // Now do an incremental rebuild of bar and baz,
     // and check the incremental progress percentages.
@@ -798,6 +798,6 @@
         " Test bar FINISH",
         " Test baz START",
         " Test baz FINISH");
-    assertThat(messages).containsAllIn(expectedMessages);
+    assertThat(messages).containsAtLeastElementsIn(expectedMessages);
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java
index 345fb8d..a0748a0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java

@@ -212,7 +212,7 @@
     boolean result = visitor.sync(reporter, labels, keepGoing, 200);
     assertThat(result).isNotSameAs(expectError);
     assertThat(getVisitedLabels(asLabelSet(startingLabels), skyframeExecutor))
-        .containsAllIn(asLabelSet(expectedLabels));
+        .containsAtLeastElementsIn(asLabelSet(expectedLabels));
   }
 
   protected void syncPackages() throws InterruptedException {

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
index ed879d0..1a66d13 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java

@@ -147,7 +147,7 @@
     for (Artifact artifact : artifacts) {
       artifactFilenames.add(artifact.getFilename());
     }
-    assertThat(artifactFilenames.build()).containsAllIn(Lists.newArrayList(expected));
+    assertThat(artifactFilenames.build()).containsAtLeastElementsIn(Lists.newArrayList(expected));
   }
 
   protected Object evalRuleClassCode(String... lines) throws Exception {

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
index aba451c..5200d3a 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/GlobTest.java

@@ -469,7 +469,7 @@
     ImmutableList<String> paths = ImmutableList.of("a/A.java", "a/B.java", "a/b/C.java", "c.cc");
     assertThat(removeExcludes(paths, "**/*.java")).containsExactly("c.cc");
     assertThat(removeExcludes(paths, "a/**/*.java")).containsExactly("c.cc");
-    assertThat(removeExcludes(paths, "**/nomatch.*")).containsAllIn(paths);
+    assertThat(removeExcludes(paths, "**/nomatch.*")).containsAtLeastElementsIn(paths);
     assertThat(removeExcludes(paths, "a/A.java")).containsExactly("a/B.java", "a/b/C.java", "c.cc");
     assertThat(removeExcludes(paths, "a/?.java")).containsExactly("a/b/C.java", "c.cc");
     assertThat(removeExcludes(paths, "a/*/C.java")).containsExactly("a/A.java", "a/B.java", "c.cc");
@@ -483,3 +483,4 @@
         .containsExactly("a/b/*.java", "c.cc");
   }
 }
+