Skip to content

Commit e23c8bf

Browse files
sbrannensbrannen
committed
Polishing
1 parent 08e0baa commit e23c8bf

File tree

1 file changed

+34
-36
lines changed

1 file changed

+34
-36
lines changed

‎spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanFactoryPostProcessorTests.java

+34-36
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.beans.BeanWrapper;
2828
import org.springframework.beans.factory.FactoryBean;
2929
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
30-
import org.springframework.beans.factory.annotation.Qualifier;
3130
import org.springframework.beans.factory.config.BeanDefinition;
3231
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
3332
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -72,7 +71,7 @@ void beanNameWithFactoryBeanPrefixIsRejected() {
7271

7372
@Test
7473
void replaceBeanByNameWithMatchingBeanDefinition() {
75-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
74+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
7675
context.registerBean("descriptionBean", String.class, () -> "Original");
7776
context.refresh();
7877

@@ -81,7 +80,7 @@ void replaceBeanByNameWithMatchingBeanDefinition() {
8180

8281
@Test
8382
void replaceBeanByNameWithoutMatchingBeanDefinitionFails() {
84-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
83+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
8584

8685
assertThatIllegalStateException()
8786
.isThrownBy(context::refresh)
@@ -91,7 +90,7 @@ void replaceBeanByNameWithoutMatchingBeanDefinitionFails() {
9190

9291
@Test
9392
void replaceBeanByNameWithMatchingBeanDefinitionAndWrongTypeFails() {
94-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
93+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
9594
context.registerBean("descriptionBean", Integer.class, () -> -1);
9695

9796
assertThatIllegalStateException()
@@ -117,7 +116,7 @@ void replaceBeanByNameCanOverrideBeanProducedByFactoryBeanWithResolvableTypeObje
117116
}
118117

119118
private AnnotationConfigApplicationContext prepareContextWithFactoryBean(Object objectTypeAttribute) {
120-
AnnotationConfigApplicationContext context = createContext(CaseOverrideBeanProducedByFactoryBean.class);
119+
AnnotationConfigApplicationContext context = createContext(OverrideBeanProducedByFactoryBeanTestCase.class);
121120
// Register a TestFactoryBean that will not be overridden
122121
context.registerBean("testFactoryBean", TestFactoryBean.class, TestFactoryBean::new);
123122
// Register another TestFactoryBean that will be overridden
@@ -129,7 +128,7 @@ private AnnotationConfigApplicationContext prepareContextWithFactoryBean(Object
129128

130129
@Test
131130
void replaceBeanByTypeWithSingleMatchingBean() {
132-
AnnotationConfigApplicationContext context = createContext(CaseByType.class);
131+
AnnotationConfigApplicationContext context = createContext(ByTypeTestCase.class);
133132
context.registerBean("someInteger", Integer.class, () -> 1);
134133
context.refresh();
135134

@@ -138,30 +137,30 @@ void replaceBeanByTypeWithSingleMatchingBean() {
138137

139138
@Test
140139
void replaceBeanByTypeWithoutMatchingBeanFails() {
141-
AnnotationConfigApplicationContext context = createContext(CaseByType.class);
140+
AnnotationConfigApplicationContext context = createContext(ByTypeTestCase.class);
142141

143142
assertThatIllegalStateException()
144143
.isThrownBy(context::refresh)
145144
.withMessage("Unable to override bean: no beans of type java.lang.Integer " +
146-
"(as required by annotated field 'CaseByType.counter')");
145+
"(as required by annotated field 'ByTypeTestCase.counter')");
147146
}
148147

149148
@Test
150-
void replaceBeanByTypeWithMultipleMatchesAndNoQualifierFails() {
151-
AnnotationConfigApplicationContext context = createContext(CaseByType.class);
149+
void replaceBeanByTypeWithMultipleCandidatesAndNoQualifierFails() {
150+
AnnotationConfigApplicationContext context = createContext(ByTypeTestCase.class);
152151
context.registerBean("someInteger", Integer.class, () -> 1);
153152
context.registerBean("anotherInteger", Integer.class, () -> 2);
154153

155154
assertThatIllegalStateException()
156155
.isThrownBy(context::refresh)
157156
.withMessage("Unable to select a bean to override: found 2 beans " +
158-
"of type java.lang.Integer (as required by annotated field 'CaseByType.counter'): " +
157+
"of type java.lang.Integer (as required by annotated field 'ByTypeTestCase.counter'): " +
159158
"[someInteger, anotherInteger]");
160159
}
161160

162161
@Test
163-
void replaceBeanByTypeWithMultipleMatchesAndFieldNameAsFallbackQualifierMatches() {
164-
AnnotationConfigApplicationContext context = createContext(CaseByType.class);
162+
void replaceBeanByTypeWithMultipleCandidatesAndFieldNameAsFallbackQualifier() {
163+
AnnotationConfigApplicationContext context = createContext(ByTypeTestCase.class);
165164
context.registerBean("counter", Integer.class, () -> 1);
166165
context.registerBean("someInteger", Integer.class, () -> 2);
167166
context.refresh();
@@ -206,7 +205,7 @@ void replaceBeanByTypeWithMultipleCandidatesAndMultiplePrimaryBeansFails() {
206205

207206
@Test
208207
void createOrReplaceBeanByNameWithMatchingBeanDefinition() {
209-
AnnotationConfigApplicationContext context = createContext(CaseByNameWithReplaceOrCreateStrategy.class);
208+
AnnotationConfigApplicationContext context = createContext(ByNameWithReplaceOrCreateStrategyTestCase.class);
210209
context.registerBean("descriptionBean", String.class, () -> "Original");
211210
context.refresh();
212211

@@ -215,15 +214,15 @@ void createOrReplaceBeanByNameWithMatchingBeanDefinition() {
215214

216215
@Test
217216
void createOrReplaceBeanByNameWithoutMatchingDefinitionCreatesBeanDefinition() {
218-
AnnotationConfigApplicationContext context = createContext(CaseByNameWithReplaceOrCreateStrategy.class);
217+
AnnotationConfigApplicationContext context = createContext(ByNameWithReplaceOrCreateStrategyTestCase.class);
219218
context.refresh();
220219

221220
assertThat(context.getBean("descriptionBean")).isEqualTo("overridden");
222221
}
223222

224223
@Test
225224
void createOrReplaceBeanByTypeWithMatchingBean() {
226-
AnnotationConfigApplicationContext context = createContext(CaseByTypeWithReplaceOrCreateStrategy.class);
225+
AnnotationConfigApplicationContext context = createContext(ByTypeWithReplaceOrCreateStrategyTestCase.class);
227226
context.registerBean("someBean", String.class, () -> "Original");
228227
context.refresh();
229228

@@ -232,7 +231,7 @@ void createOrReplaceBeanByTypeWithMatchingBean() {
232231

233232
@Test
234233
void createOrReplaceBeanByTypeWithoutMatchingDefinitionCreatesBeanDefinition() {
235-
AnnotationConfigApplicationContext context = createContext(CaseByTypeWithReplaceOrCreateStrategy.class);
234+
AnnotationConfigApplicationContext context = createContext(ByTypeWithReplaceOrCreateStrategyTestCase.class);
236235
context.refresh();
237236

238237
String generatedBeanName = "java.lang.String#0";
@@ -242,7 +241,7 @@ void createOrReplaceBeanByTypeWithoutMatchingDefinitionCreatesBeanDefinition() {
242241

243242
@Test
244243
void postProcessorShouldNotTriggerEarlyInitialization() {
245-
AnnotationConfigApplicationContext context = createContext(CaseByTypeWithReplaceOrCreateStrategy.class);
244+
AnnotationConfigApplicationContext context = createContext(ByTypeWithReplaceOrCreateStrategyTestCase.class);
246245

247246
context.register(FactoryBeanRegisteringPostProcessor.class);
248247
context.register(EarlyBeanInitializationDetector.class);
@@ -252,7 +251,7 @@ void postProcessorShouldNotTriggerEarlyInitialization() {
252251

253252
@Test
254253
void replaceBeanByNameWithMatchingBeanDefinitionWithExplicitSingletonScope() {
255-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
254+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
256255
RootBeanDefinition definition = new RootBeanDefinition(String.class, () -> "ORIGINAL");
257256
definition.setScope(BeanDefinition.SCOPE_SINGLETON);
258257
context.registerBeanDefinition("descriptionBean", definition);
@@ -265,7 +264,7 @@ void replaceBeanByNameWithMatchingBeanDefinitionWithExplicitSingletonScope() {
265264
@Test
266265
void replaceBeanByNameWithMatchingBeanDefinitionForClassBasedSingletonFactoryBean() {
267266
String beanName = "descriptionBean";
268-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
267+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
269268
RootBeanDefinition factoryBeanDefinition = new RootBeanDefinition(SingletonStringFactoryBean.class);
270269
context.registerBeanDefinition(beanName, factoryBeanDefinition);
271270

@@ -277,7 +276,7 @@ void replaceBeanByNameWithMatchingBeanDefinitionForClassBasedSingletonFactoryBea
277276
@Test // gh-33800
278277
void replaceBeanByNameWithMatchingBeanDefinitionForClassBasedNonSingletonFactoryBean() {
279278
String beanName = "descriptionBean";
280-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
279+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
281280
RootBeanDefinition factoryBeanDefinition = new RootBeanDefinition(NonSingletonStringFactoryBean.class);
282281
context.registerBeanDefinition(beanName, factoryBeanDefinition);
283282

@@ -314,7 +313,7 @@ void replaceBeanByNameWithMatchingBeanDefinitionForInterfaceBasedNonSingletonFac
314313
void replaceBeanByNameWithMatchingBeanDefinitionWithPrototypeScopeFails() {
315314
String beanName = "descriptionBean";
316315

317-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
316+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
318317
RootBeanDefinition definition = new RootBeanDefinition(String.class, () -> "ORIGINAL");
319318
definition.setScope(BeanDefinition.SCOPE_PROTOTYPE);
320319
context.registerBeanDefinition(beanName, definition);
@@ -329,7 +328,7 @@ void replaceBeanByNameWithMatchingBeanDefinitionWithCustomScopeFails() {
329328
String beanName = "descriptionBean";
330329
String scope = "customScope";
331330

332-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
331+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
333332
ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
334333
beanFactory.registerScope(scope, new SimpleThreadScope());
335334
RootBeanDefinition definition = new RootBeanDefinition(String.class, () -> "ORIGINAL");
@@ -356,7 +355,7 @@ void replaceBeanByNameWithMatchingBeanDefinitionForPrototypeScopedFactoryBeanFai
356355

357356
@Test
358357
void replaceBeanByNameWithMatchingBeanDefinitionRetainsPrimaryAndFallbackFlags() {
359-
AnnotationConfigApplicationContext context = createContext(CaseByName.class);
358+
AnnotationConfigApplicationContext context = createContext(ByNameTestCase.class);
360359
RootBeanDefinition definition = new RootBeanDefinition(String.class, () -> "ORIGINAL");
361360
definition.setPrimary(true);
362361
definition.setFallback(true);
@@ -373,7 +372,7 @@ void replaceBeanByNameWithMatchingBeanDefinitionRetainsPrimaryAndFallbackFlags()
373372

374373
@Test
375374
void qualifiedElementIsSetToBeanOverrideFieldForNonexistentBeanDefinition() {
376-
AnnotationConfigApplicationContext context = createContext(CaseByNameWithQualifier.class);
375+
AnnotationConfigApplicationContext context = createContext(TestBeanByNameTestCase.class);
377376

378377
assertThatNoException().isThrownBy(context::refresh);
379378
assertThat(context.getBeanDefinition("descriptionBean"))
@@ -384,12 +383,12 @@ void qualifiedElementIsSetToBeanOverrideFieldForNonexistentBeanDefinition() {
384383
private void qualifiedElementIsField(RootBeanDefinition def) {
385384
assertThat(def.getQualifiedElement()).isInstanceOfSatisfying(Field.class,
386385
field -> {
387-
assertThat(field.getDeclaringClass()).isEqualTo(CaseByNameWithQualifier.class);
386+
assertThat(field.getDeclaringClass()).isEqualTo(TestBeanByNameTestCase.class);
388387
assertThat(field.getName()).as("annotated field name").isEqualTo("description");
389388
});
390389
}
391390

392-
private AnnotationConfigApplicationContext createContext(Class<?> testClass) {
391+
private static AnnotationConfigApplicationContext createContext(Class<?> testClass) {
393392
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
394393
Set<BeanOverrideHandler> handlers = new LinkedHashSet<>(BeanOverrideHandler.forTestClass(testClass));
395394
new BeanOverrideContextCustomizer(handlers).customizeContext(context, mock(MergedContextConfiguration.class));
@@ -409,35 +408,35 @@ static class FactoryBeanPrefixTestCase {
409408

410409
}
411410

412-
static class CaseByName {
411+
static class ByNameTestCase {
413412

414413
@DummyBean(beanName = "descriptionBean")
415414
private String description;
416415

417416
}
418417

419-
static class CaseByType {
418+
static class ByTypeTestCase {
420419

421420
@DummyBean
422421
private Integer counter;
423422

424423
}
425424

426-
static class CaseByNameWithReplaceOrCreateStrategy {
425+
static class ByNameWithReplaceOrCreateStrategyTestCase {
427426

428427
@DummyBean(beanName = "descriptionBean", strategy = BeanOverrideStrategy.REPLACE_OR_CREATE)
429428
private String description;
430429

431430
}
432431

433-
static class CaseByTypeWithReplaceOrCreateStrategy {
432+
static class ByTypeWithReplaceOrCreateStrategyTestCase {
434433

435434
@DummyBean(strategy = BeanOverrideStrategy.REPLACE_OR_CREATE)
436435
private String description;
437436

438437
}
439438

440-
static class CaseByNameAndByTypeWithReplaceOrCreateStrategy {
439+
static class ByNameAndByTypeWithReplaceOrCreateStrategyTestCase {
441440

442441
@DummyBean(beanName = "descriptionBean", strategy = BeanOverrideStrategy.REPLACE_OR_CREATE)
443442
private String description;
@@ -447,18 +446,17 @@ static class CaseByNameAndByTypeWithReplaceOrCreateStrategy {
447446

448447
}
449448

450-
static class CaseOverrideBeanProducedByFactoryBean {
449+
static class OverrideBeanProducedByFactoryBeanTestCase {
451450

452451
@DummyBean(beanName = "beanToBeOverridden")
453452
CharSequence description;
454453

455454
}
456455

457-
static class CaseByNameWithQualifier {
456+
static class TestBeanByNameTestCase {
458457

459-
@Qualifier("preferThis")
460458
@TestBean(name = "descriptionBean")
461-
private String description;
459+
String description;
462460

463461
static String descriptionBean() {
464462
return "overridden";

0 commit comments

Comments
 (0)