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

BATCH-2019: Updated to support Spring 3.1 profiles with properties

Browse Source
This commit is contained in:
Michael Minella
2013-04-30 10:38:29 -05:00
parent e12e42fd1a
commit 80eb802658
4 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
View File

@@ -58,8 +58,8 @@ public class GenericApplicationContextFactoryTests {
getClass(), "parent-context.xml")));
ConfigurableApplicationContext context = factory.createApplicationContext();
assertEquals("test-job", context.getBeanNamesForType(Job.class)[0]);
assertEquals("bar", ((Job) context.getBean("test-job", Job.class)).getName());
assertEquals(4, ((Foo) context.getBean("foo", Foo.class)).values[1], 0.01);
assertEquals("bar", context.getBean("test-job", Job.class).getName());
assertEquals(4, context.getBean("foo", Foo.class).values[1], 0.01);
}
@Test
@@ -70,7 +70,20 @@ public class GenericApplicationContextFactoryTests {
getClass(), "parent-context.xml")));
ConfigurableApplicationContext context = factory.createApplicationContext();
assertEquals("test-job", context.getBeanNamesForType(Job.class)[0]);
assertEquals("spam", ((Job) context.getBean("test-job", Job.class)).getName());
assertEquals("spam", context.getBean("test-job", Job.class).getName());
}
@Test
public void testBeanFactoryProfileRespected() {
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
new ClassPathResource(ClassUtils.addResourcePathToPackagePath(getClass(), "profiles.xml")));
ClassPathXmlApplicationContext parentContext = new ClassPathXmlApplicationContext(ClassUtils.addResourcePathToPackagePath(
getClass(), "parent-context.xml"));
parentContext.getEnvironment().setActiveProfiles("preferred");
factory.setApplicationContext(parentContext);
ConfigurableApplicationContext context = factory.createApplicationContext();
assertEquals("test-job", context.getBeanNamesForType(Job.class)[0]);
assertEquals("spam", context.getBean("test-job", Job.class).getName());
}
@Test
@@ -84,8 +97,8 @@ public class GenericApplicationContextFactoryTests {
factory.setBeanFactoryPostProcessorClasses(classes);
ConfigurableApplicationContext context = factory.createApplicationContext();
assertEquals("test-job", context.getBeanNamesForType(Job.class)[0]);
assertEquals("${foo}", ((Job) context.getBean("test-job", Job.class)).getName());
assertEquals(4, ((Foo) context.getBean("foo", Foo.class)).values[1], 0.01);
assertEquals("${foo}", context.getBean("test-job", Job.class).getName());
assertEquals(4, context.getBean("foo", Foo.class).values[1], 0.01);
}
@Test
@@ -97,10 +110,10 @@ public class GenericApplicationContextFactoryTests {
factory.setCopyConfiguration(false);
ConfigurableApplicationContext context = factory.createApplicationContext();
assertEquals("test-job", context.getBeanNamesForType(Job.class)[0]);
assertEquals("bar", ((Job) context.getBean("test-job", Job.class)).getName());
assertEquals("bar", context.getBean("test-job", Job.class).getName());
// The CustomEditorConfigurer is a BeanFactoryPostProcessor so the
// editor gets copied anyway!
assertEquals(4, ((Foo) context.getBean("foo", Foo.class)).values[1], 0.01);
assertEquals(4, context.getBean("foo", Foo.class).values[1], 0.01);
}
@Test