GH-3182: Properly reset bean in the MockIntCtx #3190
Conversation
Fixes spring-projects#3182 The `MockIntegrationContext.resetBeans()` doesn't really restore a state of endpoint beans: the handle/source is applied only after start for that endpoint * Stop endpoints in the `MockIntegrationContext.resetBeans()` is they are running currently * Start them back only if their `autoStartup == true` * Clear only those beans which names are provided for the `resetBeans()` **Cherry-pick to 5.2.x**
...-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java
Show resolved
Hide resolved
* GH-3182: Properly reset bean in the MockIntCtx Fixes #3182 The `MockIntegrationContext.resetBeans()` doesn't really restore a state of endpoint beans: the handle/source is applied only after start for that endpoint * Stop endpoints in the `MockIntegrationContext.resetBeans()` is they are running currently * Start them back only if their `autoStartup == true` * Clear only those beans which names are provided for the `resetBeans()` **Cherry-pick to 5.2.x** * * Ensure that only provided beans are reset
|
Cherry-picked as 4e4e8db |
| @@ -108,9 +114,19 @@ else if (endpoint instanceof ReactiveStreamsConsumer) { | |||
| else if (endpoint instanceof IntegrationConsumer) { | |||
| directFieldAccessor.setPropertyValue(HANDLER, e.getValue()); | |||
| } | |||
| if (lifecycle != null && lifecycle.isAutoStartup()) { | |||
There was a problem hiding this comment.
Doesn't this have potential to break existing tests?
Maybe this just matters for constructed examples. But I could imagine something like this:
@BeforeClass
void init() {
nonAutostartupHandler.start();
}
@After
void cleanup() {
mockIntegrationContext.reset()
}
@Test
void t1() {
// do something with handler
}
@Test
void t2() {
// expect handler to be still running
}
Admittedly the @BeforeClass is somewhat artificial. But I could see a handler being manually started as part of context initialization.
I'm sorry for not contributing a fix myself, I had a pretty busy week at work.
There was a problem hiding this comment.
nonAutostartupHandler.start(); - you definitely start it manually. The framework can't assume when and how you have started it or going to.
Only the way for the framework to start it when you have that autoStartup = true.
I admit that it may break some peculiar test, but at the same time the test is wrong because it has been relied on bug which we are fixing here.
On the other hand I don't worry too much about breaking changes for tests. That's not that part of project which may make your customer unhappy.
Fixes #3182
The
MockIntegrationContext.resetBeans()doesn't really restore a stateof endpoint beans: the handle/source is applied only after start for that endpoint
MockIntegrationContext.resetBeans()is they are running currentlyautoStartup == trueresetBeans()Cherry-pick to 5.2.x