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

BATCH-1911 - Fixed merge conflicts and schema version issue

Browse Source
This commit is contained in:
Michael Minella
2012-12-17 16:31:06 -06:00
parent 8abd2ec69f
commit 75ee3e0bb4
5 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java
View File

@@ -85,20 +85,6 @@ public class DefaultJobLoaderTests {
loader.afterPropertiesSet();
}
@Test
public void createWithSimpleJobRegistry() {
final DefaultJobLoader loader = new DefaultJobLoader();
loader.setJobRegistry(new JobRegistryMock());
try {
loader.afterPropertiesSet();
fail("Should have failed to create job loader without a step registry (" +
"and the job registry could not fulfill that role)");
} catch (IllegalArgumentException e) {
// OK
}
}
@Test
public void testRegistryUpdated() throws DuplicateJobException {
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
@@ -135,7 +121,7 @@ public class DefaultJobLoaderTests {
@Test
public void testNoStepRegistryAvailable() throws DuplicateJobException {
final JobLoader loader = new DefaultJobLoader(jobRegistry);
ClassPathXmlApplicationContextFactory factory = new ClassPathXmlApplicationContextFactory(
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
new ClassPathResource("job-context-with-steps.xml", getClass()));
loader.load(factory);
// No step registry available so just registering the jobs
@@ -144,7 +130,7 @@ public class DefaultJobLoaderTests {
@Test
public void testLoadWithJobThatIsNotAStepLocator() throws DuplicateJobException {
ClassPathXmlApplicationContextFactory factory = new ClassPathXmlApplicationContextFactory(
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
new ByteArrayResource(BASIC_JOB_XML.getBytes()));
try {
jobLoader.load(factory);
@@ -159,7 +145,7 @@ public class DefaultJobLoaderTests {
@Test
public void testLoadWithJobThatIsNotAStepLocatorNoStepRegistry() throws DuplicateJobException {
final JobLoader loader = new DefaultJobLoader(jobRegistry);
ClassPathXmlApplicationContextFactory factory = new ClassPathXmlApplicationContextFactory(
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
new ByteArrayResource(BASIC_JOB_XML.getBytes()));
try {
loader.load(factory);

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/job-context-with-separate-steps.xml
View File

@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<description>
Declares two jobs with a set of steps. Also declares two steps that are not attached to any job

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/job-context-with-steps.xml
View File

@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="job1"
class="org.springframework.batch.core.job.JobSupport">

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/trivial-context-autoregister.xml
View File

@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="test-job" class="org.springframework.batch.core.job.JobSupport">
<property name="steps">

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/trivial-context.xml
View File

@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="test-job"
class="org.springframework.batch.core.job.JobSupport">