summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Warrington <cmw@google.com>2018-01-25 22:31:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-25 22:31:53 +0000
commitca63ea1a2cf7c4aabe4d04b88f2c0a4e9143b8f8 (patch)
tree0dd7480aef22b9220834b35249063aac735924af
parent383d64cccd4521150fb0bad78958162a215501b9 (diff)
parentadea684ee208c20ab0c660b8c29acdaedb8c7489 (diff)
downloadapkzlib-ca63ea1a2cf7c4aabe4d04b88f2c0a4e9143b8f8.tar.gz
Update to guava 22.
am: adea684ee2 Change-Id: Ic10c2f4406fbe21e4f3040c4a01099006df9868c
-rw-r--r--src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java b/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java
index f19962c..4f2eaf0 100644
--- a/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java
+++ b/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java
@@ -106,8 +106,9 @@ public class MultiCompressorTest {
File resultFile = new File(mTemporaryFolder.getRoot(), "result.zip");
ZFileOptions resultOptions = new ZFileOptions();
- resultOptions.setCompressor(new BestAndDefaultDeflateExecutorCompressor(
- MoreExecutors.sameThreadExecutor(), resultOptions.getTracker(), ratio + 0.001));
+ resultOptions.setCompressor(
+ new BestAndDefaultDeflateExecutorCompressor(
+ MoreExecutors.directExecutor(), resultOptions.getTracker(), ratio + 0.001));
try (
ZFile defaultZFile = new ZFile(defaultFile);
@@ -135,8 +136,9 @@ public class MultiCompressorTest {
File resultFile = new File(mTemporaryFolder.getRoot(), "result.zip");
ZFileOptions resultOptions = new ZFileOptions();
- resultOptions.setCompressor(new BestAndDefaultDeflateExecutorCompressor(
- MoreExecutors.sameThreadExecutor(), resultOptions.getTracker(), ratio - 0.001));
+ resultOptions.setCompressor(
+ new BestAndDefaultDeflateExecutorCompressor(
+ MoreExecutors.directExecutor(), resultOptions.getTracker(), ratio - 0.001));
try (
ZFile defaultZFile = new ZFile(defaultFile);