diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java index cf7d7f43b..ab041cad8 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/ExecutionContextTestUtils.java @@ -34,11 +34,11 @@ import org.springframework.batch.item.ExecutionContext; public class ExecutionContextTestUtils { @SuppressWarnings("unchecked") - static T getFromJob(JobExecution jobExecution, String key) { + static T getValueFromJob(JobExecution jobExecution, String key) { return (T) jobExecution.getExecutionContext().get(key); } - static T getFromStep(JobExecution jobExecution, String stepName, String key) { + static T getValueFromStepInJob(JobExecution jobExecution, String stepName, String key) { StepExecution stepExecution = null; List stepNames = new ArrayList(); for (StepExecution candidate : jobExecution.getStepExecutions()) { @@ -58,7 +58,7 @@ public class ExecutionContextTestUtils { } @SuppressWarnings("unchecked") - static T getFromStep(StepExecution stepExecution, String key) { + static T getValueFromStep(StepExecution stepExecution, String key) { return (T) stepExecution.getExecutionContext().get(key); } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java index c2a436613..a5e1849a9 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/ExecutionContextTestUtilsTests.java @@ -32,7 +32,7 @@ public class ExecutionContextTestUtilsTests { Date date = new Date(); JobExecution jobExecution = MetaDataInstanceFactory.createJobExecution(); jobExecution.getExecutionContext().put("foo", date); - Date result = ExecutionContextTestUtils.getFromJob(jobExecution, "foo"); + Date result = ExecutionContextTestUtils.getValueFromJob(jobExecution, "foo"); assertEquals(date, result); } @@ -42,7 +42,7 @@ public class ExecutionContextTestUtilsTests { JobExecution jobExecution = MetaDataInstanceFactory.createJobExecutionWithStepExecutions(123L, Arrays.asList("foo", "bar")); StepExecution stepExecution = jobExecution.createStepExecution("spam"); stepExecution.getExecutionContext().put("foo", date); - Date result = ExecutionContextTestUtils.getFromStep(jobExecution, "spam", "foo"); + Date result = ExecutionContextTestUtils.getValueFromStepInJob(jobExecution, "spam", "foo"); assertEquals(date, result); } @@ -50,7 +50,7 @@ public class ExecutionContextTestUtilsTests { public void testFromStepInJobNoSuchStep() throws Exception { Date date = new Date(); JobExecution jobExecution = MetaDataInstanceFactory.createJobExecutionWithStepExecutions(123L, Arrays.asList("foo", "bar")); - Date result = ExecutionContextTestUtils.getFromStep(jobExecution, "spam", "foo"); + Date result = ExecutionContextTestUtils.getValueFromStepInJob(jobExecution, "spam", "foo"); assertEquals(date, result); } @@ -59,7 +59,7 @@ public class ExecutionContextTestUtilsTests { Date date = new Date(); StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(); stepExecution.getExecutionContext().put("foo", date); - Date result = ExecutionContextTestUtils.getFromStep(stepExecution, "foo"); + Date result = ExecutionContextTestUtils.getValueFromStep(stepExecution, "foo"); assertEquals(date, result); }