Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-116 - PublishedEvents now sees events from asynchronous event listeners as well.

Browse Source 
The ApplicationListener we deploy to capture events published  during a test method execution now uses an InheritableThreadLocal so that events published on threads spawned from the main test execution thread also end up in the PublishedEvents instance prepared for the test method.

Also, the registration of that particular event listener avoids duplicate registrations by inspecting the application context in use for the test method execution for an already registered listener, falling back to registering one.
This commit is contained in:
Oliver Drotbohm
2023-01-13 16:13:34 +01:00
parent c4321c5305
commit 6616aaaffa
5 changed files with 152 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEventsParameterResolver.java
View File

@@ -25,7 +25,7 @@ import org.junit.jupiter.api.extension.ParameterResolver;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@@ -40,7 +40,7 @@ class PublishedEventsParameterResolver implements ParameterResolver, BeforeAllCa
private static final boolean ASSERT_J_PRESENT = ClassUtils.isPresent("org.assertj.core.api.Assert",
PublishedEventsParameterResolver.class.getClassLoader());
private ThreadBoundApplicationListenerAdapter listener = new ThreadBoundApplicationListenerAdapter();
private ThreadBoundApplicationListenerAdapter listener;
private final Function<ExtensionContext, ApplicationContext> lookup;
PublishedEventsParameterResolver() {
@@ -59,7 +59,22 @@ class PublishedEventsParameterResolver implements ParameterResolver, BeforeAllCa
public void beforeAll(ExtensionContext extensionContext) {
ApplicationContext context = lookup.apply(extensionContext);
((ConfigurableApplicationContext) context).addApplicationListener(listener);
if (!(context instanceof AbstractApplicationContext aac)) {
throw new IllegalStateException();
}
listener = aac.getApplicationListeners().stream()
.filter(ThreadBoundApplicationListenerAdapter.class::isInstance)
.map(ThreadBoundApplicationListenerAdapter.class::cast)
.findFirst()
.orElseGet(() -> {
var adapter = new ThreadBoundApplicationListenerAdapter();
aac.addApplicationListener(adapter);
return adapter;
});
}
/*
@@ -114,7 +129,7 @@ class PublishedEventsParameterResolver implements ParameterResolver, BeforeAllCa
*/
private static class ThreadBoundApplicationListenerAdapter implements ApplicationListener<ApplicationEvent> {
private final ThreadLocal<ApplicationListener<ApplicationEvent>> delegate = new ThreadLocal<>();
private final ThreadLocal<ApplicationListener<ApplicationEvent>> delegate = new InheritableThreadLocal<>();
/**
* Registers the given {@link ApplicationListener} to be used for the current thread.