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

[BATCH-429] Move sub-packages over to core

Browse Source
This commit is contained in:
dsyer
2008-03-09 08:51:55 +00:00
parent 5f9350e1c1
commit bc94866754
138 changed files with 1560 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java
View File

@@ -13,15 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.configuration;
package org.springframework.batch.core.configuration.support;
import java.util.Collection;
import junit.framework.TestCase;
import org.springframework.batch.core.configuration.support.JobRegistryBeanPostProcessor;
import org.springframework.batch.core.configuration.support.MapJobRegistry;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.DuplicateJobException;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.beans.FatalBeanException;
import org.springframework.context.support.ClassPathXmlApplicationContext;

14
spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/MapJobRegistryTests.java
View File

@@ -13,16 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.configuration;
package org.springframework.batch.core.configuration.support;
import java.util.Collection;
import junit.framework.TestCase;
import org.springframework.batch.core.configuration.JobFactory;
import org.springframework.batch.core.configuration.support.MapJobRegistry;
import org.springframework.batch.core.configuration.support.ReferenceJobFactory;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.DuplicateJobException;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.batch.execution.job.JobSupport;
/**
* @author Dave Syer
@@ -33,7 +35,7 @@ public class MapJobRegistryTests extends TestCase {
private MapJobRegistry registry = new MapJobRegistry();
/**
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#unregister(String)}.
* Test method for {@link org.springframework.batch.core.configuration.support.MapJobRegistry#unregister(String)}.
* @throws Exception
*/
public void testUnregister() throws Exception {
@@ -51,7 +53,7 @@ public class MapJobRegistryTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#getJob(java.lang.String)}.
* Test method for {@link org.springframework.batch.core.configuration.support.MapJobRegistry#getJob(java.lang.String)}.
*/
public void testReplaceDuplicateConfiguration() throws Exception {
registry.register(new ReferenceJobFactory(new JobSupport("foo")));
@@ -65,7 +67,7 @@ public class MapJobRegistryTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#getJob(java.lang.String)}.
* Test method for {@link org.springframework.batch.core.configuration.support.MapJobRegistry#getJob(java.lang.String)}.
*/
public void testRealDuplicateConfiguration() throws Exception {
JobFactory jobFactory = new ReferenceJobFactory(new JobSupport("foo"));
@@ -80,7 +82,7 @@ public class MapJobRegistryTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#getJobNames()}.
* Test method for {@link org.springframework.batch.core.configuration.support.MapJobRegistry#getJobNames()}.
* @throws Exception
*/
public void testGetJobConfigurations() throws Exception {

18
spring-batch-core/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/job/AbstractJobTests.java
View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.job;
package org.springframework.batch.core.job;
import java.util.Collections;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.step.StepSupport;
import junit.framework.TestCase;
@@ -32,7 +32,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#JobConfiguration()}.
* {@link org.springframework.batch.core.job.AbstractJob#JobConfiguration()}.
*/
public void testJobConfiguration() {
job = new JobSupport();
@@ -41,7 +41,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#setBeanName(java.lang.String)}.
* {@link org.springframework.batch.core.job.AbstractJob#setBeanName(java.lang.String)}.
*/
public void testSetBeanName() {
job.setBeanName("foo");
@@ -50,7 +50,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#setBeanName(java.lang.String)}.
* {@link org.springframework.batch.core.job.AbstractJob#setBeanName(java.lang.String)}.
*/
public void testSetBeanNameWithNullName() {
job = new JobSupport(null);
@@ -61,7 +61,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#setStepNames(java.util.List)}.
* {@link org.springframework.batch.core.job.AbstractJob#setStepNames(java.util.List)}.
*/
public void testSetSteps() {
job.setSteps(Collections.singletonList(new StepSupport("step")));
@@ -70,7 +70,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#addStepName(org.springframework.batch.core.configuration.StepConfiguration)}.
* {@link org.springframework.batch.core.job.AbstractJob#addStepName(org.springframework.batch.core.configuration.StepConfiguration)}.
*/
public void testAddStep() {
job.addStep(new StepSupport("step"));
@@ -79,7 +79,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#setStartLimit(int)}.
* {@link org.springframework.batch.core.job.AbstractJob#setStartLimit(int)}.
*/
public void testSetStartLimit() {
assertEquals(Integer.MAX_VALUE, job.getStartLimit());
@@ -89,7 +89,7 @@ public class AbstractJobTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.job.AbstractJob#setRestartable(boolean)}.
* {@link org.springframework.batch.core.job.AbstractJob#setRestartable(boolean)}.
*/
public void testSetRestartable() {
assertFalse(job.isRestartable());

2
spring-batch-core/src/test/java/org/springframework/batch/execution/job/JobSupport.java → spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.job;
package org.springframework.batch.core.job;
import java.util.ArrayList;
import java.util.List;

21
spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.job;
package org.springframework.batch.core.job;
import java.util.ArrayList;
import java.util.List;
@@ -31,17 +31,18 @@ import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.SimpleJob;
import org.springframework.batch.core.listener.JobListenerSupport;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.execution.repository.SimpleJobRepository;
import org.springframework.batch.execution.repository.dao.JobExecutionDao;
import org.springframework.batch.execution.repository.dao.JobInstanceDao;
import org.springframework.batch.execution.repository.dao.MapJobExecutionDao;
import org.springframework.batch.execution.repository.dao.MapJobInstanceDao;
import org.springframework.batch.execution.repository.dao.MapStepExecutionDao;
import org.springframework.batch.execution.repository.dao.StepExecutionDao;
import org.springframework.batch.execution.step.AbstractStep;
import org.springframework.batch.execution.step.support.NeverSkipItemSkipPolicy;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.core.step.support.NeverSkipItemSkipPolicy;
import org.springframework.batch.item.AbstractItemReader;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;

2
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.launch;
package org.springframework.batch.core.launch;
import java.util.ArrayList;
import java.util.List;

5
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.launch;
package org.springframework.batch.core.launch;
import java.util.ArrayList;
import java.util.List;
@@ -25,8 +25,9 @@ import org.easymock.MockControl;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.launch.SimpleJobLauncher;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.core.task.TaskExecutor;

12
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
View File

@@ -13,19 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.launch.support;
package org.springframework.batch.core.launch.support;
import junit.framework.TestCase;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.support.CommandLineJobRunner;
import org.springframework.batch.core.launch.support.SystemExiter;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.execution.launch.support.CommandLineJobRunner;
import org.springframework.batch.execution.launch.support.SystemExiter;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.util.ClassUtils;
/**
* @author Lucas Ward
@@ -33,7 +34,8 @@ import org.springframework.batch.repeat.ExitStatus;
*/
public class CommandLineJobRunnerTests extends TestCase {
private static final String JOB = "org/springframework/batch/execution/bootstrap/support/job.xml";
private static final String JOB = ClassUtils.addResourcePathToPackagePath(CommandLineJobRunnerTests.class,
"job.xml");
private static final String JOB_NAME = "test-job";

4
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactoryTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.launch.support;
package org.springframework.batch.core.launch.support;
import java.text.DateFormat;
import java.text.DecimalFormat;
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory;
import org.springframework.batch.core.launch.support.DefaultJobParametersFactory;
import org.springframework.util.StringUtils;
/**

4
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactoryTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.launch.support;
package org.springframework.batch.core.launch.support;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.execution.launch.support.ScheduledJobParametersFactory;
import org.springframework.batch.core.launch.support.ScheduledJobParametersFactory;
import org.springframework.util.StringUtils;
/**

34
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncherTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.launch.support;
package org.springframework.batch.core.launch.support;
import java.util.ArrayList;
import java.util.List;
@@ -26,14 +26,14 @@ import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.configuration.support.MapJobRegistry;
import org.springframework.batch.core.configuration.support.ReferenceJobFactory;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.support.SimpleExportedJobLauncher;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.runtime.JobParametersFactory;
import org.springframework.batch.execution.configuration.MapJobRegistry;
import org.springframework.batch.execution.configuration.ReferenceJobFactory;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.support.PropertiesConverter;
@@ -66,7 +66,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
* @throws Exception
*/
public void testAfterPropertiesSet() throws Exception {
@@ -83,7 +83,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
* @throws Exception
*/
public void testAfterPropertiesSetWithLauncher() throws Exception {
@@ -105,7 +105,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#getStatistics()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#getStatistics()}.
*/
public void testGetStatistics() {
Properties props = launcher.getStatistics();
@@ -115,7 +115,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#getStatistics()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#getStatistics()}.
* @throws Exception
*/
public void testGetStatisticsWithContent() throws Exception {
@@ -128,7 +128,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#isRunning()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#isRunning()}.
* @throws Exception
*/
public void testIsRunning() throws Exception {
@@ -139,7 +139,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#isRunning()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#isRunning()}.
* @throws Exception
*/
public void testAlreadyRunning() throws Exception {
@@ -155,7 +155,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
*/
public void testRunNonExistentJob() {
String value = launcher.run("foo");
@@ -164,7 +164,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* @throws Exception
*/
public void testRunJobWithParameters() throws Exception {
@@ -176,7 +176,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* @throws Exception
*/
public void testRunJobWithParametersAndFactory() throws Exception {
@@ -196,7 +196,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#stop()}.
* {@link org.springframework.batch.core.launch.support.SimpleExportedJobLauncher#stop()}.
* @throws Exception
*/
public void testStop() throws Exception {

6
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapperTests.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.batch.execution.launch.support;
package org.springframework.batch.core.launch.support;
import java.util.HashMap;
import java.util.Map;
import junit.framework.TestCase;
import org.springframework.batch.execution.launch.support.ExitCodeMapper;
import org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper;
import org.springframework.batch.core.launch.support.ExitCodeMapper;
import org.springframework.batch.core.launch.support.SimpleJvmExitCodeMapper;
import org.springframework.batch.repeat.ExitStatus;
public class SimpleJvmExitCodeMapperTests extends TestCase {

4
spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java → spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java
View File

@@ -1,10 +1,10 @@
package org.springframework.batch.execution.launch.support;
package org.springframework.batch.core.launch.support;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.execution.launch.JobLauncher;
/**
* Mock Job Launcher. Normally, something like EasyMock would

3
spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java
View File

@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.listener;
package org.springframework.batch.core.listener;
import org.easymock.MockControl;
import org.springframework.batch.core.ChunkListener;
import org.springframework.batch.core.listener.CompositeChunkListener;
import junit.framework.TestCase;

3
spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java
View File

@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.listener;
package org.springframework.batch.core.listener;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.batch.core.ItemReadListener;
import org.springframework.batch.core.listener.CompositeItemReadListener;
/**
* @author Lucas Ward

3
spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
View File

@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.listener;
package org.springframework.batch.core.listener;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.batch.core.ItemWriteListener;
import org.springframework.batch.core.listener.CompositeItemWriteListener;
/**
* @author Lucas Ward

12
spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobListenerTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.listener;
package org.springframework.batch.core.listener;
import java.util.ArrayList;
import java.util.List;
@@ -23,9 +23,9 @@ import junit.framework.TestCase;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobListener;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.listener.CompositeJobListener;
import org.springframework.batch.core.listener.JobListenerSupport;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.listener.CompositeJobListener;
/**
* @author Dave Syer
@@ -39,7 +39,7 @@ public class CompositeJobListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeJobListener#setListeners(org.springframework.batch.core.JobListener[])}.
* {@link org.springframework.batch.core.listener.CompositeJobListener#setListeners(org.springframework.batch.core.JobListener[])}.
*/
public void testSetListeners() {
listener.setListeners(new JobListener[] { new JobListenerSupport() {
@@ -57,7 +57,7 @@ public class CompositeJobListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeJobListener#registerListener(org.springframework.batch.core.JobListener)}.
* {@link org.springframework.batch.core.listener.CompositeJobListener#registerListener(org.springframework.batch.core.JobListener)}.
*/
public void testSetListener() {
listener.register(new JobListenerSupport() {
@@ -71,7 +71,7 @@ public class CompositeJobListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeJobListener#beforeJob(JobExecution)}.
* {@link org.springframework.batch.core.listener.CompositeJobListener#beforeJob(JobExecution)}.
*/
public void testOpen() {
listener.register(new JobListenerSupport() {

13
spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeStepListenerTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.listener;
package org.springframework.batch.core.listener;
import java.util.ArrayList;
import java.util.List;
@@ -22,8 +22,9 @@ import junit.framework.TestCase;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.StepListener;
import org.springframework.batch.core.listener.CompositeStepListener;
import org.springframework.batch.core.listener.StepListenerSupport;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.repeat.ExitStatus;
/**
@@ -38,7 +39,7 @@ public class CompositeStepListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeStepListener#setListeners(org.springframework.batch.core.StepListener[])}.
* {@link org.springframework.batch.core.listener.CompositeStepListener#setListeners(org.springframework.batch.core.StepListener[])}.
*/
public void testSetListeners() {
listener.setListeners(new StepListener[] { new StepListenerSupport() {
@@ -58,7 +59,7 @@ public class CompositeStepListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeStepListener#registerListener(org.springframework.batch.core.StepListener)}.
* {@link org.springframework.batch.core.listener.CompositeStepListener#registerListener(org.springframework.batch.core.StepListener)}.
*/
public void testSetListener() {
listener.register(new StepListenerSupport() {
@@ -73,7 +74,7 @@ public class CompositeStepListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeStepListener#beforeStep(StepExecution)}.
* {@link org.springframework.batch.core.listener.CompositeStepListener#beforeStep(StepExecution)}.
*/
public void testOpen() {
listener.register(new StepListenerSupport() {
@@ -87,7 +88,7 @@ public class CompositeStepListenerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.listener.CompositeStepListener#beforeStep(StepExecution)}.
* {@link org.springframework.batch.core.listener.CompositeStepListener#beforeStep(StepExecution)}.
*/
public void testOnError() {
listener.register(new StepListenerSupport() {

3
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java
View File

@@ -13,13 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.repository;
package org.springframework.batch.core.repository.support;
import javax.sql.DataSource;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;

4
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MockStepDao.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.repository;
package org.springframework.batch.core.repository.support;
import java.util.List;
@@ -22,7 +22,7 @@ import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.repository.dao.StepExecutionDao;
import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
import org.springframework.batch.item.ExecutionContext;
public class MockStepDao implements StepExecutionDao {

7
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.repository;
package org.springframework.batch.core.repository.support;
import java.util.Date;
import java.util.HashMap;
@@ -9,10 +9,11 @@ import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;

13
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.repository;
package org.springframework.batch.core.repository.support;
import java.util.ArrayList;
import java.util.List;
@@ -28,11 +28,12 @@ import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.repository.dao.JobExecutionDao;
import org.springframework.batch.execution.repository.dao.JobInstanceDao;
import org.springframework.batch.execution.repository.dao.StepExecutionDao;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
/**

7
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractJobDaoTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.Date;
import java.util.List;
@@ -26,7 +26,10 @@ import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
import org.springframework.batch.core.repository.support.dao.NoSuchObjectException;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
import org.springframework.util.ClassUtils;

9
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.Date;
@@ -25,9 +25,12 @@ import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.dao.OptimisticLockingFailureException;

5
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoQueryTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +23,8 @@ import junit.framework.TestCase;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.JdbcJobExecutionDao;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;

5
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoTests.java
View File

@@ -1,8 +1,11 @@
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.List;
import java.util.Map;
import org.springframework.batch.core.repository.support.dao.AbstractJdbcBatchMetadataDao;
import org.springframework.batch.core.repository.support.dao.JdbcJobExecutionDao;
import org.springframework.batch.core.repository.support.dao.JdbcJobInstanceDao;
import org.springframework.batch.repeat.ExitStatus;
public class JdbcJobDaoTests extends AbstractJobDaoTests {

7
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoPrefixTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.List;
@@ -10,8 +10,9 @@ import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.JdbcStepExecutionDao;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;

4
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoTests.java
View File

@@ -1,8 +1,10 @@
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.List;
import java.util.Map;
import org.springframework.batch.core.repository.support.dao.AbstractJdbcBatchMetadataDao;
import org.springframework.batch.core.repository.support.dao.JdbcStepExecutionDao;
import org.springframework.batch.repeat.ExitStatus;
public class JdbcStepDaoTests extends AbstractStepDaoTests {

6
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDaoTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.Date;
import java.util.List;
@@ -9,7 +9,9 @@ import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
public class MapJobExecutionDaoTests extends TestCase {

6
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDaoTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import junit.framework.TestCase;
@@ -6,7 +6,9 @@ import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
public class MapJobInstanceDaoTests extends TestCase {

8
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDaoTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import java.util.HashMap;
@@ -26,8 +26,10 @@ import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.dao.OptimisticLockingFailureException;

4
spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/NoSuchBatchDomainObjectExceptionTests.java
View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.repository.dao;
package org.springframework.batch.core.repository.support.dao;
import org.springframework.batch.execution.repository.dao.NoSuchObjectException;
import org.springframework.batch.core.repository.support.dao.NoSuchObjectException;
import junit.framework.TestCase;

7
spring-batch-core/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionProxyResourceTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.resource;
package org.springframework.batch.core.resource;
import java.io.File;
import java.io.IOException;
@@ -27,8 +27,9 @@ import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.resource.StepExecutionProxyResource;
import org.springframework.batch.core.step.StepSupport;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;

20
spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/ItemOrientedStepTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.step;
package org.springframework.batch.core.step;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,15 +31,17 @@ import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.StepListener;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.listener.StepListenerSupport;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.repository.SimpleJobRepository;
import org.springframework.batch.execution.repository.dao.MapJobExecutionDao;
import org.springframework.batch.execution.repository.dao.MapJobInstanceDao;
import org.springframework.batch.execution.repository.dao.MapStepExecutionDao;
import org.springframework.batch.execution.step.support.JobRepositorySupport;
import org.springframework.batch.execution.step.support.SimpleItemHandler;
import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.core.step.ItemOrientedStep;
import org.springframework.batch.core.step.support.JobRepositorySupport;
import org.springframework.batch.core.step.support.SimpleItemHandler;
import org.springframework.batch.core.step.support.StepInterruptionPolicy;
import org.springframework.batch.item.AbstractItemReader;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.item.ExecutionContext;

2
spring-batch-core/src/test/java/org/springframework/batch/execution/step/StepSupport.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step;
package org.springframework.batch.core.step;
import org.springframework.batch.core.UnexpectedJobExecutionException;
import org.springframework.batch.core.JobInterruptedException;

7
spring-batch-core/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.step;
package org.springframework.batch.core.step;
import java.util.ArrayList;
import java.util.List;
@@ -13,10 +13,11 @@ import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.StepListener;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.listener.StepListenerSupport;
import org.springframework.batch.core.step.TaskletStep;
import org.springframework.batch.core.step.support.JobRepositorySupport;
import org.springframework.batch.core.tasklet.Tasklet;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.step.support.JobRepositorySupport;
import org.springframework.batch.repeat.ExitStatus;
public class TaskletStepTests extends TestCase {

17
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/DefaultStepFactoryBeanTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,14 +27,15 @@ import org.springframework.batch.core.BatchListener;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.job.SimpleJob;
import org.springframework.batch.core.listener.ItemListenerSupport;
import org.springframework.batch.execution.job.SimpleJob;
import org.springframework.batch.execution.repository.SimpleJobRepository;
import org.springframework.batch.execution.repository.dao.MapJobExecutionDao;
import org.springframework.batch.execution.repository.dao.MapJobInstanceDao;
import org.springframework.batch.execution.repository.dao.MapStepExecutionDao;
import org.springframework.batch.execution.step.AbstractStep;
import org.springframework.batch.execution.step.ItemOrientedStep;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.core.step.ItemOrientedStep;
import org.springframework.batch.core.step.support.DefaultStepFactoryBean;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemWriter;

2
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/JobRepositorySupport.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;

2
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/MockItemReader.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.MarkFailedException;

7
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBeanTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import java.util.ArrayList;
import java.util.List;
@@ -25,8 +25,9 @@ import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.launch.EmptyItemWriter;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.launch.EmptyItemWriter;
import org.springframework.batch.core.step.support.RepeatOperationsStepFactoryBean;
import org.springframework.batch.item.reader.ListItemReader;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.RepeatCallback;

6
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifierTests.java
View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.launch.support.ExitCodeMapper;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
import org.springframework.batch.execution.launch.support.ExitCodeMapper;
import org.springframework.batch.execution.step.support.SimpleExitStatusExceptionClassifier;
import org.springframework.batch.core.step.support.SimpleExitStatusExceptionClassifier;
import org.springframework.batch.repeat.ExitStatus;
import junit.framework.TestCase;

7
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandlerTests.java
View File

@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import junit.framework.TestCase;
import org.springframework.batch.core.step.support.SimpleRetryExceptionHandler;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.context.RepeatContextSupport;
import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler;
@@ -51,7 +52,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.step.support.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
* {@link org.springframework.batch.core.step.support.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
*/
public void testRethrowWhenRetryExhausted() {
@@ -76,7 +77,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.step.support.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
* {@link org.springframework.batch.core.step.support.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
*/
public void testNoRethrowWhenRetryNotExhausted() {

4
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SkipLimitReadFailurePolicyTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import java.io.FileNotFoundException;
import java.util.ArrayList;
@@ -21,6 +21,8 @@ import java.util.List;
import junit.framework.TestCase;
import org.springframework.batch.core.step.support.LimitCheckingItemSkipPolicy;
import org.springframework.batch.core.step.support.SkipLimitExceededException;
import org.springframework.batch.item.file.FlatFileParseException;
/**

15
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBeanTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,12 +27,13 @@ import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.repository.SimpleJobRepository;
import org.springframework.batch.execution.repository.dao.MapJobExecutionDao;
import org.springframework.batch.execution.repository.dao.MapJobInstanceDao;
import org.springframework.batch.execution.repository.dao.MapStepExecutionDao;
import org.springframework.batch.execution.step.ItemOrientedStep;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
import org.springframework.batch.core.step.ItemOrientedStep;
import org.springframework.batch.core.step.support.StatefulRetryStepFactoryBean;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemRecoverer;

16
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StepExecutorInterruptionTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import junit.framework.TestCase;
@@ -23,13 +23,15 @@ import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.JobSupport;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.repository.SimpleJobRepository;
import org.springframework.batch.execution.repository.dao.MapJobExecutionDao;
import org.springframework.batch.execution.repository.dao.MapJobInstanceDao;
import org.springframework.batch.execution.repository.dao.MapStepExecutionDao;
import org.springframework.batch.execution.step.ItemOrientedStep;
import org.springframework.batch.core.repository.support.SimpleJobRepository;
import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
import org.springframework.batch.core.step.ItemOrientedStep;
import org.springframework.batch.core.step.support.SimpleItemHandler;
import org.springframework.batch.core.step.support.StepExecutionSynchronizer;
import org.springframework.batch.item.AbstractItemReader;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;

3
spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicyTests.java
View File

@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.step.support;
package org.springframework.batch.core.step.support;
import junit.framework.TestCase;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.execution.step.support.ThreadStepInterruptionPolicy;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.context.RepeatContextSupport;

9
spring-batch-core/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/support/TaskletAdapterTests.java
View File

@@ -13,8 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.tasklet;
package org.springframework.batch.core.tasklet.support;
import org.springframework.batch.core.tasklet.support.TaskletAdapter;
import org.springframework.batch.repeat.ExitStatus;
import junit.framework.TestCase;
@@ -45,7 +46,7 @@ public class TaskletAdapterTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.execution.tasklet.TaskletAdapter#execute()}.
* Test method for {@link org.springframework.batch.core.tasklet.support.TaskletAdapter#execute()}.
* @throws Exception
*/
public void testExecuteWithExitStatus() throws Exception {
@@ -53,7 +54,7 @@ public class TaskletAdapterTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.execution.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
* Test method for {@link org.springframework.batch.core.tasklet.support.TaskletAdapter#mapResult(java.lang.Object)}.
*/
public void testMapResultWithNull() throws Exception {
tasklet.setTargetMethod("process");
@@ -61,7 +62,7 @@ public class TaskletAdapterTests extends TestCase {
}
/**
* Test method for {@link org.springframework.batch.execution.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
* Test method for {@link org.springframework.batch.core.tasklet.support.TaskletAdapter#mapResult(java.lang.Object)}.
*/
public void testMapResultWithNonNull() throws Exception {
tasklet.setTargetMethod("process");