mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Polish "Prevent container to be closed twice"
See gh-35120
This commit is contained in:
parent
5df6913f18
commit
facf48e423
@ -23,7 +23,7 @@ import org.springframework.context.ConfigurableApplicationContext;
|
||||
|
||||
/**
|
||||
* {@link ApplicationContextInitializer} to manage the lifecycle of {@link Startable
|
||||
* startable container}.
|
||||
* startable containers}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 3.1.0
|
||||
|
@ -20,16 +20,16 @@ import org.testcontainers.lifecycle.Startable;
|
||||
|
||||
import org.springframework.beans.BeansException;
|
||||
import org.springframework.beans.factory.config.BeanPostProcessor;
|
||||
import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
|
||||
|
||||
/**
|
||||
* {@link BeanPostProcessor} to manage the lifecycle of {@link Startable startable
|
||||
* container}.
|
||||
* containers}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Stephane Nicoll
|
||||
* @see TestcontainersLifecycleApplicationContextInitializer
|
||||
*/
|
||||
class TestcontainersLifecycleBeanPostProcessor implements DestructionAwareBeanPostProcessor {
|
||||
class TestcontainersLifecycleBeanPostProcessor implements BeanPostProcessor {
|
||||
|
||||
@Override
|
||||
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
|
||||
@ -39,14 +39,4 @@ class TestcontainersLifecycleBeanPostProcessor implements DestructionAwareBeanPo
|
||||
return bean;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
|
||||
// Startable extends AutoCloseable will always be closed by context
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean requiresDestruction(Object bean) {
|
||||
return bean instanceof Startable;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright 2012-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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.testcontainers.lifecycle;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.testcontainers.lifecycle.Startable;
|
||||
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
|
||||
import static org.mockito.BDDMockito.then;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
|
||||
/**
|
||||
* Tests for {@link TestcontainersLifecycleApplicationContextInitializer}.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
class TestcontainersLifecycleApplicationContextInitializerTests {
|
||||
|
||||
@Test
|
||||
void whenStartableBeanInvokesStartOnRefresh() {
|
||||
Startable container = mock(Startable.class);
|
||||
try (AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext()) {
|
||||
applicationContext.registerBean("container", Startable.class, () -> container);
|
||||
new TestcontainersLifecycleApplicationContextInitializer().initialize(applicationContext);
|
||||
then(container).shouldHaveNoInteractions();
|
||||
applicationContext.refresh();
|
||||
then(container).should().start();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void whenStartableBeanInvokesDestroyOnShutdown() {
|
||||
Startable mock = mock(Startable.class);
|
||||
AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
|
||||
applicationContext.registerBean("container", Startable.class, () -> mock);
|
||||
new TestcontainersLifecycleApplicationContextInitializer().initialize(applicationContext);
|
||||
applicationContext.refresh();
|
||||
then(mock).should(never()).close();
|
||||
applicationContext.close();
|
||||
then(mock).should().close();
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user