Spring/spring-test-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug (NPE) with the Mock ClientSubscriptionConfig.

Browse Source
This commit is contained in:
John Blum
2019-06-15 11:37:00 -07:00
parent a798e8ce00
commit a5c941178f
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
View File

@@ -1165,7 +1165,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
doAnswer(newSetter(subscriptionDiskStoreName, () -> null))
.when(mockClientSubscriptionConfig).setDiskStoreName(anyString());
doAnswer(newSetter(subscriptionEvictionPolicy, stringToSubscriptionEvictionPolicyConverter, null))
doAnswer(newSetter(subscriptionEvictionPolicy, stringToSubscriptionEvictionPolicyConverter, () -> null))
.when(mockClientSubscriptionConfig).setEvictionPolicy(anyString());
when(mockClientSubscriptionConfig.getCapacity()).thenAnswer(newGetter(subscriptionCapacity));

26
spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
View File

@@ -13,7 +13,6 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package org.springframework.data.gemfire.tests.mock;
import static org.assertj.core.api.Assertions.assertThat;
@@ -22,12 +21,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.After;
import org.junit.Test;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionService;
import org.junit.After;
import org.junit.Test;
import org.apache.geode.cache.server.ClientSubscriptionConfig;
/**
* Unit tests for {@link GemFireMockObjectsSupport}.
@@ -46,7 +47,7 @@ public class GemFireMockObjectsSupportUnitTests {
}
@Test
public void regionCloningEnableReturnsFalseByDefault() {
public void regionCloningEnabledReturnsFalseByDefault() {
RegionService mockRegionService = mock(RegionService.class);
@@ -108,4 +109,21 @@ public class GemFireMockObjectsSupportUnitTests {
verify(mockAttributesMutator, times(1)).setCloningEnabled(eq(true));
}
@Test
public void mockClientSubscriptionConfigIsCorrect() {
ClientSubscriptionConfig mockClientSubscriptionConfig =
GemFireMockObjectsSupport.mockClientSubscriptionConfig();
assertThat(mockClientSubscriptionConfig).isNotNull();
mockClientSubscriptionConfig.setCapacity(1024);
mockClientSubscriptionConfig.setDiskStoreName("TestDiskStore");
mockClientSubscriptionConfig.setEvictionPolicy("ENTRY");
assertThat(mockClientSubscriptionConfig.getCapacity()).isEqualTo(1024);
assertThat(mockClientSubscriptionConfig.getDiskStoreName()).isEqualTo("TestDiskStore");
assertThat(mockClientSubscriptionConfig.getEvictionPolicy()).isEqualTo("entry");
}
}