Return-Path: 
 <commits-return-6897-apmail-cordova-commits-archive=cordova.apache.org@cordova.apache.org>
X-Original-To: apmail-cordova-commits-archive@www.apache.org
Delivered-To: apmail-cordova-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4E2EED787
	for <apmail-cordova-commits-archive@www.apache.org>;
 Fri, 16 Nov 2012 00:04:21 +0000 (UTC)
Received: (qmail 99722 invoked by uid 500); 16 Nov 2012 00:04:21 -0000
Delivered-To: apmail-cordova-commits-archive@cordova.apache.org
Received: (qmail 99693 invoked by uid 500); 16 Nov 2012 00:04:21 -0000
Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cordova.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cordova.apache.org>
List-Post: <mailto:commits@cordova.apache.org>
List-Id: <commits.cordova.apache.org>
Reply-To: callback-dev@cordova.apache.org
Delivered-To: mailing list commits@cordova.apache.org
Received: (qmail 99684 invoked by uid 500); 16 Nov 2012 00:04:21 -0000
Delivered-To: apmail-incubator-callback-commits@incubator.apache.org
Received: (qmail 99680 invoked by uid 99); 16 Nov 2012 00:04:21 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 00:04:21 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id DA545313C52; Fri, 16 Nov 2012 00:04:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bowserj@apache.org
To: callback-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: android commit: CB-1864: Figured out how to simulate back button,
 test both the CordovaWebView back button and the general DroidGap
 case using the default implementation
Message-Id: <20121116000420.DA545313C52@tyr.zones.apache.org>
Date: Fri, 16 Nov 2012 00:04:20 +0000 (UTC)

Updated Branches:
  refs/heads/master f4612fdb5 -> 6c19a440f


CB-1864: Figured out how to simulate back button, test both the CordovaWebView back button and the general DroidGap case using the default implementation


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/6c19a440
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/6c19a440
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/6c19a440

Branch: refs/heads/master
Commit: 6c19a440f5d7faa3955e039749a3a907af012acc
Parents: f4612fd
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Nov 15 16:04:09 2012 -0800
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Nov 15 16:04:09 2012 -0800

----------------------------------------------------------------------
 .../cordova/test/BackButtonMultiPageTest.java      |   49 +++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/6c19a440/test/src/org/apache/cordova/test/BackButtonMultiPageTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/BackButtonMultiPageTest.java b/test/src/org/apache/cordova/test/BackButtonMultiPageTest.java
index fa3e0b0..6d4a7ac 100644
--- a/test/src/org/apache/cordova/test/BackButtonMultiPageTest.java
+++ b/test/src/org/apache/cordova/test/BackButtonMultiPageTest.java
@@ -26,6 +26,7 @@ import org.apache.cordova.test.actions.backbuttonmultipage;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
+import android.view.inputmethod.BaseInputConnection;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
@@ -97,6 +98,54 @@ public class BackButtonMultiPageTest extends ActivityInstrumentationTestCase2<ba
       assertTrue(didGoBack);
   }
 
+  public void testViaBackButtonOnView() {
+      testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
+      sleep();
+      String url = testView.getUrl();
+      assertTrue(url.endsWith("sample2.html"));
+      testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample3.html");
+      sleep();
+      url = testView.getUrl();
+      assertTrue(url.endsWith("sample3.html"));
+      BaseInputConnection viewConnection = new BaseInputConnection(testView, true);
+      KeyEvent backDown = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
+      KeyEvent backUp = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK);
+      viewConnection.sendKeyEvent(backDown);
+      viewConnection.sendKeyEvent(backUp);
+      sleep();
+      url = testView.getUrl();
+      assertTrue(url.endsWith("sample2.html"));
+      viewConnection.sendKeyEvent(backDown);
+      viewConnection.sendKeyEvent(backUp);
+      sleep();
+      url = testView.getUrl();
+      assertTrue(url.endsWith("index.html"));
+  }
+  
+  public void testViaBackButtonOnLayout() {
+      testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
+      sleep();
+      String url = testView.getUrl();
+      assertTrue(url.endsWith("sample2.html"));
+      testView.loadUrl("file:///android_asset/www/backbuttonmultipage/sample3.html");
+      sleep();
+      url = testView.getUrl();
+      assertTrue(url.endsWith("sample3.html"));
+      BaseInputConnection viewConnection = new BaseInputConnection(containerView, true);
+      KeyEvent backDown = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
+      KeyEvent backUp = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK);
+      viewConnection.sendKeyEvent(backDown);
+      viewConnection.sendKeyEvent(backUp);
+      sleep();
+      url = testView.getUrl();
+      assertTrue(url.endsWith("sample2.html"));
+      viewConnection.sendKeyEvent(backDown);
+      viewConnection.sendKeyEvent(backUp);
+      sleep();
+      url = testView.getUrl();
+      assertTrue(url.endsWith("index.html"));
+  }
+  
   private void sleep() {
       try {
           Thread.sleep(TIMEOUT);