incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Updating Native Tests to correspond with changes - CB-1580
Date Wed, 03 Oct 2012 23:04:53 GMT
Updated Branches:
  refs/heads/master 3e6a7cbdf -> a741c66c9


Updating Native Tests to correspond with changes - CB-1580


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

Branch: refs/heads/master
Commit: a741c66c97a17e0f6b136f0a999ddb4b07d9d310
Parents: 3e6a7cb
Author: Joe Bowser <bowserj@apache.org>
Authored: Wed Oct 3 15:56:49 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Wed Oct 3 15:56:49 2012 -0700

----------------------------------------------------------------------
 test/project.properties                            |    1 +
 .../apache/cordova/test/CordovaDriverAction.java   |   34 ++++++++-------
 .../cordova/test/CordovaWebViewTestActivity.java   |   35 +++++++--------
 3 files changed, 36 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a741c66c/test/project.properties
----------------------------------------------------------------------
diff --git a/test/project.properties b/test/project.properties
index 895c9ce..525cd87 100644
--- a/test/project.properties
+++ b/test/project.properties
@@ -9,3 +9,4 @@
 
 # Project target.
 target=android-16
+android.library.reference.1=../framework

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a741c66c/test/src/org/apache/cordova/test/CordovaDriverAction.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaDriverAction.java b/test/src/org/apache/cordova/test/CordovaDriverAction.java
index b131a79..78fcaa6 100644
--- a/test/src/org/apache/cordova/test/CordovaDriverAction.java
+++ b/test/src/org/apache/cordova/test/CordovaDriverAction.java
@@ -19,8 +19,10 @@
 
 package org.apache.cordova.test;
 
+import java.util.concurrent.ExecutorService;
+
 import org.apache.cordova.api.CordovaInterface;
-import org.apache.cordova.api.IPlugin;
+import org.apache.cordova.api.CordovaPlugin;
 
 import android.app.Activity;
 import android.content.Context;
@@ -35,14 +37,15 @@ public class CordovaDriverAction extends Activity implements CordovaInterface
{
         super.onCreate(savedInstanceState);
     }
 
-    public void bindBackButton(boolean arg0) {
+    public void startActivityForResult(CordovaPlugin command, Intent intent,
+            int requestCode) {
         // TODO Auto-generated method stub
-
+        
     }
 
-    public void cancelLoadUrl() {
+    public void setActivityResultCallback(CordovaPlugin plugin) {
         // TODO Auto-generated method stub
-
+        
     }
 
     public Activity getActivity() {
@@ -50,27 +53,26 @@ public class CordovaDriverAction extends Activity implements CordovaInterface
{
         return null;
     }
 
-    public boolean isBackButtonBound() {
+    @Deprecated
+    public Context getContext() {
         // TODO Auto-generated method stub
-        return false;
+        return null;
     }
 
-    public Object onMessage(String arg0, Object arg1) {
+    @Deprecated
+    public void cancelLoadUrl() {
         // TODO Auto-generated method stub
-        return null;
+        
     }
 
-    public void setActivityResultCallback(IPlugin arg0) {
+    public Object onMessage(String id, Object data) {
         // TODO Auto-generated method stub
-
+        return null;
     }
 
-    public void startActivityForResult(IPlugin arg0, Intent arg1, int arg2) {
+    public ExecutorService getThreadPool() {
         // TODO Auto-generated method stub
-
+        return null;
     }
 
-    public Context getContext() {
-        return this;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a741c66c/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 b111143..7f96948 100644
--- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -19,9 +19,11 @@
 
 package org.apache.cordova.test;
 
+import java.util.concurrent.ExecutorService;
+
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.api.CordovaInterface;
-import org.apache.cordova.api.IPlugin;
+import org.apache.cordova.api.CordovaPlugin;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,7 +31,6 @@ import android.content.Intent;
 import android.os.Bundle;
 
 public class CordovaWebViewTestActivity extends Activity implements CordovaInterface {
-
     CordovaWebView cordovaWebView;
 
     /** Called when the activity is first created. */
@@ -53,33 +54,30 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
         }
     }
 
-    public void startActivityForResult(IPlugin command, Intent intent, int requestCode) {
-        // TODO Auto-generated method stub
-
+    public Context getContext() {
+        return this;
     }
 
-    public void setActivityResultCallback(IPlugin plugin) {
+    public void startActivityForResult(CordovaPlugin command, Intent intent,
+            int requestCode) {
         // TODO Auto-generated method stub
-
+        
     }
 
-    public void bindBackButton(boolean override) {
+    public void setActivityResultCallback(CordovaPlugin plugin) {
         // TODO Auto-generated method stub
-
-    }
-
-    public boolean isBackButtonBound() {
-        // TODO Auto-generated method stub
-        return false;
+        
     }
 
     public Activity getActivity() {
-        return this;
+        // TODO Auto-generated method stub
+        return null;
     }
 
+    @Deprecated
     public void cancelLoadUrl() {
         // TODO Auto-generated method stub
-
+        
     }
 
     public Object onMessage(String id, Object data) {
@@ -87,7 +85,8 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
         return null;
     }
 
-    public Context getContext() {
-        return this;
+    public ExecutorService getThreadPool() {
+        // TODO Auto-generated method stub
+        return null;
     }
 }
\ No newline at end of file


Mime
View raw message