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

Minor polish

Browse Source
This commit is contained in:
Mahmoud Ben Hassine
2019-01-25 17:38:28 +01:00
parent 1bfabeb33c
commit c9f72cd2c1
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java
View File

@@ -73,7 +73,7 @@ public class SystemCommandTaskletIntegrationTests {
tasklet = new SystemCommandTasklet();
tasklet.setEnvironmentParams(null); // inherit from parent process
tasklet.setWorkingDirectory(null); // inherit from parent process
tasklet.setSystemProcessExitCodeMapper(new TestExitCodeMapper());
tasklet.setSystemProcessExitCodeMapper(new SimpleSystemProcessExitCodeMapper());
tasklet.setTimeout(5000); // long enough timeout
tasklet.setTerminationCheckInterval(500);
tasklet.setCommand("invalid command, change value for successful execution");
@@ -136,7 +136,7 @@ public class SystemCommandTaskletIntegrationTests {
*/
@Test
public void testExecuteTimeout() throws Exception {
String command = System.getProperty("os.name").toLowerCase().contains("win") ?
String command = isRunningOnWindows() ?
"ping 127.0.0.1" :
"sleep 3";
tasklet.setCommand(command);
@@ -158,7 +158,7 @@ public class SystemCommandTaskletIntegrationTests {
*/
@Test
public void testInterruption() throws Exception {
String command = System.getProperty("os.name").toLowerCase().contains("win") ?
String command = isRunningOnWindows() ?
"ping 127.0.0.1" :
"sleep 5";
tasklet.setCommand(command);
@@ -269,7 +269,7 @@ public class SystemCommandTaskletIntegrationTests {
when(jobExplorer.getJobExecution(1L)).thenReturn(stepExecution.getJobExecution(), stepExecution.getJobExecution(), stoppedJobExecution);
String command = System.getProperty("os.name").toLowerCase().contains("win") ?
String command = isRunningOnWindows() ?
"ping 127.0.0.1 -n 5" :
"sleep 15";
tasklet.setCommand(command);
@@ -281,7 +281,7 @@ public class SystemCommandTaskletIntegrationTests {
ChunkContext chunkContext = new ChunkContext(stepContext);
tasklet.execute(contribution, chunkContext);
assertEquals(contribution.getExitStatus().getExitCode(),ExitStatus.STOPPED.getExitCode());
assertEquals(ExitStatus.STOPPED.getExitCode(), contribution.getExitStatus().getExitCode());
}
private String getJavaCommand() {
@@ -294,29 +294,15 @@ public class SystemCommandTaskletIntegrationTests {
command.append(fileSeparator);
command.append("java");
if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
if(isRunningOnWindows()) {
command.append(".exe");
}
return command.toString();
}
/**
* Exit code mapper containing mapping logic expected by the tests. 0 means
* finished successfully, other value means failure.
*/
private static class TestExitCodeMapper implements SystemProcessExitCodeMapper {
@Override
public ExitStatus getExitStatus(int exitCode) {
if (exitCode == 0) {
return ExitStatus.COMPLETED;
}
else {
return ExitStatus.FAILED;
}
}
private boolean isRunningOnWindows() {
return System.getProperty("os.name").toLowerCase().contains("win");
}
}