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

BATCH-273: JobConfiguration renamed to Job

Browse Source
This commit is contained in:
lucasward
2008-01-14 22:58:44 +00:00
parent aeab6a219f
commit 03852c8cb2
24 changed files with 148 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationExceptionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobExceptionTests.java
View File

@@ -16,20 +16,20 @@
package org.springframework.batch.core.configuration;
import org.springframework.batch.core.AbstractExceptionTests;
import org.springframework.batch.core.configuration.JobConfigurationException;
import org.springframework.batch.core.domain.DuplicateJobException;
/**
* @author Dave Syer
*
*/
public class JobConfigurationExceptionTests extends AbstractExceptionTests {
public class DuplicateJobExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
* @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
*/
public Exception getException(String msg) throws Exception {
return new JobConfigurationException(msg);
return new DuplicateJobException(msg);
}
/*
@@ -38,7 +38,7 @@ public class JobConfigurationExceptionTests extends AbstractExceptionTests {
* java.lang.Throwable)
*/
public Exception getException(String msg, Throwable t) throws Exception {
return new JobConfigurationException(msg, t);
return new DuplicateJobException(msg, t);
}
}

8
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationExceptionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobExceptionTests.java
View File

@@ -16,20 +16,20 @@
package org.springframework.batch.core.configuration;
import org.springframework.batch.core.AbstractExceptionTests;
import org.springframework.batch.core.configuration.NoSuchJobConfigurationException;
import org.springframework.batch.core.domain.JobException;
/**
* @author Dave Syer
*
*/
public class NoSuchJobConfigurationExceptionTests extends AbstractExceptionTests {
public class JobExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
* @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
*/
public Exception getException(String msg) throws Exception {
return new NoSuchJobConfigurationException(msg);
return new JobException(msg);
}
/*
@@ -38,7 +38,7 @@ public class NoSuchJobConfigurationExceptionTests extends AbstractExceptionTests
* java.lang.Throwable)
*/
public Exception getException(String msg, Throwable t) throws Exception {
return new NoSuchJobConfigurationException(msg, t);
return new JobException(msg, t);
}
}

33
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobTests.java
View File

