From d604e8b9b4e009f1e2488ca240093b771b93f83c Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Tue, 10 Apr 2012 15:53:40 -0700
Subject: [PATCH] Updating the tests a bit, still not running

---
 test/AndroidManifest.xml                      |  6 ++---
 test/res/layout/main.xml                      |  2 +-
 .../cordova/test/CordovaActivityTest.java     |  9 +-------
 .../cordova/test/CordovaSplashTest.java       | 12 ----------
 .../apache/cordova/test/GapClientTest.java    | 23 -------------------
 .../test/PhoneGapViewTestActivity.java        |  1 -
 6 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index d3072fe8..03191728 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
    
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="7" />
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
@@ -93,7 +93,8 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
-       <activity android:name="splashscreen" android:label="@string/app_name" 
+        </activity>
+        <activity android:name="splashscreen" android:label="@string/app_name" 
                   android:configChanges="orientation|keyboardHidden">
         </activity>
         <activity android:name="timeout" android:label="@string/app_name" 
@@ -136,5 +137,4 @@
                   android:configChanges="orientation|keyboardHidden">
         </activity>
         </application>
-    <uses-sdk android:minSdkVersion="5" />
 </manifest> 
diff --git a/test/res/layout/main.xml b/test/res/layout/main.xml
index f9c4fef5..e08013ad 100644
--- a/test/res/layout/main.xml
+++ b/test/res/layout/main.xml
@@ -4,7 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
     
-    <com.phonegap.CordovaWebView
+    <org.apache.cordova.CordovaWebView
         android:id="@+id/phoneGapView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
diff --git a/test/src/org/apache/cordova/test/CordovaActivityTest.java b/test/src/org/apache/cordova/test/CordovaActivityTest.java
index 96e4b004..b4151255 100644
--- a/test/src/org/apache/cordova/test/CordovaActivityTest.java
+++ b/test/src/org/apache/cordova/test/CordovaActivityTest.java
@@ -43,13 +43,6 @@ public class CordovaActivityTest extends ActivityInstrumentationTestCase2<PhoneG
         String className = innerContainer.getClass().getSimpleName();
         assertTrue(className.equals("LinearLayoutSoftKeyboardDetect"));
     }
-    
-    public void testForPluginManager() {
-        CordovaWebView v = (CordovaWebView) testView;
-        PluginManager p = v.getPluginManager();
-        assertNotNull(p);
-        String className = p.getClass().getSimpleName();
-        assertTrue(className.equals("PluginManager"));
-    }
+
 
 }
diff --git a/test/src/org/apache/cordova/test/CordovaSplashTest.java b/test/src/org/apache/cordova/test/CordovaSplashTest.java
index 307f9660..c8340943 100644
--- a/test/src/org/apache/cordova/test/CordovaSplashTest.java
+++ b/test/src/org/apache/cordova/test/CordovaSplashTest.java
@@ -39,16 +39,4 @@ public class CordovaSplashTest extends ActivityInstrumentationTestCase2<PhoneGap
         assertTrue(className.equals("CordovaWebView"));
     }
     
-    public void testForPluginManager() {
-        CordovaWebView v = (CordovaWebView) testView;
-        PluginManager p = v.getPluginManager();
-        assertNotNull(p);
-        String className = p.getClass().getSimpleName();
-        assertTrue(className.equals("PluginManager"));
-    }
-
-    public void testBackButton() {
-        CordovaWebView v = (CordovaWebView) testView;
-        assertFalse(v.checkBackKey());
-    }
 }
diff --git a/test/src/org/apache/cordova/test/GapClientTest.java b/test/src/org/apache/cordova/test/GapClientTest.java
index d826ae71..01b3bbfc 100644
--- a/test/src/org/apache/cordova/test/GapClientTest.java
+++ b/test/src/org/apache/cordova/test/GapClientTest.java
@@ -31,7 +31,6 @@ public class GapClientTest extends ActivityInstrumentationTestCase2<PhoneGapView
 		containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
 		innerContainer = (LinearLayout) containerView.getChildAt(0);
 		testView = innerContainer.getChildAt(0);
-		appCode = ((CordovaWebView) testView).getGapClient();
 		
 	}
 	
@@ -45,27 +44,5 @@ public class GapClientTest extends ActivityInstrumentationTestCase2<PhoneGapView
 	    assertTrue(className.equals("CordovaWebView"));
 	}
 	
-	public void testGetResources() {
-	    Resources ls = testActivity.getResources();
-	    Resources rs = appCode.getResources();
-	    assertTrue(ls.equals(rs));
-	}
 	
-	public void testGetPackageName() {
-	    String ls = testActivity.getPackageName();
-	    String rs = appCode.getPackageName();
-	    assertTrue(ls.equals(rs));
-	}
-	
-	public void testGetAssets() {
-	    AssetManager ls = testActivity.getAssets();
-	    AssetManager rs = testActivity.getAssets();
-	    assertTrue(ls.equals(rs));
-	}
-	
-	public void testGetBaseContext() {
-	    Context ls = testActivity.getBaseContext();
-	    Context rs = testActivity.getBaseContext();
-	    assertTrue(ls.equals(rs));
-	}
 }
diff --git a/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java b/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java
index 10d4b369..536dfe40 100644
--- a/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/PhoneGapViewTestActivity.java
@@ -15,7 +15,6 @@ public class PhoneGapViewTestActivity extends Activity {
         setContentView(R.layout.main);
         
         phoneGap = (CordovaWebView) findViewById(R.id.phoneGapView);
-        phoneGap.init();
         
         phoneGap.loadUrl("file:///android_asset/index.html");