diff options
author | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-19 13:53:39 +0100 |
---|---|---|
committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-19 13:53:39 +0100 |
commit | 9c4afeca9249064e6af5dbe76a63c5cfc7bdde8e (patch) | |
tree | f5c7d16ebc58161215ea6bcc33b5dc81a27a0e2e /jack-tests/tests | |
parent | 54c574eddcd419fff6aaae5ee52fd02d9973829e (diff) | |
download | toolchain_jack-9c4afeca9249064e6af5dbe76a63c5cfc7bdde8e.zip toolchain_jack-9c4afeca9249064e6af5dbe76a63c5cfc7bdde8e.tar.gz toolchain_jack-9c4afeca9249064e6af5dbe76a63c5cfc7bdde8e.tar.bz2 |
Adapt tests to handle ProcessException
Change-Id: I673ed0d99cd011a48b86bfd29e8adb237d7e0032
Diffstat (limited to 'jack-tests/tests')
-rw-r--r-- | jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java | 23 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java | 34 |
2 files changed, 32 insertions, 25 deletions
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java index 9252e95..2cc7052 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java @@ -25,6 +25,7 @@ import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.JackApiToolchain; import com.android.jack.tools.merger.FieldIdOverflowException; import com.android.jack.tools.merger.MethodIdOverflowException; +import com.android.sched.scheduler.ProcessException; import junit.framework.Assert; @@ -82,11 +83,12 @@ public class MultiDexOverflowTests { /* zipFile = */ false, srcFolder); Assert.fail(); - } catch (JackAbortException e) { - Throwable cause = e.getCause(); - Assert.assertTrue(cause instanceof DexWritingException); - Assert.assertTrue(cause.getCause() instanceof MainDexOverflowException); - Assert.assertTrue(cause.getCause().getCause() instanceof MethodIdOverflowException); + } catch (ProcessException e) { + Assert.assertTrue(e.getCause() instanceof JackAbortException); + Throwable contextException = e.getCause().getCause(); + Assert.assertTrue(contextException instanceof DexWritingException); + Assert.assertTrue(contextException.getCause() instanceof MainDexOverflowException); + Assert.assertTrue(contextException.getCause().getCause() instanceof MethodIdOverflowException); Assert.assertTrue(baos.toString().contains(EXPECTED_MESSAGE)); } } @@ -120,11 +122,12 @@ public class MultiDexOverflowTests { /* zipFile = */ false, srcFolder); Assert.fail(); - } catch (JackAbortException e) { - Throwable cause = e.getCause(); - Assert.assertTrue(cause instanceof DexWritingException); - Assert.assertTrue(cause.getCause() instanceof MainDexOverflowException); - Assert.assertTrue(cause.getCause().getCause() instanceof FieldIdOverflowException); + } catch (ProcessException e) { + Assert.assertTrue(e.getCause() instanceof JackAbortException); + Throwable contextException = e.getCause().getCause(); + Assert.assertTrue(contextException instanceof DexWritingException); + Assert.assertTrue(contextException.getCause() instanceof MainDexOverflowException); + Assert.assertTrue(contextException.getCause().getCause() instanceof FieldIdOverflowException); Assert.assertTrue(baos.toString().contains(EXPECTED_MESSAGE)); } } 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 c52b050..2393284 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 @@ -26,6 +26,7 @@ import com.android.jack.tools.merger.FieldIdOverflowException; import com.android.jack.tools.merger.MergerTestTools; import com.android.jack.tools.merger.MethodIdOverflowException; import com.android.jack.tools.merger.TypeIdOverflowException; +import com.android.sched.scheduler.ProcessException; import junit.framework.Assert; @@ -74,11 +75,12 @@ public class MergerTest011 extends MergerTestTools { try { buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err); Assert.fail(); - } catch (JackAbortException e) { - Throwable cause = e.getCause(); - Assert.assertTrue(cause instanceof DexWritingException); - Assert.assertTrue(cause.getCause() instanceof SingleDexOverflowException); - Assert.assertTrue(cause.getCause().getCause() instanceof MethodIdOverflowException); + } catch (ProcessException e) { + Assert.assertTrue(e.getCause() instanceof JackAbortException); + Throwable contextException = e.getCause().getCause(); + Assert.assertTrue(contextException instanceof DexWritingException); + Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException); + Assert.assertTrue(contextException.getCause().getCause() instanceof MethodIdOverflowException); Assert.assertTrue(err.toString().contains(EXPECTED_MESSAGE)); } } @@ -97,11 +99,12 @@ public class MergerTest011 extends MergerTestTools { try { buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err); Assert.fail(); - } catch (JackAbortException e) { - Throwable cause = e.getCause(); - Assert.assertTrue(cause instanceof DexWritingException); - Assert.assertTrue(cause.getCause() instanceof SingleDexOverflowException); - Assert.assertTrue(cause.getCause().getCause() instanceof FieldIdOverflowException); + } catch (ProcessException e) { + Assert.assertTrue(e.getCause() instanceof JackAbortException); + Throwable contextException = e.getCause().getCause(); + Assert.assertTrue(contextException instanceof DexWritingException); + Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException); + Assert.assertTrue(contextException.getCause().getCause() instanceof FieldIdOverflowException); Assert.assertTrue(err.toString().contains(EXPECTED_MESSAGE)); } } @@ -121,11 +124,12 @@ public class MergerTest011 extends MergerTestTools { try { buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err); Assert.fail(); - } catch (JackAbortException e) { - Throwable cause = e.getCause(); - Assert.assertTrue(cause instanceof DexWritingException); - Assert.assertTrue(cause.getCause() instanceof SingleDexOverflowException); - Assert.assertTrue(cause.getCause().getCause() instanceof TypeIdOverflowException); + } catch (ProcessException e) { + Assert.assertTrue(e.getCause() instanceof JackAbortException); + Throwable contextException = e.getCause().getCause(); + Assert.assertTrue(contextException instanceof DexWritingException); + Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException); + Assert.assertTrue(contextException.getCause().getCause() instanceof TypeIdOverflowException); Assert.assertTrue(err.toString().contains(EXPECTED_MESSAGE)); } } |