@@ -17,28 +17,31 @@ package org.springframework.batch.core.configuration;
import java.util.Collections;
import org.springframework.batch.core.domain.Job;
import org.springframework.batch.core.domain.StepSupport;
import junit.framework.TestCase;
/**
* @author Dave Syer
*
*/
public class JobConfigurationTests extends TestCase {
public class JobTests extends TestCase {
JobConfiguration configuration = new JobConfiguration("job");
Job configuration = new Job("job");
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#JobConfiguration()}.
* {@link org.springframework.batch.core.domain.Job#JobConfiguration()}.
*/
public void testJobConfiguration() {
configuration = new JobConfiguration();
configuration = new Job();
assertNull(configuration.getName());
}
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#setBeanName(java.lang.String)}.
* {@link org.springframework.batch.core.domain.Job#setBeanName(java.lang.String)}.
*/
public void testSetBeanName() {
configuration.setBeanName("foo");
@@ -47,10 +50,10 @@ public class JobConfigurationTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#setBeanName(java.lang.String)}.
* {@link org.springframework.batch.core.domain.Job#setBeanName(java.lang.String)}.
*/
public void testSetBeanNameWithNullName() {
configuration = new JobConfiguration(null);
configuration = new Job(null);
assertEquals(null, configuration.getName());
configuration.setBeanName("foo");
assertEquals("foo", configuration.getName());
@@ -58,25 +61,25 @@ public class JobConfigurationTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#setSteps(java.util.List)}.
* {@link org.springframework.batch.core.domain.Job#setSteps(java.util.List)}.
*/
public void testSetSteps() {
configuration.setSteps(Collections.singletonList(new StepConfigurationSupport("step")));
assertEquals(1, configuration.getStepConfigurations().size());
configuration.setSteps(Collections.singletonList(new StepSupport("step")));
assertEquals(1, configuration.getSteps().size());
}
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#addStep(org.springframework.batch.core.configuration.StepConfiguration)}.
* {@link org.springframework.batch.core.domain.Job#addStepInstance(org.springframework.batch.core.configuration.StepConfiguration)}.
*/
public void testAddStep() {
configuration.addStep(new StepConfigurationSupport("step"));
assertEquals(1, configuration.getStepConfigurations().size());
configuration.addStep(new StepSupport("step"));
assertEquals(1, configuration.getSteps().size());
}
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#setStartLimit(int)}.
* {@link org.springframework.batch.core.domain.Job#setStartLimit(int)}.
*/
public void testSetStartLimit() {
assertEquals(Integer.MAX_VALUE, configuration.getStartLimit());
@@ -86,7 +89,7 @@ public class JobConfigurationTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.core.configuration.JobConfiguration#setRestartable(boolean)}.
* {@link org.springframework.batch.core.domain.Job#setRestartable(boolean)}.
*/
public void testSetRestartable() {
assertFalse(configuration.isRestartable());

8
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationExceptionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/NoSuchJobExceptionTests.java
View File

@@ -16,20 +16,20 @@
package org.springframework.batch.core.configuration;
import org.springframework.batch.core.AbstractExceptionTests;
import org.springframework.batch.core.configuration.DuplicateJobConfigurationException;
import org.springframework.batch.core.domain.NoSuchJobException;
/**
* @author Dave Syer
*
*/
public class DuplicateJobConfigurationExceptionTests extends AbstractExceptionTests {
public class NoSuchJobExceptionTests extends AbstractExceptionTests {
/*
* (non-Javadoc)
* @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
*/
public Exception getException(String msg) throws Exception {
return new DuplicateJobConfigurationException(msg);
return new NoSuchJobException(msg);
}
/*
@@ -38,7 +38,7 @@ public class DuplicateJobConfigurationExceptionTests extends AbstractExceptionTe
* java.lang.Throwable)
*/
public Exception getException(String msg, Throwable t) throws Exception {
return new DuplicateJobConfigurationException(msg, t);
return new NoSuchJobException(msg, t);
}
}

13
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/SpringBeanJobConfigurationTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/SpringBeanJobTests.java
View File

@@ -18,17 +18,18 @@ package org.springframework.batch.core.configuration;
import junit.framework.TestCase;
import org.springframework.batch.core.domain.Job;
import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.support.ChildBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.context.support.StaticApplicationContext;
public class SpringBeanJobConfigurationTests extends TestCase {
public class SpringBeanJobTests extends TestCase {
public void testBeanName() throws Exception {
StaticApplicationContext context = new StaticApplicationContext();
JobConfiguration configuration = new JobConfiguration();
Job configuration = new Job();
context.getAutowireCapableBeanFactory().initializeBean(configuration,
"bean");
assertNotNull(configuration.getName());
@@ -43,8 +44,8 @@ public class SpringBeanJobConfigurationTests extends TestCase {
ConstructorArgumentValues args = new ConstructorArgumentValues();
args.addGenericArgumentValue("foo");
context.registerBeanDefinition("bean", new RootBeanDefinition(
JobConfiguration.class, args, null));
JobConfiguration configuration = (JobConfiguration) context
Job.class, args, null));
Job configuration = (Job) context
.getBean("bean");
assertNotNull(configuration.getName());
assertEquals("foo", configuration.getName());
@@ -57,9 +58,9 @@ public class SpringBeanJobConfigurationTests extends TestCase {
ConstructorArgumentValues args = new ConstructorArgumentValues();
args.addGenericArgumentValue("bar");
context.registerBeanDefinition("parent", new RootBeanDefinition(
JobConfiguration.class, args, null));
Job.class, args, null));
context.registerBeanDefinition("bean", new ChildBeanDefinition("parent"));
JobConfiguration configuration = (JobConfiguration) context
Job configuration = (Job) context
.getBean("bean");
assertNotNull(configuration.getName());
assertEquals("bar", configuration.getName());

17
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/StepConfigurationSupportTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/StepSupportTests.java
View File

@@ -17,6 +17,7 @@ package org.springframework.batch.core.configuration;
import junit.framework.TestCase;
import org.springframework.batch.core.domain.StepSupport;
import org.springframework.batch.core.tasklet.Tasklet;
import org.springframework.batch.repeat.ExitStatus;
@@ -24,27 +25,27 @@ import org.springframework.batch.repeat.ExitStatus;
* @author Dave Syer
*
*/
public class StepConfigurationSupportTests extends TestCase {
public class StepSupportTests extends TestCase {
private StepConfigurationSupport configuration = new StepConfigurationSupport("step");
private StepSupport configuration = new StepSupport("step");
/**
* Test method for {@link org.springframework.batch.core.configuration.StepConfigurationSupport#StepConfigurationSupport()}.
* Test method for {@link org.springframework.batch.core.domain.StepSupport#StepConfigurationSupport()}.
*/
public void testStepConfigurationSupport() {
configuration = new StepConfigurationSupport();
configuration = new StepSupport();
assertNull(configuration.getName());
}
/**
* Test method for {@link org.springframework.batch.core.configuration.StepConfigurationSupport#getName()}.
* Test method for {@link org.springframework.batch.core.domain.StepSupport#getName()}.
*/
public void testGetName() {
assertEquals("step", configuration.getName());
}
/**
* Test method for {@link org.springframework.batch.core.configuration.StepConfigurationSupport#getStartLimit()}.
* Test method for {@link org.springframework.batch.core.domain.StepSupport#getStartLimit()}.
*/
public void testGetStartLimit() {
assertEquals(Integer.MAX_VALUE, configuration.getStartLimit());
@@ -53,7 +54,7 @@ public class StepConfigurationSupportTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.core.configuration.StepConfigurationSupport#getTasklet()}.
* Test method for {@link org.springframework.batch.core.domain.StepSupport#getTasklet()}.
*/
public void testGetTasklet() {
assertEquals(null, configuration.getTasklet());
@@ -67,7 +68,7 @@ public class StepConfigurationSupportTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.core.configuration.StepConfigurationSupport#isAllowStartIfComplete()}.
* Test method for {@link org.springframework.batch.core.domain.StepSupport#isAllowStartIfComplete()}.
*/
public void testShouldAllowStartIfComplete() {
assertEquals(false, configuration.isAllowStartIfComplete());

14
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java
View File

@@ -47,20 +47,20 @@ public class JobInstanceTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.core.domain.JobInstance#getSteps()}.
* Test method for {@link org.springframework.batch.core.domain.JobInstance#getStepInstances()}.
*/
public void testGetSteps() {
assertEquals(0, instance.getSteps().size());
instance.setSteps(Collections.singletonList(new StepInstance()));
assertEquals(1, instance.getSteps().size());
assertEquals(0, instance.getStepInstances().size());
instance.setStepInstances(Collections.singletonList(new StepInstance()));
assertEquals(1, instance.getStepInstances().size());
}
/**
* Test method for {@link org.springframework.batch.core.domain.JobInstance#addStep(org.springframework.batch.core.domain.StepInstance)}.
* Test method for {@link org.springframework.batch.core.domain.JobInstance#addStepInstance(org.springframework.batch.core.domain.StepInstance)}.
*/
public void testAddStep() {
instance.addStep(new StepInstance());
assertEquals(1, instance.getSteps().size());
instance.addStepInstance(new StepInstance());
assertEquals(1, instance.getStepInstances().size());
}
/**