From d312057ac40831629f4d14624154e5fa2352365d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Feb 2019 09:40:23 +0100 Subject: [PATCH] DATAGEODE-172 - Adapt tests to AssertJ 3.12.0. --- .../gemfire/domain/support/AbstractSliceSupportTests.java | 6 ++++-- .../data/gemfire/util/CollectionUtilsUnitTests.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java b/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java index 53cbe5a4..e9961bce 100644 --- a/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java +++ b/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.domain.support; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -31,6 +32,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.domain.Pageable; /** @@ -152,7 +154,7 @@ public class AbstractSliceSupportTests { @SuppressWarnings("unchecked") public void iteratorWithContent() { doReturn(Arrays.asList(1, 2, 3)).when(mockSlice).getContent(); - assertThat(mockSlice.iterator()).contains(1, 2, 3); - verify(mockSlice, times(1)).getContent(); + assertThat((Iterable) () -> mockSlice.iterator()).contains(1, 2, 3); + verify(mockSlice, atLeastOnce()).getContent(); } } diff --git a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java index 688fbd4a..0b055e33 100644 --- a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java @@ -435,7 +435,7 @@ public class CollectionUtilsUnitTests { Iterator iterator = CollectionUtils.nullSafeIterator(null); assertThat(iterator).isNotNull(); - assertThat(iterator).isEmpty(); + assertThat(iterator).isExhausted(); } @Test