From 9e04eec9dd501d168a6956fbcf1f12225bbbd6ec Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Tue, 20 Jan 2015 14:53:31 -0500
Subject: [PATCH] Make BackButtonMultiPageTest tests not hang forever.

They still don't pass, but at least fail now.
---
 .../test/junit/BackButtonMultiPageTest.java   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/androidTest/src/org/apache/cordova/test/junit/BackButtonMultiPageTest.java b/test/androidTest/src/org/apache/cordova/test/junit/BackButtonMultiPageTest.java
index ee95e43e..9a733848 100644
--- a/test/androidTest/src/org/apache/cordova/test/junit/BackButtonMultiPageTest.java
+++ b/test/androidTest/src/org/apache/cordova/test/junit/BackButtonMultiPageTest.java
@@ -44,19 +44,22 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
     super(backbuttonmultipage.class);
   }
 
-  @UiThreadTest
-  protected void setUp() throws Exception {
-      super.setUp();
-      testActivity = this.getActivity();
+  @Override
+  public void setUp() {
+      testActivity = getActivity();
       containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
       innerContainer = (LinearLayout) containerView.getChildAt(0);
       testView = (CordovaWebView) innerContainer.getChildAt(0);
-      testView.loadUrl("file:///android_asset/www/backbuttonmultipage/index.html");
-      sleep();
+  }
+
+  void loadTestPage() {
+     testView.loadUrl("file:///android_asset/www/backbuttonmultipage/index.html");
+     sleep();
   }
 
   @UiThreadTest
   public void testPreconditions(){
+      loadTestPage();
       assertNotNull(innerContainer);
       assertNotNull(testView);
       String url = testView.getUrl();
@@ -67,6 +70,7 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
       runTestOnUiThread(new Runnable() {
           public void run()
           {
+              loadTestPage();
               testView.sendJavascript("window.location = 'sample2.html';");
           }
       });
@@ -111,6 +115,7 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
       runTestOnUiThread(new Runnable() {
           public void run()
           {
+              loadTestPage();
               testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
           }
       });
@@ -156,6 +161,7 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
       runTestOnUiThread(new Runnable() {
           public void run()
           {
+              loadTestPage();
               testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
           }
       });
@@ -209,6 +215,7 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
       runTestOnUiThread(new Runnable() {
           public void run()
           {
+              loadTestPage();
               testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
           }
       });
@@ -257,8 +264,7 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
       });
       
   }
-  
-  @UiThreadTest
+
   private void sleep() {
       try {
           Thread.sleep(TIMEOUT);