Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1213:

Browse Source 
*Code cleanup of CoreNamespacePostProcessor and CoreNamespaceBeanDefinitionUtils.
 *Ensure that steps defined with the batch namespace always use StepParseStepFactoryBean
 *Additional unit tests for the behavior of mixed hierarchies of batch and beans namespace defined steps
This commit is contained in:
dhgarrette
2009-05-23 15:07:11 +00:00
parent dfbdd5c8a8
commit da58dfc835
5 changed files with 140 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
View File

@@ -317,15 +317,73 @@ public class StepParserTests {
}
@Test
public void testTaskletElementOverridesParentBeanClass() {
public void testInlineTaskletElementOverridesParentBeanClass() {
ApplicationContext ctx = stepParserParentAttributeTestsCtx;
assertTrue(ctx.containsBean("&s12"));
Object factoryBean = ctx.getBean("&s12");
assertTrue(factoryBean instanceof StepParserStepFactoryBean);
assertTrue(ctx.containsBean("dummyStep"));
Object dummyStep = ctx.getBean("dummyStep");
assertTrue(dummyStep instanceof DummyStep);
assertTrue(ctx.containsBean("s12"));
Object bean = ctx.getBean("s12");
assertTrue(bean instanceof TaskletStep);
}
@Test
public void testTaskletElementOverridesChildBeanClass() {
ApplicationContext ctx = stepParserParentAttributeTestsCtx;
assertTrue(ctx.containsBean("&s13"));
Object factoryBean = ctx.getBean("&s13");
assertTrue(factoryBean instanceof StepParserStepFactoryBean);
assertTrue(ctx.containsBean("s13"));
Object bean = ctx.getBean("s13");
assertTrue(bean instanceof TaskletStep);
assertTrue(ctx.containsBean("&dummyStepWithTaskletOnParent"));
Object dummyStepFb = ctx.getBean("&dummyStepWithTaskletOnParent");
assertTrue(dummyStepFb instanceof StepParserStepFactoryBean);
assertTrue(ctx.containsBean("dummyStepWithTaskletOnParent"));
Object dummyStep = ctx.getBean("dummyStepWithTaskletOnParent");
assertTrue(dummyStep instanceof TaskletStep);
assertTrue(ctx.containsBean("&standaloneStepWithTasklet"));
Object standaloneStepFb = ctx.getBean("&standaloneStepWithTasklet");
assertTrue(standaloneStepFb instanceof StepParserStepFactoryBean);
assertTrue(ctx.containsBean("standaloneStepWithTasklet"));
Object standaloneStep = ctx.getBean("standaloneStepWithTasklet");
assertTrue(standaloneStep instanceof TaskletStep);
}
@Test
public void testTaskletElementOverridesParentBeanClass() {
ApplicationContext ctx = stepParserParentAttributeTestsCtx;
assertTrue(ctx.containsBean("&s14"));
Object factoryBean = ctx.getBean("&s14");
assertTrue(factoryBean instanceof StepParserStepFactoryBean);
assertTrue(ctx.containsBean("s12"));
Object bean = ctx.getBean("s12");
assertTrue(bean instanceof TaskletStep);
assertTrue(ctx.containsBean("&standaloneStepWithTaskletAndDummyParent"));
Object standaloneWithTaskletFb = ctx.getBean("&standaloneStepWithTaskletAndDummyParent");
assertTrue(standaloneWithTaskletFb instanceof StepParserStepFactoryBean);
assertTrue(ctx.containsBean("standaloneStepWithTaskletAndDummyParent"));
Object standaloneWithTasklet = ctx.getBean("standaloneStepWithTaskletAndDummyParent");
assertTrue(standaloneWithTasklet instanceof TaskletStep);
assertTrue(ctx.containsBean("dummyStep"));
Object dummyStep = ctx.getBean("dummyStep");
assertTrue(dummyStep instanceof DummyStep);
}
}