BATCH-1443: add XML support for JobStep

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobStepParserTests.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+
+/**
+ * @author Dave Syer
+ *
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class JobStepParserTests {
+	
+	@Autowired
+	@Qualifier("job1")
+	private Job job1;
+
+	@Autowired
+	@Qualifier("job2")
+	private Job job2;
+
+	@Autowired
+	private JobRepository jobRepository;
+
+	@Autowired
+	private MapJobRepositoryFactoryBean mapJobRepositoryFactoryBean;
+	
+	@Before
+	public void setUp() {
+		mapJobRepositoryFactoryBean.clear();
+	}
+
+	@Test
+	public void testFlowStep() throws Exception {
+		assertNotNull(job1);
+		JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(), new JobParameters());
+		job1.execute(jobExecution);
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+		List<String> stepNames = getStepNames(jobExecution);
+		assertEquals(3, stepNames.size());
+		assertEquals("[s1, job1.flow, s4]", stepNames.toString());
+	}
+
+	@Test
+	public void testFlowExternalStep() throws Exception {
+		assertNotNull(job2);
+		JobExecution jobExecution = jobRepository.createJobExecution(job2.getName(), new JobParameters());
+		job2.execute(jobExecution);
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+		List<String> stepNames = getStepNames(jobExecution);
+		assertEquals(3, stepNames.size());
+		assertEquals("[job2.s1, job2.flow, job2.s4]", stepNames.toString());
+	}
+
+	private List<String> getStepNames(JobExecution jobExecution) {
+		List<String> list = new ArrayList<String>();
+		for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
+			list.add(stepExecution.getStepName());
+		}
+		return list;
+	}
+
+}

spring-batch-core/src/test/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractorJobParametersTests.java

@@ -44,6 +44,14 @@ public class DefaultJobParametersExtractorJobParametersTests {
 		assertEquals("{foo=bar}", jobParameters.toString());
 	}
 	
+	@Test
+	public void testGetAllJobParameters() throws Exception {
+		StepExecution stepExecution = getStepExecution("foo=bar,spam=bucket");
+		extractor.setKeys(new String[] {"foo", "bar"});
+		JobParameters jobParameters = extractor.getJobParameters(null, stepExecution);
+		assertEquals("{spam=bucket, foo=bar}", jobParameters.toString());
+	}
+	
 	@Test
 	public void testGetNamedLongStringParameters() throws Exception {
 		StepExecution stepExecution = getStepExecution("foo=bar");

spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobStepParserTests-context.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch"
+	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<beans:import resource="common-context.xml" />
+
+	<job id="job1">
+		<step id="s1" parent="step1" next="job1.flow" />
+		<step id="job1.flow" next="s4">
+			<job ref="flow" />
+		</step>
+		<step id="s4" parent="step4" />
+	</job>
+
+	<job id="job2">
+		<step id="job2.s1" parent="step1" next="job2.flow" />
+		<step id="job2.flow" parent="flow.step" next="job2.s4" />
+		<step id="job2.s4" parent="step4" />
+	</job>
+
+	<job id="flow">
+		<step id="s2" parent="step2" next="s3" />
+		<step id="s3" parent="step3" />
+	</job>
+
+	<step id="flow.step" abstract="true">
+		<job ref="flow" job-launcher="jobLauncher" job-parameters-extractor="jobParametersExtractor"/>
+	</step>
+	
+	<beans:bean id="jobParametersExtractor" class="org.springframework.batch.core.step.job.DefaultJobParametersExtractor"/>
+	
+	<beans:bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
+		<beans:property name="jobRepository" ref="jobRepository"/>
+	</beans:bean>
+
+</beans:beans>