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/05/15 17:56:25 UTC

[2/6] android commit: Updating Activities

Updating Activities


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/aede2235
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/aede2235
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/aede2235

Branch: refs/heads/CordovaWebView
Commit: aede2235d0d4bacd332fc44dd8aae9a3068ae382
Parents: c56c73f
Author: Joe Bowser <bo...@apache.org>
Authored: Mon May 14 16:07:00 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon May 14 16:07:00 2012 -0700

----------------------------------------------------------------------
 test/AndroidManifest.xml                           |   14 +---
 .../org/apache/cordova/test/BackButtonTest.java    |   49 ------------
 .../org/apache/cordova/test/CordovaActivity.java   |   33 ++++++++
 .../apache/cordova/test/CordovaActivityTest.java   |    6 +-
 .../org/apache/cordova/test/CordovaSplashTest.java |   61 ---------------
 test/src/org/apache/cordova/test/CordovaTest.java  |    6 +-
 .../cordova/test/CordovaWebViewTestActivity.java   |   47 +++++++++++
 test/src/org/apache/cordova/test/ErrorUrlTest.java |    8 ++-
 .../src/org/apache/cordova/test/GapClientTest.java |    6 +-
 .../org/apache/cordova/test/HtmlNotFoundTest.java  |   30 +++++++
 .../org/apache/cordova/test/PhoneGapActivity.java  |   33 --------
 .../org/apache/cordova/test/PhoneGapSplash.java    |   44 -----------
 .../cordova/test/PhoneGapViewTestActivity.java     |   47 -----------
 .../org/apache/cordova/test/PluginManagerTest.java |    6 +-
 14 files changed, 131 insertions(+), 259 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 5772c3e..b8038c7 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -59,7 +59,7 @@
             android:windowSoftInputMode="adjustPan"
             android:label="@string/app_name" 
             android:configChanges="orientation|keyboardHidden"
-            android:name=".PhoneGapViewTestActivity" >
+            android:name=".CordovaWebViewTestActivity" >
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -96,17 +96,7 @@
             android:windowSoftInputMode="adjustPan"
             android:label="@string/app_name" 
             android:configChanges="orientation|keyboardHidden"
