albertogpz commented on code in PR #7838: URL: https://github.com/apache/geode/pull/7838#discussion_r957220276
########## geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneServiceTest.java: ########## @@ -80,8 +84,37 @@ public void validateThatRemoveIsCalledOnTombstoneInRegionThatIsInitialized() { when(region.getDiskRegion()).thenReturn(mock(DiskRegion.class)); - replicateTombstoneSweeper.expireTombstone(tombstone); + replicateTombstoneSweeper.expireTombstone(tombstone1); replicateTombstoneSweeper.expireBatch(); - verify(regionMap).removeTombstone(tombstone.entry, tombstone); + verify(regionMap).removeTombstone(tombstone1.entry, tombstone1); + } + + @Test + public void validateThatTheExpiredTombstonesAreCleared() { + when(region.getRegionMap()).thenReturn(regionMap); + replicateTombstoneSweeper.expireTombstone(tombstone1); + assertThat(replicateTombstoneSweeper.getScheduledTombstoneCount()).isOne(); + replicateTombstoneSweeper.unscheduleTombstones(region); + assertThat(replicateTombstoneSweeper.getScheduledTombstoneCount()).isZero(); + } + + @Test + public void validateThatTheNoneExpiredTombstonesAreCleared() { Review Comment: Please, change None to Non ########## geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneServiceTest.java: ########## @@ -80,8 +84,37 @@ public void validateThatRemoveIsCalledOnTombstoneInRegionThatIsInitialized() { when(region.getDiskRegion()).thenReturn(mock(DiskRegion.class)); - replicateTombstoneSweeper.expireTombstone(tombstone); + replicateTombstoneSweeper.expireTombstone(tombstone1); replicateTombstoneSweeper.expireBatch(); - verify(regionMap).removeTombstone(tombstone.entry, tombstone); + verify(regionMap).removeTombstone(tombstone1.entry, tombstone1); + } + + @Test + public void validateThatTheExpiredTombstonesAreCleared() { + when(region.getRegionMap()).thenReturn(regionMap); + replicateTombstoneSweeper.expireTombstone(tombstone1); + assertThat(replicateTombstoneSweeper.getScheduledTombstoneCount()).isOne(); + replicateTombstoneSweeper.unscheduleTombstones(region); + assertThat(replicateTombstoneSweeper.getScheduledTombstoneCount()).isZero(); + } + + @Test + public void validateThatTheNoneExpiredTombstonesAreCleared() { + when(region.getRegionMap()).thenReturn(regionMap); + replicateTombstoneSweeper.scheduleTombstone(tombstone1); + assertThat(replicateTombstoneSweeper.getScheduledTombstoneCount()).isOne(); + replicateTombstoneSweeper.unscheduleTombstones(region); + assertThat(replicateTombstoneSweeper.getScheduledTombstoneCount()).isZero(); } + + @Test + public void validateThatTheNoneExpiredAndExpiredTombstonesAreCleared() { Review Comment: Please, change None to Non -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@geode.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org