Fix disposable bean lifecycle in JobScope test utilities
Before this commit, the destroy method of a job-scoped
bean was not called after a test method.
This commit changes the listener to respect the
DisposableBean contract for job-scoped beans (and make it
consistent with the calls to the JobSynchronizationManager
in AbstractJob, ie calling register/release).
FTR, I did not find a clean way to test this with an
assertion (which should be made after the test method),
but a log message in the destroy method shows that the
method is now called as expected.
Resolves #1288
(cherry picked from commit ad50599d28)
This commit is contained in:
@@ -103,7 +103,7 @@ public class JobScopeTestExecutionListener implements TestExecutionListener {
|
||||
@Override
|
||||
public void afterTestMethod(TestContext testContext) throws Exception {
|
||||
if (testContext.hasAttribute(JOB_EXECUTION)) {
|
||||
JobSynchronizationManager.close();
|
||||
JobSynchronizationManager.release();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2006-2010 the original author or authors.
|
||||
* Copyright 2006-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -28,6 +28,7 @@ import org.springframework.batch.core.scope.context.JobSynchronizationManager;
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Jimmy Praet
|
||||
* @author Mahmoud Ben Hassine
|
||||
*/
|
||||
public class JobScopeTestUtils {
|
||||
|
||||
@@ -37,7 +38,7 @@ public class JobScopeTestUtils {
|
||||
return callable.call();
|
||||
}
|
||||
finally {
|
||||
JobSynchronizationManager.close();
|
||||
JobSynchronizationManager.release();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2013-2022 the original author or authors.
|
||||
* Copyright 2013-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -17,6 +17,7 @@ package org.springframework.batch.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.batch.core.JobExecution;
|
||||
@@ -56,6 +57,8 @@ class JobScopeTestExecutionListenerIntegrationTests {
|
||||
void testJob() throws Exception {
|
||||
stream.open(new ExecutionContext());
|
||||
assertEquals("foo", reader.read());
|
||||
assertEquals("bar", reader.read());
|
||||
assertNull(reader.read());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user