Replace assertThat(stream.collect(toImmutableList())) with assertThat(stream)

In Truth8, we can do assertThat(stream) directly. It's less verbose and clearer
in most cases.

Note that for the "finishers" (e.g. "containsExactyElementsIn") - streams are
still not allowed. So when there is:
assertThat(stream.map(someTransformation).collect(toList()))
.containsExactlyElementsIn(expecteStream.map(someTransformation).collect(toList()));

I kept the .collect in the assertThat to preserve the symmetry with the
finisher.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179697587
This commit is contained in:
guyben 2017-12-20 09:48:20 -08:00 committed by Ben McIlwain
parent 50998136b1
commit 7d165a08cf
5 changed files with 14 additions and 48 deletions

View file

@ -18,11 +18,11 @@ import static com.google.appengine.tools.development.testing.LocalTaskQueueTestC
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Predicates.in;
import static com.google.common.base.Predicates.not;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.Iterables.getFirst;
import static com.google.common.collect.Multisets.containsOccurrences;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assert_;
import static com.google.common.truth.Truth8.assertThat;
import static google.registry.util.DiffUtils.prettyPrintEntityDeepDiff;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
@ -195,12 +195,7 @@ public class TaskQueueHelper {
Function<TaskStateInfo, String> propertyGetter,
String... expectedTaskProperties) throws Exception {
// Ordering is irrelevant but duplicates should be considered independently.
assertThat(
getQueueInfo(queueName)
.getTaskInfo()
.stream()
.map(propertyGetter)
.collect(toImmutableList()))
assertThat(getQueueInfo(queueName).getTaskInfo().stream().map(propertyGetter))
.containsExactly((Object[]) expectedTaskProperties);
}