From 4188f4381d5b7357f8d5274542c03954c9a76677 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 15 Aug 2018 12:58:30 -0700 Subject: [PATCH] Refactor test case and setup to be more resilient to race conditions with Apache Geode/Pivotal GemFire CQ event delivery. --- .../cq/AutoConfiguredContinuousQueryIntegrationTests.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java index 489f1768..d23bf3ac 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java @@ -46,7 +46,7 @@ import org.springframework.data.gemfire.config.annotation.CacheServerApplication import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.config.annotation.EnablePdx; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; -import org.springframework.data.gemfire.tests.integration.config.SubscriptionEnabledClientServerIntegrationTestsConfiguration; +import org.springframework.data.gemfire.tests.integration.config.ClientServerIntegrationTestsConfiguration; import org.springframework.test.context.junit4.SpringRunner; import example.geode.query.cq.event.TemperatureReading; @@ -102,6 +102,9 @@ public class AutoConfiguredContinuousQueryIntegrationTests extends ForkingClient .isEqualTo(TemperatureReading.of(99)); assertThat(this.temperatureReadings.sizeOnServer()).isEqualTo(8); + + this.temperatureReadings.keySetOnServer().forEach(key -> + assertThat(this.temperatureReadings.get(key)).isNotEqualTo(0)); } @Test @@ -114,7 +117,8 @@ public class AutoConfiguredContinuousQueryIntegrationTests extends ForkingClient @SpringBootApplication @EnableLogging(logLevel = GEMFIRE_LOG_LEVEL) - @Import(SubscriptionEnabledClientServerIntegrationTestsConfiguration.class) + @Import(ClientServerIntegrationTestsConfiguration.class) + //@Import(SubscriptionEnabledClientServerIntegrationTestsConfiguration.class) public static class GemFireClientConfiguration { @Bean("TemperatureReadings")