[android_webview] Use Exception instead of Throwable in test utils.

Utility methods should throw Exceptions as this makes it possible to
easily use them from within a Callable (which assumes the call method
throws an Exception instead of a Throwable).

BUG=None
TEST=AndroidWebViewTests


Review URL: https://chromiumcodereview.appspot.com/12185020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180479 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 28 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 26295b6..71e6714 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -71,16 +71,11 @@ public class AndroidWebViewTestBase
      * @param <R> Type of result to return
      */
     public <R> R runTestOnUiThreadAndGetResult(Callable<R> callable)
-            throws Throwable {
+            throws Exception {
         FutureTask<R> task = new FutureTask<R>(callable);
         getInstrumentation().waitForIdleSync();
         getInstrumentation().runOnMainSync(task);
-        try {
-            return task.get();
-        } catch (ExecutionException e) {
-            // Unwrap the cause of the exception and re-throw it.
-            throw e.getCause();
-        }
+        return task.get();
     }
 
     protected void enableJavaScriptOnUiThread(final AwContents awContents) {
@@ -97,7 +92,7 @@ public class AndroidWebViewTestBase
      */
     protected void loadUrlSync(final AwContents awContents,
                                CallbackHelper onPageFinishedHelper,
-                               final String url) throws Throwable {
+                               final String url) throws Exception {
         int currentCallCount = onPageFinishedHelper.getCallCount();
         loadUrlAsync(awContents, url);
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
@@ -107,7 +102,7 @@ public class AndroidWebViewTestBase
     protected void loadUrlSyncAndExpectError(final AwContents awContents,
             CallbackHelper onPageFinishedHelper,
             CallbackHelper onReceivedErrorHelper,
-            final String url) throws Throwable {
+            final String url) throws Exception {
         int onErrorCallCount = onReceivedErrorHelper.getCallCount();
         int onFinishedCallCount = onPageFinishedHelper.getCallCount();
         loadUrlAsync(awContents, url);
@@ -121,8 +116,8 @@ public class AndroidWebViewTestBase
      * Loads url on the UI thread but does not block.
      */
     protected void loadUrlAsync(final AwContents awContents,
-                                final String url) throws Throwable {
-        runTestOnUiThread(new Runnable() {
+                                final String url) throws Exception {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 awContents.loadUrl(new LoadUrlParams(url));
@@ -135,7 +130,7 @@ public class AndroidWebViewTestBase
      */
     protected void postUrlSync(final AwContents awContents,
             CallbackHelper onPageFinishedHelper, final String url,
-            byte[] postData) throws Throwable {
+            byte[] postData) throws Exception {
         int currentCallCount = onPageFinishedHelper.getCallCount();
         postUrlAsync(awContents, url, postData);
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
@@ -146,7 +141,7 @@ public class AndroidWebViewTestBase
      * Loads url on the UI thread but does not block.
      */
     protected void postUrlAsync(final AwContents awContents,
-            final String url, byte[] postData) throws Throwable {
+            final String url, byte[] postData) throws Exception {
         class PostUrl implements Runnable {
             byte[] mPostData;
             public PostUrl(byte[] postData) {
@@ -158,7 +153,7 @@ public class AndroidWebViewTestBase
                         mPostData));
             }
         }
-        runTestOnUiThread(new PostUrl(postData));
+        getInstrumentation().runOnMainSync(new PostUrl(postData));
     }
 
     /**
@@ -167,7 +162,7 @@ public class AndroidWebViewTestBase
     protected void loadDataSync(final AwContents awContents,
                                 CallbackHelper onPageFinishedHelper,
                                 final String data, final String mimeType,
-                                final boolean isBase64Encoded) throws Throwable {
+                                final boolean isBase64Encoded) throws Exception {
         int currentCallCount = onPageFinishedHelper.getCallCount();
         loadDataAsync(awContents, data, mimeType, isBase64Encoded);
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
@@ -178,9 +173,9 @@ public class AndroidWebViewTestBase
                                            CallbackHelper onPageFinishedHelper,
                                            final String data, final String mimeType,
                                            final boolean isBase64Encoded, final String charset)
-            throws Throwable {
+            throws Exception {
         int currentCallCount = onPageFinishedHelper.getCallCount();
-        runTestOnUiThread(new Runnable() {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 awContents.loadUrl(LoadUrlParams.createLoadDataParams(
@@ -196,8 +191,8 @@ public class AndroidWebViewTestBase
      */
     protected void loadDataAsync(final AwContents awContents, final String data,
                                  final String mimeType, final boolean isBase64Encoded)
-            throws Throwable {
-        runTestOnUiThread(new Runnable() {
+            throws Exception {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 awContents.loadUrl(LoadUrlParams.createLoadDataParams(
@@ -246,7 +241,7 @@ public class AndroidWebViewTestBase
         });
     }
 
-    protected String getTitleOnUiThread(final AwContents awContents) throws Throwable {
+    protected String getTitleOnUiThread(final AwContents awContents) throws Exception {
         return runTestOnUiThreadAndGetResult(new Callable<String>() {
             @Override
             public String call() throws Exception {
@@ -256,7 +251,7 @@ public class AndroidWebViewTestBase
     }
 
     protected ContentSettings getContentSettingsOnUiThread(
-            final AwContents awContents) throws Throwable {
+            final AwContents awContents) throws Exception {
         return runTestOnUiThreadAndGetResult(new Callable<ContentSettings>() {
             @Override
             public ContentSettings call() throws Exception {
@@ -266,7 +261,7 @@ public class AndroidWebViewTestBase
     }
 
     protected AwSettings getAwSettingsOnUiThread(
-            final AwContents awContents) throws Throwable {
+            final AwContents awContents) throws Exception {
         return runTestOnUiThreadAndGetResult(new Callable<AwSettings>() {
             @Override
             public AwSettings call() throws Exception {
@@ -280,7 +275,7 @@ public class AndroidWebViewTestBase
      * result of its execution in JSON format.
      */
     protected String executeJavaScriptAndWaitForResult(final AwContents awContents,
-            TestAwContentsClient viewClient, final String code) throws Throwable {
+            TestAwContentsClient viewClient, final String code) throws Exception {
         return JSUtils.executeJavaScriptAndWaitForResult(this, awContents,
                 viewClient.getOnEvaluateJavaScriptResultHelper(),
                 code);
@@ -290,7 +285,7 @@ public class AndroidWebViewTestBase
      * Similar to CriteriaHelper.pollForCriteria but runs the callable on the UI thread.
      * Note that exceptions are treated as failure.
      */
-    protected boolean pollOnUiThread(final Callable<Boolean> callable) throws Throwable {
+    protected boolean pollOnUiThread(final Callable<Boolean> callable) throws Exception {
         return CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -309,8 +304,8 @@ public class AndroidWebViewTestBase
      */
     protected void clearCacheOnUiThread(
             final AwContents awContents,
-            final boolean includeDiskFiles) throws Throwable {
-        runTestOnUiThread(new Runnable() {
+            final boolean includeDiskFiles) throws Exception {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
               awContents.clearCache(includeDiskFiles);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java
index 6ec2ac4..50109bf 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java
@@ -26,7 +26,7 @@ public class JSUtils {
             final InstrumentationTestCase testCase,
             final AwContents awContents,
             final OnEvaluateJavaScriptResultHelper onEvaluateJavaScriptResultHelper,
-            final String linkId) throws Throwable {
+            final String linkId) throws Exception {
 
         Assert.assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
@@ -61,7 +61,7 @@ public class JSUtils {
             InstrumentationTestCase testCase,
             final AwContents awContents,
             final OnEvaluateJavaScriptResultHelper onEvaluateJavaScriptResultHelper,
-            final String code) throws Throwable {
+            final String code) throws Exception {
         testCase.getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {