[geode] branch develop updated: GEODE-7439: Fix DeltaSessionStatisticsIntegrationTest (#4316)

[jjramos]

This is an automated email from the ASF dual-hosted git repository.

jjramos pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new fcb4d73  GEODE-7439: Fix DeltaSessionStatisticsIntegrationTest (#4316)
fcb4d73 is described below

commit fcb4d73188fb6ffb7d51c76e7e678ce448283ba8
Author: Juan José Ramos <jujora...@users.noreply.github.com>
AuthorDate: Thu Nov 14 09:52:26 2019 +0000

    GEODE-7439: Fix DeltaSessionStatisticsIntegrationTest (#4316)
    
    - Fixed flakiness in DeltaSessionStatisticsIntegrationTest.
---
 .../internal/DeltaSessionStatisticsIntegrationTest.java       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatisticsIntegrationTest.java
 
b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatisticsIntegrationTest.java
index 985eec3..e279f31 100644
--- 
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatisticsIntegrationTest.java
+++ 
b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatisticsIntegrationTest.java
@@ -19,6 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import javax.servlet.http.HttpSession;
@@ -35,6 +38,7 @@ import org.apache.geode.cache.ExpirationAttributes;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.modules.session.catalina.AbstractSessionCache;
+import org.apache.geode.modules.session.catalina.DeltaSession;
 import org.apache.geode.modules.session.catalina.SessionCache;
 import 
org.apache.geode.modules.session.catalina.callback.SessionExpirationCacheListener;
 
@@ -80,10 +84,11 @@ public class DeltaSessionStatisticsIntegrationTest extends 
AbstractDeltaSessionI
         .create(REGION_NAME);
     mockDeltaSessionManager();
     when(deltaSessionManager.getStatistics()).thenReturn(statistics);
-    httpSessionRegion.put(TEST_SESSION_ID,
-        new TestDeltaSession(deltaSessionManager, TEST_SESSION_ID));
+    DeltaSession spyDeltasSession = spy(new 
TestDeltaSession(deltaSessionManager, TEST_SESSION_ID));
+    httpSessionRegion.put(TEST_SESSION_ID, spyDeltasSession);
 
-    await().untilAsserted(() -> 
assertThat(httpSessionRegion.isEmpty()).isTrue());
+    await().untilAsserted(() -> verify(spyDeltasSession, 
times(1)).processExpired());
+    assertThat(httpSessionRegion.isEmpty()).isTrue();
     assertThat(statistics.getSessionsExpired()).isEqualTo(1);
   }