commit 7ffbc71bb499a73f83b34c69abecb2cc87d7c090
author Christoffer Quist Adamsen <christofferqa@google.com> Sat May 16 08:20:26 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Sat May 16 08:20:26 2020 +0200
tree 1fbd59242b705988e89a21d9a44e36d14e6bb76f
parent fd906b51569e9b43de0a247b462be912882ebc13

Fix ExecutionException is never thrown error in tests

Change-Id: I4fdc91f330e3703320806d62d3dd206db6e1c16f

src/test/java/com/android/tools/r8/TestBase.java

diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index 1db496b..aeaf585 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -96,7 +96,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiFunction;
@@ -580,7 +579,7 @@
       DexApplication dexApplication =
           new ApplicationReader(application, new InternalOptions(), Timing.empty()).read();
       return new AppInfo(dexApplication);
-    } catch (IOException | ExecutionException e) {
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
@@ -591,7 +590,7 @@
       DexApplication dexApplication =
           new ApplicationReader(application, new InternalOptions(), Timing.empty()).read();
       return new AppInfoWithClassHierarchy(dexApplication);
-    } catch (IOException | ExecutionException e) {
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }

src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java

diff --git a/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java b/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
index 3b3473a..e9d9abd 100644
--- a/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/IrInjectionTestBase.java
@@ -45,7 +45,7 @@
   protected DexApplication buildApplication(AndroidApp input, InternalOptions options) {
     try {
       return new ApplicationReader(input, options, Timing.empty()).read();
-    } catch (IOException | ExecutionException e) {
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }

src/test/java/com/android/tools/r8/smali/SmaliTestBase.java

diff --git a/src/test/java/com/android/tools/r8/smali/SmaliTestBase.java b/src/test/java/com/android/tools/r8/smali/SmaliTestBase.java
index 8ef02dc..efcc42f 100644
--- a/src/test/java/com/android/tools/r8/smali/SmaliTestBase.java
+++ b/src/test/java/com/android/tools/r8/smali/SmaliTestBase.java
@@ -64,7 +64,7 @@
   protected DexApplication buildApplication(AndroidApp input, InternalOptions options) {
     try {
       return new ApplicationReader(input, options, Timing.empty()).read();
-    } catch (IOException | ExecutionException e) {
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }