Skip to content

Commit 2de33c0

Browse files
committed
Fix ProcessExecutorTest
1 parent 4bb72be commit 2de33c0

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

src/main/java/com/github/vbauer/avconv4java/util/process/ProcessExecutor.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
import com.github.vbauer.avconv4java.util.AVUtils;
44

55
import java.util.List;
6-
import java.util.concurrent.Callable;
7-
import java.util.concurrent.ExecutorService;
8-
import java.util.concurrent.Executors;
9-
import java.util.concurrent.Future;
10-
import java.util.concurrent.TimeUnit;
11-
import java.util.concurrent.TimeoutException;
6+
import java.util.concurrent.*;
127
import java.util.logging.Logger;
138

149
/**
@@ -50,12 +45,7 @@ private static ProcessInfo waitWithoutTimeout(final Process process) throws Exce
5045
private static ProcessInfo waitWithTimeout(final Process process, final long timeout) throws Exception {
5146
final ExecutorService executor = Executors.newSingleThreadExecutor();
5247
try {
53-
final Callable<ProcessInfo> task = new Callable<ProcessInfo>() {
54-
public ProcessInfo call() throws Exception {
55-
return waitWithoutTimeout(process);
56-
}
57-
};
58-
final Future<ProcessInfo> future = executor.submit(task);
48+
final Future<ProcessInfo> future = executor.submit(() -> waitWithoutTimeout(process));
5949
return future.get(timeout, TimeUnit.MILLISECONDS);
6050
} catch (final TimeoutException ex) {
6151
return ProcessInfo.error(ex.getMessage());

src/test/java/com/github/vbauer/avconv4java/util/ProcessExecutorTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package com.github.vbauer.avconv4java.util;
22

3-
import java.lang.reflect.Method;
4-
import java.util.List;
5-
import java.util.concurrent.ExecutorService;
6-
73
import com.github.vbauer.avconv4java.common.TestUtils;
84
import com.github.vbauer.avconv4java.util.process.ProcessExecutor;
95
import com.github.vbauer.avconv4java.util.process.ProcessInfo;
106
import org.testng.SkipException;
117
import org.testng.annotations.Test;
128
import org.testng.collections.Lists;
9+
10+
import java.lang.reflect.Method;
11+
import java.util.List;
12+
import java.util.concurrent.ExecutorService;
13+
1314
import static org.hamcrest.MatcherAssert.assertThat;
14-
import static org.hamcrest.Matchers.equalTo;
15-
import static org.hamcrest.Matchers.not;
16-
import static org.hamcrest.Matchers.nullValue;
15+
import static org.hamcrest.Matchers.*;
1716

1817
/**
1918
* @author Vladislav Bauer
@@ -73,7 +72,8 @@ public void testShutdownExecutor() throws Exception {
7372
final Method method = ProcessExecutor.class.getDeclaredMethod("shutdownExecutor", ExecutorService.class);
7473
method.setAccessible(true);
7574

76-
assertThat((Boolean) method.invoke(null, new Object[] { null }), equalTo(false));
75+
final Object result = method.invoke(null, new Object[]{null});
76+
assertThat(result, nullValue());
7777
}
7878

7979

0 commit comments

Comments
 (0)