You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/04/20 01:24:58 UTC
[1/13] android commit: Removing Jail functions for now
Updated Branches:
refs/heads/CordovaWebView 531b8f641 -> 9718aa5d4
Removing Jail functions for now
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/9718aa5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9718aa5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9718aa5d
Branch: refs/heads/CordovaWebView
Commit: 9718aa5d4a95a412ef21a3b4f34dd02e9275f4f0
Parents: d5dd432
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Apr 19 16:12:37 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Apr 19 16:12:37 2012 -0700
----------------------------------------------------------------------
test/src/org/apache/cordova/test/JailActivity.java | 19 -----
test/src/org/apache/cordova/test/JailTest.java | 62 ---------------
2 files changed, 0 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9718aa5d/test/src/org/apache/cordova/test/JailActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/JailActivity.java b/test/src/org/apache/cordova/test/JailActivity.java
deleted file mode 100644
index 77a8527..0000000
--- a/test/src/org/apache/cordova/test/JailActivity.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.apache.cordova.test;
-
-import org.apache.cordova.DroidGap;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class JailActivity extends DroidGap {
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if(!super.areAssetsInJail())
- {
- super.moveAssetsToJail();
- }
- super.loadJailedFile("www/index.html");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9718aa5d/test/src/org/apache/cordova/test/JailTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/JailTest.java b/test/src/org/apache/cordova/test/JailTest.java
deleted file mode 100644
index 027c8f6..0000000
--- a/test/src/org/apache/cordova/test/JailTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.cordova.test;
-
-import org.apache.cordova.CordovaWebView;
-import org.apache.cordova.api.PluginManager;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-public class JailTest extends ActivityInstrumentationTestCase2<JailActivity> {
-
- private JailActivity testActivity;
- private FrameLayout containerView;
- private LinearLayout innerContainer;
- private CordovaWebView testView;
- private static final long TIMEOUT = 2000;
-
- public JailTest()
- {
- super("com.phonegap.test.activities",JailActivity.class);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- testActivity = this.getActivity();
- containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
- innerContainer = (LinearLayout) containerView.getChildAt(0);
- testView = (CordovaWebView) innerContainer.getChildAt(0);
-
- }
-
- public void testPreconditions(){
- assertNotNull(innerContainer);
- assertNotNull(testView);
- }
-
-
- public void testForCordovaView() {
- String className = testView.getClass().getSimpleName();
- assertTrue(className.equals("CordovaWebView"));
- }
-
- public void testForJailedItems() {
- sleep();
- String url = testView.getUrl();
- assertTrue(url.contains("file:///data/data/"));
- }
-
- public void testForJailCheck() {
- sleep();
- assertTrue(testActivity.areAssetsInJail());
- }
-
- private void sleep() {
- try {
- Thread.sleep(TIMEOUT);
- } catch (InterruptedException e) {
- fail("Unexpected Timeout");
- }
- }
-
-}