Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6a207d0

Browse files
sbrannensbrannen
committed
Polish AnnotationConfigApplicationContextTests
1 parent 2a4dbcc commit 6a207d0

File tree

1 file changed

+49
-48
lines changed

1 file changed

+49
-48
lines changed

‎spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@
4242
* @author Chris Beams
4343
* @author Juergen Hoeller
4444
*/
45-
public class AnnotationConfigApplicationContextTests {
45+
@SuppressWarnings("resource")
46+
class AnnotationConfigApplicationContextTests {
4647

4748
@Test
48-
public void scanAndRefresh() {
49+
void scanAndRefresh() {
4950
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
5051
context.scan("org.springframework.context.annotation6");
5152
context.refresh();
@@ -55,43 +56,43 @@ public void scanAndRefresh() {
5556
context.getBean(uncapitalize(ComponentForScanning.class.getSimpleName()));
5657
context.getBean(uncapitalize(Jsr330NamedForScanning.class.getSimpleName()));
5758
Map<String, Object> beans = context.getBeansWithAnnotation(Configuration.class);
58-
assertThat(beans.size()).isEqualTo(1);
59+
assertThat(beans).size().isEqualTo(1);
5960
}
6061

6162
@Test
62-
public void registerAndRefresh() {
63+
void registerAndRefresh() {
6364
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
6465
context.register(Config.class, NameConfig.class);
6566
context.refresh();
6667

6768
context.getBean("testBean");
6869
context.getBean("name");
6970
Map<String, Object> beans = context.getBeansWithAnnotation(Configuration.class);
70-
assertThat(beans.size()).isEqualTo(2);
71+
assertThat(beans).size().isEqualTo(2);
7172
}
7273

7374
@Test
74-
public void getBeansWithAnnotation() {
75+
void getBeansWithAnnotation() {
7576
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
7677
context.register(Config.class, NameConfig.class, UntypedFactoryBean.class);
7778
context.refresh();
7879

7980
context.getBean("testBean");
8081
context.getBean("name");
8182
Map<String, Object> beans = context.getBeansWithAnnotation(Configuration.class);
82-
assertThat(beans.size()).isEqualTo(2);
83+
assertThat(beans).size().isEqualTo(2);
8384
}
8485

8586
@Test
86-
public void getBeanByType() {
87+
void getBeanByType() {
8788
ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
8889
TestBean testBean = context.getBean(TestBean.class);
8990
assertThat(testBean).isNotNull();
9091
assertThat(testBean.name).isEqualTo("foo");
9192
}
9293

9394
@Test
94-
public void getBeanByTypeRaisesNoSuchBeanDefinitionException() {
95+
void getBeanByTypeRaisesNoSuchBeanDefinitionException() {
9596
ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
9697

9798
// attempt to retrieve a bean that does not exist
@@ -102,7 +103,7 @@ public void getBeanByTypeRaisesNoSuchBeanDefinitionException() {
102103
}
103104

104105
@Test
105-
public void getBeanByTypeAmbiguityRaisesException() {
106+
void getBeanByTypeAmbiguityRaisesException() {
106107
ApplicationContext context = new AnnotationConfigApplicationContext(TwoTestBeanConfig.class);
107108
assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() ->
108109
context.getBean(TestBean.class))
@@ -116,7 +117,7 @@ public void getBeanByTypeAmbiguityRaisesException() {
116117
* @see org.springframework.beans.factory.support.DefaultBeanNameGenerator#generateBeanName
117118
*/
118119
@Test
119-
public void defaultConfigClassBeanNameIsGeneratedProperly() {
120+
void defaultConfigClassBeanNameIsGeneratedProperly() {
120121
ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
121122

122123
// attempt to retrieve the instance by its generated bean name
@@ -129,7 +130,7 @@ public void defaultConfigClassBeanNameIsGeneratedProperly() {
129130
* the configuration class with bean name 'foo'.
130131
*/
131132
@Test
132-
public void explicitConfigClassBeanNameIsRespected() {
133+
void explicitConfigClassBeanNameIsRespected() {
133134
ApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithCustomName.class);
134135

135136
// attempt to retrieve the instance by its specified name
@@ -138,24 +139,20 @@ public void explicitConfigClassBeanNameIsRespected() {
138139
}
139140

140141
@Test
141-
public void autowiringIsEnabledByDefault() {
142+
void autowiringIsEnabledByDefault() {
142143
ApplicationContext context = new AnnotationConfigApplicationContext(AutowiredConfig.class);
143144
assertThat(context.getBean(TestBean.class).name).isEqualTo("foo");
144145
}
145146

146147
@Test
147-
public void nullReturningBeanPostProcessor() {
148+
void nullReturningBeanPostProcessor() {
148149
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
149150
context.register(AutowiredConfig.class);
150151
context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() {
151152
@Override
152153
public Object postProcessBeforeInitialization(Object bean, String beanName) {
153154
return (bean instanceof TestBean ? null : bean);
154155
}
155-
@Override
156-
public Object postProcessAfterInitialization(Object bean, String beanName) {
157-
return bean;
158-
}
159156
});
160157
context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() {
161158
@Override
@@ -173,7 +170,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
173170
}
174171

175172
@Test
176-
public void individualBeans() {
173+
void individualBeans() {
177174
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
178175
context.register(BeanA.class, BeanB.class, BeanC.class);
179176
context.refresh();
@@ -184,7 +181,7 @@ public void individualBeans() {
184181
}
185182

186183
@Test
187-
public void individualNamedBeans() {
184+
void individualNamedBeans() {
188185
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
189186
context.registerBean("a", BeanA.class);
190187
context.registerBean("b", BeanB.class);
@@ -197,7 +194,7 @@ public void individualNamedBeans() {
197194
}
198195

199196
@Test
200-
public void individualBeanWithSupplier() {
197+
void individualBeanWithSupplier() {
201198
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
202199
context.registerBean(BeanA.class,
203200
() -> new BeanA(context.getBean(BeanB.class), context.getBean(BeanC.class)));
@@ -210,12 +207,14 @@ public void individualBeanWithSupplier() {
210207
assertThat(context.getBean(BeanA.class).c).isSameAs(context.getBean(BeanC.class));
211208
assertThat(context.getBean(BeanB.class).applicationContext).isSameAs(context);
212209

213-
assertThat(context.getDefaultListableBeanFactory().getDependentBeans("annotationConfigApplicationContextTests.BeanB")).isEqualTo(new String[] {"annotationConfigApplicationContextTests.BeanA"});
214-
assertThat(context.getDefaultListableBeanFactory().getDependentBeans("annotationConfigApplicationContextTests.BeanC")).isEqualTo(new String[] {"annotationConfigApplicationContextTests.BeanA"});
210+
assertThat(context.getDefaultListableBeanFactory().getDependentBeans("annotationConfigApplicationContextTests.BeanB"))
211+
.containsExactly("annotationConfigApplicationContextTests.BeanA");
212+
assertThat(context.getDefaultListableBeanFactory().getDependentBeans("annotationConfigApplicationContextTests.BeanC"))
213+
.containsExactly("annotationConfigApplicationContextTests.BeanA");
215214
}
216215

217216
@Test
218-
public void individualBeanWithSupplierAndCustomizer() {
217+
void individualBeanWithSupplierAndCustomizer() {
219218
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
220219
context.registerBean(BeanA.class,
221220
() -> new BeanA(context.getBean(BeanB.class), context.getBean(BeanC.class)),
@@ -231,7 +230,7 @@ public void individualBeanWithSupplierAndCustomizer() {
231230
}
232231

233232
@Test
234-
public void individualNamedBeanWithSupplier() {
233+
void individualNamedBeanWithSupplier() {
235234
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
236235
context.registerBean("a", BeanA.class,
237236
() -> new BeanA(context.getBean(BeanB.class), context.getBean(BeanC.class)));
@@ -246,7 +245,7 @@ public void individualNamedBeanWithSupplier() {
246245
}
247246

248247
@Test
249-
public void individualNamedBeanWithSupplierAndCustomizer() {
248+
void individualNamedBeanWithSupplierAndCustomizer() {
250249
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
251250
context.registerBean("a", BeanA.class,
252251
() -> new BeanA(context.getBean(BeanB.class), context.getBean(BeanC.class)),
@@ -262,7 +261,7 @@ public void individualNamedBeanWithSupplierAndCustomizer() {
262261
}
263262

264263
@Test
265-
public void individualBeanWithNullReturningSupplier() {
264+
void individualBeanWithNullReturningSupplier() {
266265
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
267266
context.registerBean("a", BeanA.class, () -> null);
268267
context.registerBean("b", BeanB.class, BeanB::new);
@@ -272,13 +271,13 @@ public void individualBeanWithNullReturningSupplier() {
272271
assertThat(ObjectUtils.containsElement(context.getBeanNamesForType(BeanA.class), "a")).isTrue();
273272
assertThat(ObjectUtils.containsElement(context.getBeanNamesForType(BeanB.class), "b")).isTrue();
274273
assertThat(ObjectUtils.containsElement(context.getBeanNamesForType(BeanC.class), "c")).isTrue();
275-
assertThat(context.getBeansOfType(BeanA.class).isEmpty()).isTrue();
274+
assertThat(context.getBeansOfType(BeanA.class)).isEmpty();
276275
assertThat(context.getBeansOfType(BeanB.class).values().iterator().next()).isSameAs(context.getBean(BeanB.class));
277276
assertThat(context.getBeansOfType(BeanC.class).values().iterator().next()).isSameAs(context.getBean(BeanC.class));
278277
}
279278

280279
@Test
281-
public void individualBeanWithSpecifiedConstructorArguments() {
280+
void individualBeanWithSpecifiedConstructorArguments() {
282281
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
283282
BeanB b = new BeanB();
284283
BeanC c = new BeanC();
@@ -287,11 +286,11 @@ public void individualBeanWithSpecifiedConstructorArguments() {
287286

288287
assertThat(context.getBean(BeanA.class).b).isSameAs(b);
289288
assertThat(context.getBean(BeanA.class).c).isSameAs(c);
290-
assertThat((Object) b.applicationContext).isNull();
289+
assertThat(b.applicationContext).isNull();
291290
}
292291

293292
@Test
294-
public void individualNamedBeanWithSpecifiedConstructorArguments() {
293+
void individualNamedBeanWithSpecifiedConstructorArguments() {
295294
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
296295
BeanB b = new BeanB();
297296
BeanC c = new BeanC();
@@ -300,11 +299,11 @@ public void individualNamedBeanWithSpecifiedConstructorArguments() {
300299

301300
assertThat(context.getBean("a", BeanA.class).b).isSameAs(b);
302301
assertThat(context.getBean("a", BeanA.class).c).isSameAs(c);
303-
assertThat((Object) b.applicationContext).isNull();
302+
assertThat(b.applicationContext).isNull();
304303
}
305304

306305
@Test
307-
public void individualBeanWithMixedConstructorArguments() {
306+
void individualBeanWithMixedConstructorArguments() {
308307
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
309308
BeanC c = new BeanC();
310309
context.registerBean(BeanA.class, c);
@@ -317,7 +316,7 @@ public void individualBeanWithMixedConstructorArguments() {
317316
}
318317

319318
@Test
320-
public void individualNamedBeanWithMixedConstructorArguments() {
319+
void individualNamedBeanWithMixedConstructorArguments() {
321320
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
322321
BeanC c = new BeanC();
323322
context.registerBean("a", BeanA.class, c);
@@ -330,7 +329,7 @@ public void individualNamedBeanWithMixedConstructorArguments() {
330329
}
331330

332331
@Test
333-
public void individualBeanWithFactoryBeanSupplier() {
332+
void individualBeanWithFactoryBeanSupplier() {
334333
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
335334
context.registerBean("fb", NonInstantiatedFactoryBean.class, NonInstantiatedFactoryBean::new, bd -> bd.setLazyInit(true));
336335
context.refresh();
@@ -340,7 +339,7 @@ public void individualBeanWithFactoryBeanSupplier() {
340339
}
341340

342341
@Test
343-
public void individualBeanWithFactoryBeanSupplierAndTargetType() {
342+
void individualBeanWithFactoryBeanSupplierAndTargetType() {
344343
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
345344
RootBeanDefinition bd = new RootBeanDefinition();
346345
bd.setInstanceSupplier(NonInstantiatedFactoryBean::new);
@@ -351,12 +350,12 @@ public void individualBeanWithFactoryBeanSupplierAndTargetType() {
351350

352351
assertThat(context.getType("fb")).isEqualTo(String.class);
353352
assertThat(context.getType("&fb")).isEqualTo(FactoryBean.class);
354-
assertThat(context.getBeanNamesForType(FactoryBean.class).length).isEqualTo(1);
355-
assertThat(context.getBeanNamesForType(NonInstantiatedFactoryBean.class).length).isEqualTo(0);
353+
assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(1);
354+
assertThat(context.getBeanNamesForType(NonInstantiatedFactoryBean.class)).isEmpty();
356355
}
357356

358357
@Test
359-
public void individualBeanWithFactoryBeanObjectTypeAsTargetType() {
358+
void individualBeanWithFactoryBeanObjectTypeAsTargetType() {
360359
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
361360
RootBeanDefinition bd = new RootBeanDefinition();
362361
bd.setBeanClass(TypedFactoryBean.class);
@@ -366,12 +365,12 @@ public void individualBeanWithFactoryBeanObjectTypeAsTargetType() {
366365

367366
assertThat(context.getType("&fb")).isEqualTo(TypedFactoryBean.class);
368367
assertThat(context.getType("fb")).isEqualTo(String.class);
369-
assertThat(context.getBeanNamesForType(FactoryBean.class).length).isEqualTo(1);
370-
assertThat(context.getBeanNamesForType(TypedFactoryBean.class).length).isEqualTo(1);
368+
assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(1);
369+
assertThat(context.getBeanNamesForType(TypedFactoryBean.class)).hasSize(1);
371370
}
372371

373372
@Test
374-
public void individualBeanWithFactoryBeanObjectTypeAsTargetTypeAndLazy() {
373+
void individualBeanWithFactoryBeanObjectTypeAsTargetTypeAndLazy() {
375374
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
376375
RootBeanDefinition bd = new RootBeanDefinition();
377376
bd.setBeanClass(TypedFactoryBean.class);
@@ -385,16 +384,16 @@ public void individualBeanWithFactoryBeanObjectTypeAsTargetTypeAndLazy() {
385384
assertThat(context.getBean("&fb")).isInstanceOf(FactoryBean.class);
386385
assertThat(context.getType("&fb")).isEqualTo(TypedFactoryBean.class);
387386
assertThat(context.getType("fb")).isEqualTo(String.class);
388-
assertThat(context.getBeanNamesForType(FactoryBean.class).length).isEqualTo(1);
389-
assertThat(context.getBeanNamesForType(TypedFactoryBean.class).length).isEqualTo(1);
387+
assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(1);
388+
assertThat(context.getBeanNamesForType(TypedFactoryBean.class)).hasSize(1);
390389
}
391390

392391

393392
@Configuration
394393
static class Config {
395394

396395
@Bean
397-
public TestBean testBean() {
396+
TestBean testBean() {
398397
TestBean testBean = new TestBean();
399398
testBean.name = "foo";
400399
return testBean;
@@ -405,7 +404,7 @@ public TestBean testBean() {
405404
static class ConfigWithCustomName {
406405

407406
@Bean
408-
public TestBean testBean() {
407+
TestBean testBean() {
409408
return new TestBean();
410409
}
411410
}
@@ -446,7 +445,9 @@ static class BeanA {
446445
BeanB b;
447446
BeanC c;
448447

449-
@Autowired public BeanA(BeanB b, BeanC c) {
448+
449+
@Autowired
450+
BeanA(BeanB b, BeanC c) {
450451
this.b = b;
451452
this.c = c;
452453
}
@@ -464,7 +465,7 @@ static class BeanC {}
464465

465466
static class NonInstantiatedFactoryBean implements FactoryBean<String> {
466467

467-
public NonInstantiatedFactoryBean() {
468+
NonInstantiatedFactoryBean() {
468469
throw new IllegalStateException();
469470
}
470471

0 commit comments

Comments
 (0)