GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Explicitly close ApplicationContexts and clean up warnings in tests

pull/28217/head
Sam Brannen 4 years ago
parent
7f4e09e994
commit
3da7a48a17
11 changed files with 37 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstantiationContributorTests.java
  2. 2
      spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanRegistrationBeanFactoryContributionTests.java
  3. 6
      spring-beans/src/test/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrarTests.java
  4. 1
      spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedFieldResolverTests.java
  5. 1
      spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolder.java
  6. 2
      spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/property/ConfigurableBean.java
  7. 13
      spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
  8. 4
      spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorTests.java
  9. 15
      spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
  10. 2
      spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
  11. 7
      spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java

1
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstantiationContributorTests.java
Unescape View File

@ -148,6 +148,7 @@ class AutowiredAnnotationBeanInstantiationContributionTests {
public static class PrivateFieldInjectionSample { public static class PrivateFieldInjectionSample {
@Autowired @Autowired
@SuppressWarnings("unused")
private Environment environment; private Environment environment;
} }

2
spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanRegistrationBeanFactoryContributionTests.java
Unescape View File

@ -714,8 +714,10 @@ class BeanRegistrationBeanFactoryContributionTests {
static class NameAndCountersComponent { static class NameAndCountersComponent {
@SuppressWarnings("unused")
private String name; private String name;
@SuppressWarnings("unused")
private List<Integer> counters; private List<Integer> counters;
public void setName(String name) { public void setName(String name) {

6
spring-beans/src/test/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrarTests.java
Unescape View File

@ -362,8 +362,10 @@ class BeanDefinitionRegistrarTests {
static class MultiArgConstructorSample { static class MultiArgConstructorSample {
@SuppressWarnings("unused")
private final String name; private final String name;
@SuppressWarnings("unused")
private final Integer counter; private final Integer counter;
public MultiArgConstructorSample(String name, Integer counter) { public MultiArgConstructorSample(String name, Integer counter) {
@ -377,8 +379,10 @@ class BeanDefinitionRegistrarTests {
private Environment environment; private Environment environment;
@SuppressWarnings("unused")
private String name; private String name;
@SuppressWarnings("unused")
private Integer counter; private Integer counter;
void setEnvironment(Environment environment) { void setEnvironment(Environment environment) {
@ -439,6 +443,7 @@ class BeanDefinitionRegistrarTests {
static class NumberHolder<N extends Number> { static class NumberHolder<N extends Number> {
@SuppressWarnings("unused")
private final N number; private final N number;
public NumberHolder(N number) { public NumberHolder(N number) {
@ -450,6 +455,7 @@ class BeanDefinitionRegistrarTests {
static class NumberHolderSample { static class NumberHolderSample {
@Autowired @Autowired
@SuppressWarnings("unused")
private NumberHolder<Integer> numberHolder; private NumberHolder<Integer> numberHolder;
} }

1
spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedFieldResolverTests.java
Unescape View File

@ -71,6 +71,7 @@ class InjectedFieldResolverTests {
static class TestBean { static class TestBean {
@SuppressWarnings("unused")
private String string; private String string;
} }

1
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolder.java
Unescape View File

@ -27,6 +27,7 @@ import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class NumberHolder<T extends Number> implements Serializable { public class NumberHolder<T extends Number> implements Serializable {
@SuppressWarnings("unused")
private final T number; private final T number;
public NumberHolder(T number) { public NumberHolder(T number) {

2
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/property/ConfigurableBean.java
Unescape View File

@ -18,8 +18,10 @@ package org.springframework.beans.testfixture.beans.factory.generator.property;
public class ConfigurableBean { public class ConfigurableBean {
@SuppressWarnings("unused")
private String name; private String name;
@SuppressWarnings("unused")
private Integer counter; private Integer counter;
public void setName(String name) { public void setName(String name) {

13
spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
Unescape View File

@ -672,14 +672,11 @@ class ConfigurationClassProcessingTests {
@Bean @Bean
@Scope(value = "prototype") @Scope(value = "prototype")
public PrototypeInterface getDemoBean( int i) { public PrototypeInterface getDemoBean(int i) {
switch ( i) { return switch (i) {
case 1: return new PrototypeOne(); case 1 -> new PrototypeOne();
case 2: default -> new PrototypeTwo();
default: };
return new PrototypeTwo();
}
} }
} }

4
spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorTests.java
Unescape View File

@ -211,6 +211,7 @@ class ApplicationContextAotGeneratorTests {
GeneratedTypeContext generationContext = createGenerationContext(); GeneratedTypeContext generationContext = createGenerationContext();
GenericApplicationContext applicationContext = new GenericApplicationContext(); GenericApplicationContext applicationContext = new GenericApplicationContext();
DefaultListableBeanFactory beanFactory = applicationContext.getDefaultListableBeanFactory(); DefaultListableBeanFactory beanFactory = applicationContext.getDefaultListableBeanFactory();
@SuppressWarnings("unchecked")
BiPredicate<String, BeanDefinition> excludeFilter = mock(BiPredicate.class); BiPredicate<String, BeanDefinition> excludeFilter = mock(BiPredicate.class);
given(excludeFilter.test(eq("bean1"), any(BeanDefinition.class))).willReturn(Boolean.FALSE); given(excludeFilter.test(eq("bean1"), any(BeanDefinition.class))).willReturn(Boolean.FALSE);
given(excludeFilter.test(eq("bean2"), any(BeanDefinition.class))).willReturn(Boolean.TRUE); given(excludeFilter.test(eq("bean2"), any(BeanDefinition.class))).willReturn(Boolean.TRUE);
@ -328,12 +329,11 @@ class ApplicationContextAotGeneratorTests {
} }
static class TestBeanFactoryContribution implements BeanFactoryContribution { static class TestBeanFactoryContribution implements BeanFactoryContribution {
private final Consumer<BeanFactoryInitialization> contribution; private final Consumer<BeanFactoryInitialization> contribution;
private final BiPredicate<String, BeanDefinition> excludeFilter; private final BiPredicate<String, BeanDefinition> excludeFilter;
private int order;
public TestBeanFactoryContribution(Consumer<BeanFactoryInitialization> contribution, public TestBeanFactoryContribution(Consumer<BeanFactoryInitialization> contribution,
BiPredicate<String, BeanDefinition> excludeFilter) { BiPredicate<String, BeanDefinition> excludeFilter) {
this.contribution = contribution; this.contribution = contribution;

15
spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
Unescape View File

@ -241,6 +241,7 @@ class GenericApplicationContextTests {
assertThat(context.isActive()).isFalse(); assertThat(context.isActive()).isFalse();
context.refreshForAotProcessing(); context.refreshForAotProcessing();
assertThat(context.isActive()).isTrue(); assertThat(context.isActive()).isTrue();
context.close();
} }
@Test @Test
@ -250,6 +251,7 @@ class GenericApplicationContextTests {
context.setEnvironment(environment); context.setEnvironment(environment);
context.refreshForAotProcessing(); context.refreshForAotProcessing();
assertThat(context.getBean(Environment.class)).isEqualTo(environment); assertThat(context.getBean(Environment.class)).isEqualTo(environment);
context.close();
} }
@Test @Test
@ -258,6 +260,7 @@ class GenericApplicationContextTests {
context.registerBeanDefinition("number", new RootBeanDefinition("java.lang.Integer")); context.registerBeanDefinition("number", new RootBeanDefinition("java.lang.Integer"));
context.refreshForAotProcessing(); context.refreshForAotProcessing();
assertThat(getBeanDefinition(context, "number").getBeanClass()).isEqualTo(Integer.class); assertThat(getBeanDefinition(context, "number").getBeanClass()).isEqualTo(Integer.class);
context.close();
} }
@Test @Test
@ -274,7 +277,7 @@ class GenericApplicationContextTests {
.getIndexedArgumentValue(0, GenericBeanDefinition.class).getValue(); .getIndexedArgumentValue(0, GenericBeanDefinition.class).getValue();
assertThat(value.hasBeanClass()).isTrue(); assertThat(value.hasBeanClass()).isTrue();
assertThat(value.getBeanClass()).isEqualTo(Integer.class); assertThat(value.getBeanClass()).isEqualTo(Integer.class);
context.close();
} }
@Test @Test
@ -290,6 +293,7 @@ class GenericApplicationContextTests {
GenericBeanDefinition value = (GenericBeanDefinition) bd.getPropertyValues().get("inner"); GenericBeanDefinition value = (GenericBeanDefinition) bd.getPropertyValues().get("inner");
assertThat(value.hasBeanClass()).isTrue(); assertThat(value.hasBeanClass()).isTrue();
assertThat(value.getBeanClass()).isEqualTo(Integer.class); assertThat(value.getBeanClass()).isEqualTo(Integer.class);
context.close();
} }
@Test @Test
@ -299,6 +303,7 @@ class GenericApplicationContextTests {
context.addBeanFactoryPostProcessor(bfpp); context.addBeanFactoryPostProcessor(bfpp);
context.refreshForAotProcessing(); context.refreshForAotProcessing();
verify(bfpp).postProcessBeanFactory(context.getBeanFactory()); verify(bfpp).postProcessBeanFactory(context.getBeanFactory());
context.close();
} }
@Test @Test
@ -310,6 +315,7 @@ class GenericApplicationContextTests {
context.refreshForAotProcessing(); context.refreshForAotProcessing();
verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "test"), String.class, "test"); verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "test"), String.class, "test");
verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "number"), Integer.class, "number"); verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "number"), Integer.class, "number");
context.close();
} }
@Test @Test
@ -326,6 +332,7 @@ class GenericApplicationContextTests {
verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "test"), BeanD.class, "test"); verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "test"), BeanD.class, "test");
verify(bpp).postProcessMergedBeanDefinition(any(RootBeanDefinition.class), eq(Integer.class), captor.capture()); verify(bpp).postProcessMergedBeanDefinition(any(RootBeanDefinition.class), eq(Integer.class), captor.capture());
assertThat(captor.getValue()).startsWith("(inner bean)"); assertThat(captor.getValue()).startsWith("(inner bean)");
context.close();
} }
@Test @Test
@ -342,6 +349,7 @@ class GenericApplicationContextTests {
verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "test"), BeanD.class, "test"); verify(bpp).postProcessMergedBeanDefinition(getBeanDefinition(context, "test"), BeanD.class, "test");
verify(bpp).postProcessMergedBeanDefinition(any(RootBeanDefinition.class), eq(Integer.class), captor.capture()); verify(bpp).postProcessMergedBeanDefinition(any(RootBeanDefinition.class), eq(Integer.class), captor.capture());
assertThat(captor.getValue()).startsWith("(inner bean)"); assertThat(captor.getValue()).startsWith("(inner bean)");
context.close();
} }
@Test @Test
@ -350,6 +358,7 @@ class GenericApplicationContextTests {
context.refresh(); context.refresh();
assertThatIllegalStateException().isThrownBy(context::refreshForAotProcessing) assertThatIllegalStateException().isThrownBy(context::refreshForAotProcessing)
.withMessageContaining("does not support multiple refresh attempts"); .withMessageContaining("does not support multiple refresh attempts");
context.close();
} }
@Test @Test
@ -358,6 +367,7 @@ class GenericApplicationContextTests {
context.registerBeanDefinition("genericFactoryBean", context.registerBeanDefinition("genericFactoryBean",
new RootBeanDefinition(TestAotFactoryBean.class)); new RootBeanDefinition(TestAotFactoryBean.class));
context.refreshForAotProcessing(); context.refreshForAotProcessing();
context.close();
} }
@Test @Test
@ -367,6 +377,7 @@ class GenericApplicationContextTests {
throw new IllegalStateException("Should not be invoked"); throw new IllegalStateException("Should not be invoked");
}).getBeanDefinition()); }).getBeanDefinition());
context.refreshForAotProcessing(); context.refreshForAotProcessing();
context.close();
} }
private MergedBeanDefinitionPostProcessor registerMockMergedBeanDefinitionPostProcessor(GenericApplicationContext context) { private MergedBeanDefinitionPostProcessor registerMockMergedBeanDefinitionPostProcessor(GenericApplicationContext context) {
@ -377,7 +388,6 @@ class GenericApplicationContextTests {
return bpp; return bpp;
} }
private RootBeanDefinition getBeanDefinition(GenericApplicationContext context, String name) { private RootBeanDefinition getBeanDefinition(GenericApplicationContext context, String name) {
return (RootBeanDefinition) context.getBeanFactory().getMergedBeanDefinition(name); return (RootBeanDefinition) context.getBeanFactory().getMergedBeanDefinition(name);
} }
@ -411,6 +421,7 @@ class GenericApplicationContextTests {
static class BeanD { static class BeanD {
@SuppressWarnings("unused")
private Integer counter; private Integer counter;
BeanD(Integer counter) { BeanD(Integer counter) {

2
spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
Unescape View File

@ -61,7 +61,7 @@ class Spr7816Tests {
} }
abstract static class DomainEntity { abstract static sealed class DomainEntity permits Building, Entrance, Dwelling {
} }
static final class Building extends DomainEntity { static final class Building extends DomainEntity {

7
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
Unescape View File

@ -29,10 +29,8 @@ import io.r2dbc.spi.test.MockRow;
import io.r2dbc.spi.test.MockRowMetadata; import io.r2dbc.spi.test.MockRowMetadata;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness; import org.mockito.quality.Strictness;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
@ -66,12 +64,11 @@ import static org.mockito.BDDMockito.when;
* @author Ferdinand Jacobs * @author Ferdinand Jacobs
* @author Jens Schauder * @author Jens Schauder
*/ */
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT) @MockitoSettings(strictness = Strictness.LENIENT)
class DefaultDatabaseClientUnitTests { class DefaultDatabaseClientUnitTests {
@Mock @Mock
Connection connection; private Connection connection;
private DatabaseClient.Builder databaseClientBuilder; private DatabaseClient.Builder databaseClientBuilder;
@ -147,6 +144,7 @@ class DefaultDatabaseClientUnitTests {
} }
@Test @Test
@SuppressWarnings("deprecation")
void executeShouldBindSettableValues() { void executeShouldBindSettableValues() {
Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1"); Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
@ -197,6 +195,7 @@ class DefaultDatabaseClientUnitTests {
} }
@Test @Test
@SuppressWarnings("deprecation")
void executeShouldBindValues() { void executeShouldBindValues() {
Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1"); Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");

Write Preview
Loading…
Cancel
Save