Author: sgoeschl
Date: Fri Jan 8 21:16:44 2016
New Revision: 1723798
URL: http://svn.apache.org/viewvc?rev=1723798&view=rev
Log:
[EXEC-65] Works now under Mac OS 10.11.2 and Windows 10
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java?rev=1723798&view=auto
==============================================================================
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
(added)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
Fri Jan 8 21:16:44 2016
@@ -0,0 +1,50 @@
+package org.apache.commons.exec;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
+import java.io.File;
+
+public abstract class AbstractExecTest {
+
+ public static final int TEST_TIMEOUT = 15000;
+ public static final int WATCHDOG_TIMEOUT = 3000;
+
+ private static final String OS_NAME = System.getProperty("os.name");
+
+ private final File testDir = new File("src/test/scripts");
+
+ @Rule public TestName name = new TestName();
+
+ /**
+ * Resolve the OS-specific test file to execute.
+ */
+ protected File resolveTestScript(String baseName) {
+ final File result = TestUtil.resolveScriptForOS(testDir + "/" +
baseName);
+ if (!result.exists()) {
+ throw new IllegalArgumentException("Unable to find the following
file: " + result.getAbsolutePath());
+ }
+ return result;
+ }
+
+ /**
+ * Resolve the OS-specific test file to execute.
+ */
+ protected File resolveTestScript(String directoryName, String baseName) {
+ final File result = TestUtil.resolveScriptForOS(testDir + "/" +
directoryName + "/" + baseName);
+ if (!result.exists()) {
+ throw new IllegalArgumentException("Unable to find the following
file: " + result.getAbsolutePath());
+ }
+ return result;
+ }
+
+ protected String getName() {
+ return name.getMethodName();
+ }
+
+ protected String testNotSupportedForCurrentOperatingSystem() {
+ final String msg = String.format("The test '%s' does not support the
following OS : %s", name.getMethodName(), OS_NAME);
+ System.out.println(msg);
+ return msg;
+ }
+}