-            android:name="org.apache.cordova.test.PhoneGapSplash" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:windowSoftInputMode="adjustPan"
-            android:label="@string/app_name" 
-            android:configChanges="orientation|keyboardHidden"
-            android:name="org.apache.cordova.test.PhoneGapActivity" >
+            android:name=".CordovaActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/BackButtonTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/BackButtonTest.java b/test/src/org/apache/cordova/test/BackButtonTest.java
deleted file mode 100644
index db09792..0000000
--- a/test/src/org/apache/cordova/test/BackButtonTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.apache.cordova.test;
-
-import org.apache.cordova.CordovaWebView;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-public class BackButtonTest extends ActivityInstrumentationTestCase2<backbuttonmultipage> {
-
-  private backbuttonmultipage testActivity;
-  private FrameLayout containerView;
-  private LinearLayout innerContainer;
-  private CordovaWebView testView;
-  private TouchUtils touchTest;
-  private long TIMEOUT = 5000;
-  
-  public BackButtonTest() {
-    super("org.apache.cordova.test",backbuttonmultipage.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);
-    touchTest = new TouchUtils();
-  }
-  
-  public void testPreconditions(){
-    assertNotNull(innerContainer);
-    assertNotNull(testView);
-  }
-
-  public void testClick() {
-    touchTest.tapView(this, testView);
-  }
-  
-  private void sleep() {
-    try {
-      Thread.sleep(TIMEOUT );
-    } catch (InterruptedException e) {
-      fail("Unexpected Timeout");
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaActivity.java b/test/src/org/apache/cordova/test/CordovaActivity.java
new file mode 100644
index 0000000..0bb3dba
--- /dev/null
+++ b/test/src/org/apache/cordova/test/CordovaActivity.java
@@ -0,0 +1,33 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova.test;
+
+import org.apache.cordova.DroidGap;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class CordovaActivity extends DroidGap {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        super.loadUrl("file:///android_asset/index.html");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/CordovaActivityTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaActivityTest.java b/test/src/org/apache/cordova/test/CordovaActivityTest.java
index 3a5b47d..b53f000 100644
--- a/test/src/org/apache/cordova/test/CordovaActivityTest.java
+++ b/test/src/org/apache/cordova/test/CordovaActivityTest.java
@@ -26,9 +26,9 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-public class CordovaActivityTest extends ActivityInstrumentationTestCase2<PhoneGapActivity> {
+public class CordovaActivityTest extends ActivityInstrumentationTestCase2<CordovaActivity> {
 
-    private PhoneGapActivity testActivity;
+    private CordovaActivity testActivity;
     private FrameLayout containerView;
     private LinearLayout innerContainer;
     private CordovaWebView testView;
@@ -36,7 +36,7 @@ public class CordovaActivityTest extends ActivityInstrumentationTestCase2<PhoneG
     @SuppressWarnings("deprecation")
     public CordovaActivityTest()
     {
-        super("org.apache.cordova.test",PhoneGapActivity.class);
+        super("org.apache.cordova.test",CordovaActivity.class);
     }
     
     protected void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/CordovaSplashTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaSplashTest.java b/test/src/org/apache/cordova/test/CordovaSplashTest.java
deleted file mode 100644
index 9fdf42a..0000000
--- a/test/src/org/apache/cordova/test/CordovaSplashTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova.test;
-
-import org.apache.cordova.CordovaWebView;
-import com.phonegap.api.PluginManager;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-public class CordovaSplashTest extends ActivityInstrumentationTestCase2<PhoneGapSplash> {
-
-    private PhoneGapSplash testActivity;
-    private FrameLayout containerView;
-    private LinearLayout innerContainer;
-    private CordovaWebView testView;
-    
-    public CordovaSplashTest()
-    {
-        super("com.phonegap.test.activities",PhoneGapSplash.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"));
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/CordovaTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaTest.java b/test/src/org/apache/cordova/test/CordovaTest.java
index ef87007..b7edd09 100644
--- a/test/src/org/apache/cordova/test/CordovaTest.java
+++ b/test/src/org/apache/cordova/test/CordovaTest.java
@@ -25,15 +25,15 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 
 public class CordovaTest extends
-    ActivityInstrumentationTestCase2<PhoneGapViewTestActivity> {
+    ActivityInstrumentationTestCase2<CordovaWebViewTestActivity> {
 
   private static final long TIMEOUT = 1000;
-  private PhoneGapViewTestActivity testActivity;
+  private CordovaWebViewTestActivity testActivity;
   private View testView;
   private String rString;
 
   public CordovaTest() {
-    super("com.phonegap.test.activities", PhoneGapViewTestActivity.class);
+    super("com.phonegap.test.activities", CordovaWebViewTestActivity.class);
   }
 
   protected void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
new file mode 100644
index 0000000..6c5f5c9
--- /dev/null
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -0,0 +1,47 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+package org.apache.cordova.test;
+
+import org.apache.cordova.CordovaWebView;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class CordovaWebViewTestActivity extends Activity {
+    
+    CordovaWebView phoneGap;
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+        
+        phoneGap = (CordovaWebView) findViewById(R.id.phoneGapView);
+        
+        phoneGap.loadUrl("file:///android_asset/www/index.html");
+        
+    }
+    
+    public void onDestroy()
+    {
+        super.onDestroy();
+        //phoneGap.onDestroy();
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/ErrorUrlTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/ErrorUrlTest.java b/test/src/org/apache/cordova/test/ErrorUrlTest.java
index 74a35c7..f60b272 100644
--- a/test/src/org/apache/cordova/test/ErrorUrlTest.java
+++ b/test/src/org/apache/cordova/test/ErrorUrlTest.java
@@ -24,7 +24,6 @@ public class ErrorUrlTest extends ActivityInstrumentationTestCase2<errorurl> {
       containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
       innerContainer = (LinearLayout) containerView.getChildAt(0);
       testView = (CordovaWebView) innerContainer.getChildAt(0);
-      
   }
   
   public void testPreconditions(){
@@ -32,4 +31,11 @@ public class ErrorUrlTest extends ActivityInstrumentationTestCase2<errorurl> {
       assertNotNull(testView);
   }
   
+  public void testUrl()
+  {
+    String good_url = "file:///android_asset/www/htmlnotfound/error.html";
+    String url = testView.getUrl();
+    assertTrue(url.equals(good_url));
+  }
+  
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/GapClientTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/GapClientTest.java b/test/src/org/apache/cordova/test/GapClientTest.java
index 41fe970..bfee863 100644
--- a/test/src/org/apache/cordova/test/GapClientTest.java
+++ b/test/src/org/apache/cordova/test/GapClientTest.java
@@ -31,9 +31,9 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-public class GapClientTest extends ActivityInstrumentationTestCase2<PhoneGapViewTestActivity> {
+public class GapClientTest extends ActivityInstrumentationTestCase2<CordovaWebViewTestActivity> {
 	
-	private PhoneGapViewTestActivity testActivity;
+	private CordovaWebViewTestActivity testActivity;
 	private FrameLayout containerView;
 	private LinearLayout innerContainer;
 	private View testView;
@@ -41,7 +41,7 @@ public class GapClientTest extends ActivityInstrumentationTestCase2<PhoneGapView
 	private CordovaChromeClient appCode;
 
 	public GapClientTest() {
-		super("com.phonegap.test.activities",PhoneGapViewTestActivity.class);
+		super("com.phonegap.test.activities",CordovaWebViewTestActivity.class);
 	}
 	
 	protected void setUp() throws Exception{

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/HtmlNotFoundTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/HtmlNotFoundTest.java b/test/src/org/apache/cordova/test/HtmlNotFoundTest.java
index 4546e5a..4dcf57f 100644
--- a/test/src/org/apache/cordova/test/HtmlNotFoundTest.java
+++ b/test/src/org/apache/cordova/test/HtmlNotFoundTest.java
@@ -1,11 +1,41 @@
 package org.apache.cordova.test;
 
+import org.apache.cordova.CordovaWebView;
+
 import android.test.ActivityInstrumentationTestCase2;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 public class HtmlNotFoundTest extends ActivityInstrumentationTestCase2<htmlnotfound> {
 
   
+  private htmlnotfound testActivity;
+  private FrameLayout containerView;
+  private LinearLayout innerContainer;
+  private CordovaWebView testView;
+
   public HtmlNotFoundTest() {
     super("org.apache.cordova.test",htmlnotfound.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 testUrl()
+{
+  String good_url = "file:///android_asset/www/htmlnotfound/error.html";
+  String url = testView.getUrl();
+  assertFalse(url.equals(good_url));
+}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/PhoneGapActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/PhoneGapActivity.java b/test/src/org/apache/cordova/test/PhoneGapActivity.java
deleted file mode 100644
index dc9e50f..0000000
--- a/test/src/org/apache/cordova/test/PhoneGapActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package org.apache.cordova.test;
-
-import org.apache.cordova.DroidGap;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class PhoneGapActivity extends DroidGap {
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        super.loadUrl("file:///android_asset/index.html");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/PhoneGapSplash.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/PhoneGapSplash.java b/test/src/org/apache/cordova/test/PhoneGapSplash.java
deleted file mode 100644
index e93a883..0000000
--- a/test/src/org/apache/cordova/test/PhoneGapSplash.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova.test;
-
-import org.apache.cordova.CordovaWebView;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class PhoneGapSplash extends Activity {
-    CordovaWebView phoneGap;
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-        
-        phoneGap = (CordovaWebView) findViewById(R.id.phoneGapView);
-        phoneGap.loadUrl("file:///android_asset/index.html", 5000);
-    }
-    
-    public void onDestroy()
-    {
-        super.onDestroy();
-        //phoneGap.onDestroy();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java b/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java
deleted file mode 100644
index e35f359..0000000
--- a/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova.test;
-
-import org.apache.cordova.CordovaWebView;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class PhoneGapViewTestActivity extends Activity {
-    
-    CordovaWebView phoneGap;
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-        
-        phoneGap = (CordovaWebView) findViewById(R.id.phoneGapView);
-        
-        phoneGap.loadUrl("file:///android_asset/www/index.html");
-        
-    }
-    
-    public void onDestroy()
-    {
-        super.onDestroy();
-        //phoneGap.onDestroy();
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aede2235/test/src/org/apache/cordova/test/PluginManagerTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/PluginManagerTest.java b/test/src/org/apache/cordova/test/PluginManagerTest.java
index 15234e6..f18f14f 100644
--- a/test/src/org/apache/cordova/test/PluginManagerTest.java
+++ b/test/src/org/apache/cordova/test/PluginManagerTest.java
@@ -27,9 +27,9 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-public class PluginManagerTest extends ActivityInstrumentationTestCase2<PhoneGapViewTestActivity> {
+public class PluginManagerTest extends ActivityInstrumentationTestCase2<CordovaWebViewTestActivity> {
 	
-	private PhoneGapViewTestActivity testActivity;
+	private CordovaWebViewTestActivity testActivity;
 	private FrameLayout containerView;
 	private LinearLayout innerContainer;
 	private View testView;
@@ -37,7 +37,7 @@ public class PluginManagerTest extends ActivityInstrumentationTestCase2<PhoneGap
 	private PluginManager pMan;
 
 	public PluginManagerTest() {
-		super("com.phonegap.test.activities",PhoneGapViewTestActivity.class);
+		super("com.phonegap.test.activities",CordovaWebViewTestActivity.class);
 	}
 	
 	protected void setUp() throws Exception{