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

BATCH-1745: Fixed rebase issue

Browse Source
This commit is contained in:
Michael Minella
2013-01-22 13:25:40 -06:00
parent e86dd4685a
commit 9d53631ce9
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTest.java
View File

@@ -1,6 +1,5 @@
package org.springframework.batch.core.configuration.xml;
<<<<<<< HEAD
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -16,29 +15,14 @@ import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.beans.factory.annotation.Autowired;
=======
import static org.junit.Assert.assertTrue;
import javax.annotation.Resource;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.batch.core.step.AbstractStep;
>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
<<<<<<< HEAD
=======
//@Ignore
>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class TaskletStepAllowStartIfCompleteTest {
<<<<<<< HEAD
@Autowired
Job job;
@@ -69,16 +53,4 @@ public class TaskletStepAllowStartIfCompleteTest {
int count = jobRepository.getStepExecutionCount(jobExecution.getJobInstance(), "simpleJob.step1");
assertEquals(2, count);
}
=======
@Resource
private ApplicationContext context;
@Test
public void test() throws Exception {
//retrieve the step from the context and see that it's allow is set
AbstractStep abstractStep = context.getBean(AbstractStep.class);
assertTrue(abstractStep.isAllowStartIfComplete());
}
>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
}

11
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTest-context.xml
View File

@@ -8,11 +8,7 @@
<bean id="jobRepository" class="org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean"/>
<batch:job id="simpleJob">
<<<<<<< HEAD
<batch:step id="simpleJob.step1" allow-start-if-complete="true" next="simpleJob.step2">
=======
<batch:step id="simpleJob.step1" allow-start-if-complete="true">
>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
<batch:tasklet>
<bean class="org.springframework.batch.core.step.tasklet.MethodInvokingTaskletAdapter">
<property name="targetObject">
@@ -24,7 +20,6 @@
</bean>
</batch:tasklet>
</batch:step>
<<<<<<< HEAD
<batch:step id="simpleJob.step2">
<batch:tasklet>
<bean class="org.springframework.batch.core.step.tasklet.MethodInvokingTaskletAdapter">
@@ -37,8 +32,6 @@
</bean>
</batch:tasklet>
</batch:step>
=======
>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
</batch:job>
<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry"/>
@@ -46,11 +39,7 @@
<bean class="org.springframework.batch.core.configuration.support.JobRegistryBeanPostProcessor">
<property name="jobRegistry" ref="jobRegistry"/>
</bean>
<<<<<<< HEAD
=======
>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
<bean id="transactionManager" class="org.springframework.batch.support.transaction.ResourcelessTransactionManager"/>
</beans>