From 528818b9fd7093c3f02441c4f73fb07b86e91d2b Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 28 Aug 2020 15:07:36 -0700 Subject: [PATCH] Mock SelectResults.iterator(). Change access modifier on GemFireMockObjectsSupport.mockSelectResults() to private. --- .../data/gemfire/tests/mock/GemFireMockObjectsSupport.java | 3 ++- .../tests/MockCacheQueryServiceInteractionsUnitTests.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java index 743e1cb..f36be98 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java @@ -2056,7 +2056,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { return mockQueryStatistics; } - public static SelectResults mockSelectResults() { + private static SelectResults mockSelectResults() { ObjectType mockObjectType = mock(ObjectType.class, withSettings().lenient()); @@ -2078,6 +2078,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { doReturn(Collections.emptySet()).when(mockSelectResults).asSet(); doReturn(mockCollectionType).when(mockSelectResults).getCollectionType(); doReturn(false).when(mockSelectResults).isModifiable(); + doReturn(Collections.emptyIterator()).when(mockSelectResults).iterator(); doReturn(0).when(mockSelectResults).occurrences(any()); doNothing().when(mockSelectResults).setElementType(any(ObjectType.class)); diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockCacheQueryServiceInteractionsUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockCacheQueryServiceInteractionsUnitTests.java index 6c02fb0..2006616 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockCacheQueryServiceInteractionsUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockCacheQueryServiceInteractionsUnitTests.java @@ -17,6 +17,8 @@ package org.springframework.data.gemfire.tests; import static org.assertj.core.api.Assertions.assertThat; +import java.util.Iterator; + import org.junit.Test; import org.apache.geode.cache.GemFireCache; @@ -68,6 +70,11 @@ public class MockCacheQueryServiceInteractionsUnitTests { assertThat(objectType.isMapType()).isFalse(); assertThat(objectType.isStructType()).isFalse(); assertThat(objectType.resolveClass()).isEqualTo(Object.class); + + Iterator iterator = selectResults.iterator(); + + assertThat(iterator).isNotNull(); + assertThat(iterator.hasNext()).isFalse(); } @Test