cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Updating use case to use ConfigXmlParser() instead of deprecated config class
Date Wed, 11 Mar 2015 22:08:11 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 917d0dfc4 -> 5b8738074


Updating use case to use ConfigXmlParser() instead of deprecated config class


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

Branch: refs/heads/master
Commit: 5b87380749e1e76304065f8ab56f990453e31bb6
Parents: 917d0df
Author: Joe Bowser <bowserj@apache.org>
Authored: Wed Mar 11 15:08:06 2015 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Wed Mar 11 15:08:06 2015 -0700

----------------------------------------------------------------------
 .../src/org/apache/cordova/test/CordovaActivityTest.java     | 4 +---
 .../org/apache/cordova/test/CordovaWebViewTestActivity.java  | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5b873807/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
----------------------------------------------------------------------
diff --git a/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java b/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
index fc94676..1eebadb 100644
--- a/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
+++ b/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
@@ -33,13 +33,11 @@ public class CordovaActivityTest extends BaseCordovaIntegrationTest {
     protected void setUp() throws Exception {
         super.setUp();
         setUpWithStartUrl(null);
-        innerContainer = (ViewGroup)containerView.getChildAt(0);
-        testView = innerContainer.getChildAt(0);
+        testView = (ViewGroup)containerView.getChildAt(0);
     }
 
     public void testBasicLoad() throws Exception {
         assertTrue(testView instanceof SystemWebView);
-        assertTrue(innerContainer instanceof LinearLayout);
         assertTrue(((CordovaWebViewEngine.EngineView)testView).getCordovaWebView() != null);
         String onPageFinishedUrl = testActivity.onPageFinishedUrl.take();
         assertEquals(MainTestActivity.START_URL, onPageFinishedUrl);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5b873807/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
index 7664d42..5df5cba 100644
--- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -22,6 +22,7 @@ package org.apache.cordova.test;
 import java.util.concurrent.ArrayBlockingQueue;
 
 import org.apache.cordova.Config;
+import org.apache.cordova.ConfigXmlParser;
 import org.apache.cordova.CordovaInterfaceImpl;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.CordovaWebViewImpl;
@@ -55,12 +56,13 @@ public class CordovaWebViewTestActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
-        //CB-7238: This has to be added now, because it got removed from somewhere else
-        Config.init(this);
+
+        //Set up the webview
+        ConfigXmlParser parser = new ConfigXmlParser();
 
         SystemWebView webView = (SystemWebView) findViewById(R.id.cordovaWebView);
         cordovaWebView = new CordovaWebViewImpl(this, new SystemWebViewEngine(webView));
-        cordovaWebView.init(cordovaInterface, Config.getPluginEntries(), Config.getPreferences());
+        cordovaWebView.init(cordovaInterface, parser.getPluginEntries(), parser.getPreferences());
 
         cordovaWebView.loadUrl(START_URL);
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message