Migrate from containsAllIn to containsAtLeastElementsIn

The two behave identically, and containsAllIn is being removed.

More information:
  []
Tested:
    TAP --sample for global presubmit queue
    []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=246565417
This commit is contained in:
cpovirk 2019-05-03 13:40:15 -07:00 committed by jianglai
parent 7cb6d23884
commit 251ec1ed32
3 changed files with 5 additions and 3 deletions

View file

@ -64,7 +64,7 @@ public class ExportConstantsTest {
@Test @Test
public void testReportingKinds_areSubsetOfBackupKinds() { public void testReportingKinds_areSubsetOfBackupKinds() {
assertThat(getBackupKinds()).containsAllIn(getReportingKinds()); assertThat(getBackupKinds()).containsAtLeastElementsIn(getReportingKinds());
} }
private static void checkKindsMatchGoldenFile( private static void checkKindsMatchGoldenFile(

View file

@ -67,7 +67,9 @@ public class EntityClassesTest {
.filter(hasAnnotation(EntitySubclass.class)) .filter(hasAnnotation(EntitySubclass.class))
.map(Key::getKind) .map(Key::getKind)
.collect(toImmutableSet()); .collect(toImmutableSet());
assertWithMessage("base entity kinds").that(baseEntityKinds).containsAllIn(entitySubclassKinds); assertWithMessage("base entity kinds")
.that(baseEntityKinds)
.containsAtLeastElementsIn(entitySubclassKinds);
} }
@Test @Test

View file

@ -130,7 +130,7 @@ public class KillAllEppResourcesActionTest extends MapreduceTestCase<KillAllEppR
} }
} }
ImmutableMultimap<String, Object> beforeContents = getDatastoreContents(); ImmutableMultimap<String, Object> beforeContents = getDatastoreContents();
assertThat(beforeContents.keySet()).containsAllIn(AFFECTED_KINDS); assertThat(beforeContents.keySet()).containsAtLeastElementsIn(AFFECTED_KINDS);
assertThat(difference(beforeContents.keySet(), AFFECTED_KINDS)).isNotEmpty(); assertThat(difference(beforeContents.keySet(), AFFECTED_KINDS)).isNotEmpty();
runMapreduce(); runMapreduce();
ofy().clearSessionCache(); ofy().clearSessionCache();