diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2015-03-04 09:20:41 +0100 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2015-03-09 17:38:17 +0100 |
| commit | 6346674768a5f96da38e676e810fca14ea043c18 (patch) | |
| tree | 002e66ddbdc3aace30fcb98bcf173f06d3b147e6 /jack-tests/tests | |
| parent | 89ee5fe59b1323a9a13eb978e08de6cd82126d48 (diff) | |
| download | toolchain_jack-6346674768a5f96da38e676e810fca14ea043c18.tar.gz toolchain_jack-6346674768a5f96da38e676e810fca14ea043c18.tar.bz2 toolchain_jack-6346674768a5f96da38e676e810fca14ea043c18.zip | |
Implement Api01Config
Change-Id: I455d060994c59fecf5dbad2a1b4ff0905cb7df61
Diffstat (limited to 'jack-tests/tests')
| -rw-r--r-- | jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java | 5 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java index 58fa82c5..6f67a945 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java @@ -119,9 +119,8 @@ public class MultiDexOverflowTests { .addToClasspath(annotations) .srcToExe(outFolder, /* zipFile = */ false, srcFolder); Assert.fail(); - } catch (ProcessException e) { - Assert.assertTrue(e.getCause() instanceof JackAbortException); - Throwable contextException = e.getCause().getCause(); + } catch (JackAbortException e) { + Throwable contextException = e.getCause(); Assert.assertTrue(contextException instanceof DexWritingException); Assert.assertTrue(contextException.getCause() instanceof MainDexOverflowException); Assert.assertTrue(contextException.getCause().getCause() instanceof FieldIdOverflowException); diff --git a/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java b/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java index 23932846..351b5906 100644 --- a/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java +++ b/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java @@ -75,9 +75,8 @@ public class MergerTest011 extends MergerTestTools { try { buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err); Assert.fail(); - } catch (ProcessException e) { - Assert.assertTrue(e.getCause() instanceof JackAbortException); - Throwable contextException = e.getCause().getCause(); + } catch (JackAbortException e) { + Throwable contextException = e.getCause(); Assert.assertTrue(contextException instanceof DexWritingException); Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException); Assert.assertTrue(contextException.getCause().getCause() instanceof MethodIdOverflowException); @@ -99,9 +98,8 @@ public class MergerTest011 extends MergerTestTools { try { buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err); Assert.fail(); - } catch (ProcessException e) { - Assert.assertTrue(e.getCause() instanceof JackAbortException); - Throwable contextException = e.getCause().getCause(); + } catch (JackAbortException e) { + Throwable contextException = e.getCause(); Assert.assertTrue(contextException instanceof DexWritingException); Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException); Assert.assertTrue(contextException.getCause().getCause() instanceof FieldIdOverflowException); |