From e41d046165c8dd42a086681da224e3e2cbeea431 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 23 Oct 2007 13:05:47 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-159: JobExecutor should return a JobExecution (which itself contains the ExitStatus) http://opensource.atlassian.com/projects/spring/browse/BATCH-159 Rollback previous change... --- .../batch/execution/facade/SimpleJobExecutorFacade.java | 3 +-- .../execution/facade/SimpleJobExecutorFacadeTests.java | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java b/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java index d30758d7e..f8cf898fc 100644 --- a/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java +++ b/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java @@ -59,8 +59,7 @@ public class SimpleJobExecutorFacade implements JobExecutorFacade, private JobRepository jobRepository; - // Package access for unit testing... - Map jobExecutionRegistry = new HashMap(); + private Map jobExecutionRegistry = new HashMap(); // there is no sensible default for this private JobConfigurationLocator jobConfigurationLocator; diff --git a/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java b/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java index cdc4d44db..1596f518f 100644 --- a/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java @@ -16,6 +16,7 @@ package org.springframework.batch.execution.facade; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -35,6 +36,7 @@ import org.springframework.batch.core.runtime.SimpleJobIdentifier; import org.springframework.batch.io.exception.BatchCriticalException; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.context.RepeatContextSupport; +import org.springframework.util.ReflectionUtils; /** * SimpleBatchContainer unit tests. @@ -246,7 +248,9 @@ public class SimpleJobExecutorFacadeTests extends TestCase { private void registerExecution(SimpleJobIdentifier runtimeInformation, JobExecution execution) throws NoSuchFieldException, IllegalAccessException { - Map map = (Map) jobExecutorFacade.jobExecutionRegistry; + Field field = SimpleJobExecutorFacade.class.getDeclaredField("jobExecutionRegistry"); + ReflectionUtils.makeAccessible(field); + Map map = (Map) field.get(jobExecutorFacade); map.put(runtimeInformation, execution); }