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

Updated test to dynamically obtain java executable location

Browse Source
This commit is contained in:
Michael Minella
2016-10-03 12:56:33 -05:00
parent 35fba25b9d
commit 23f599f1f5
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,11 +15,6 @@
*/
package org.springframework.batch.core.step.tasklet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
import java.io.File;
import org.apache.commons.logging.Log;
@@ -44,6 +39,11 @@ import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.util.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
/**
* Tests for {@link SystemCommandTasklet}.
*/
@@ -86,7 +86,7 @@ public class SystemCommandTaskletIntegrationTests {
*/
@Test
public void testExecute() throws Exception {
String command = "java -version";
String command = getJavaCommand() + " --version";
tasklet.setCommand(command);
tasklet.afterPropertiesSet();
@@ -101,7 +101,7 @@ public class SystemCommandTaskletIntegrationTests {
*/
@Test
public void testExecuteFailure() throws Exception {
String command = "java org.springframework.batch.sample.tasklet.UnknownClass";
String command = getJavaCommand() + " org.springframework.batch.sample.tasklet.UnknownClass";
tasklet.setCommand(command);
tasklet.setTimeout(200L);
tasklet.afterPropertiesSet();
@@ -136,7 +136,7 @@ public class SystemCommandTaskletIntegrationTests {
*/
@Test
public void testExecuteTimeout() throws Exception {
String command = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ?
String command = System.getProperty("os.name").toLowerCase().contains("win") ?
"ping 1.1.1.1 -n 1 -w 3000" :
"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().indexOf("win") >= 0 ?
String command = System.getProperty("os.name").toLowerCase().contains("win") ?
"ping 1.1.1.1 -n 1 -w 5000" :
"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().indexOf("win") >= 0 ?
String command = System.getProperty("os.name").toLowerCase().contains("win") ?
"ping 1.1.1.1 -n 1 -w 5000" :
"sleep 15";
tasklet.setCommand(command);
@@ -284,6 +284,23 @@ public class SystemCommandTaskletIntegrationTests {
assertEquals(contribution.getExitStatus().getExitCode(),ExitStatus.STOPPED.getExitCode());
}
private String getJavaCommand() {
String javaHome = System.getProperty("java.home");
String fileSeparator = System.getProperty("file.separator");
StringBuilder command = new StringBuilder();
command.append(javaHome);
command.append(fileSeparator);
command.append("bin");
command.append(fileSeparator);
command.append("java");
if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
command.append(".exe");
}
return command.toString();
}
/**
* Exit code mapper containing mapping logic expected by the tests. 0 means
* finished successfully, other value means failure.