Polishing tests for delete session

Author: gregturn

src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java

@@ -141,7 +141,7 @@ public Mono<Void> deleteById(String id) {
 		return findSession(id)
 			.flatMap(document -> this.mongoOperations.remove(document, this.collectionName).then(Mono.just(document)))
 			.map(document -> convertToSession(this.mongoSessionConverter, document))
-			.map(mongoSession -> Mono.fromRunnable(() -> publishEvent(new SessionDeletedEvent(this, mongoSession))))
+			.doOnSuccess(mongoSession -> publishEvent(new SessionDeletedEvent(this, mongoSession)))
 			.then();
 	}
 

src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java

@@ -17,7 +17,11 @@
 package org.springframework.session.data.mongo;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.BDDMockito.any;
+import static org.mockito.BDDMockito.eq;
 import static org.mockito.BDDMockito.*;
+import static org.mockito.BDDMockito.mock;
+import static org.mockito.BDDMockito.times;
 import static org.mockito.Mockito.verify;
 
 import java.util.UUID;
@@ -30,11 +34,12 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.index.IndexOperations;
+import org.springframework.session.events.SessionDeletedEvent;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -61,11 +66,15 @@ public class ReactiveMongoOperationsSessionRepositoryTest {
 	@Mock
 	private MongoOperations blockingMongoOperations;
 
+	@Mock
+	private ApplicationEventPublisher eventPublisher;
+
 	@Before
 	public void setUp() {
 
 		this.repository = new ReactiveMongoOperationsSessionRepository(this.mongoOperations);
 		this.repository.setMongoSessionConverter(this.converter);
+		this.repository.setApplicationEventPublisher(this.eventPublisher);
 	}
 
 	@Test
@@ -197,6 +206,8 @@ public void shouldDeleteSession() {
 
 		verify(this.mongoOperations).remove(any(Document.class),
 			eq(ReactiveMongoOperationsSessionRepository.DEFAULT_COLLECTION_NAME));
+
+		verify(this.eventPublisher).publishEvent(any(SessionDeletedEvent.class));
 	}
 
 	@Test