From d84fbeccf4dd8b2808f189445a90c26a88731e28 Mon Sep 17 00:00:00 2001 From: dsyer Date: Thu, 24 Jan 2008 10:14:00 +0000 Subject: [PATCH] OPEN - issue BATCH-304: BatchCommandLineLauncher simplified and rename http://jira.springframework.org/browse/BATCH-304 Use date format in test as well - surely this will be the same on all platforms? --- .../DefaultJobInstanceLabelGeneratorTests.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobInstanceLabelGeneratorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobInstanceLabelGeneratorTests.java index 5504e946e..dd431feaa 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobInstanceLabelGeneratorTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobInstanceLabelGeneratorTests.java @@ -13,6 +13,11 @@ import org.springframework.batch.core.domain.JobParametersBuilder; public class DefaultJobInstanceLabelGeneratorTests extends TestCase { + /** + * + */ + private static final Date DATE = new Date(0); + DefaultJobInstanceLabelGenerator instance = new DefaultJobInstanceLabelGenerator(); DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); @@ -35,18 +40,18 @@ public class DefaultJobInstanceLabelGeneratorTests extends TestCase { * Test method for {@link org.springframework.batch.execution.resource.DefaultJobInstanceLabelGenerator#getLabel()}. */ public void testDefaultGetLabel() throws Exception { - JobParameters jobParameters = new JobParametersBuilder().addDate("schedule.date", new Date(1)).addString("key", "bar").toJobParameters(); + JobParameters jobParameters = new JobParametersBuilder().addDate("schedule.date", DATE).addString("key", "bar").toJobParameters(); JobInstance job = new JobInstance(null, jobParameters, new Job(null)); - assertEquals("null-bar-19700101", instance.getLabel(job)); + assertEquals("null-bar-"+dateFormat.format(DATE), instance.getLabel(job)); } /** * Test method for {@link org.springframework.batch.execution.resource.DefaultJobInstanceLabelGenerator#getLabel()}. */ public void testGetLabelWithAllProperties() throws Exception { - JobParameters jobParameters = new JobParametersBuilder().addDate("schedule.date", new Date(1)).addString("key", "bar").toJobParameters(); + JobParameters jobParameters = new JobParametersBuilder().addDate("schedule.date", DATE).addString("key", "bar").toJobParameters(); JobInstance job = new JobInstance(null, jobParameters, new Job("foo")); - assertEquals("foo-bar-19700101", instance.getLabel(job)); + assertEquals("foo-bar-"+dateFormat.format(DATE), instance.getLabel(job)); } }