Merge pull request #67 from appium/isaac-startactivity

Fix start_activity

Author: jlipps

appium/webdriver/webdriver.py

@@ -519,7 +519,7 @@ def close_app(self):
         self.execute(Command.CLOSE_APP)
         return self
 
-    def start_activity(self, app_package, app_activity, app_wait_package='', app_wait_activity=''):
+    def start_activity(self, app_package, app_activity, **opts):
         """Opens an arbitrary activity during a test. If the activity belongs to
         another application, that application is started and the activity is opened.
 
@@ -528,15 +528,30 @@ def start_activity(self, app_package, app_activity, app_wait_package='', app_wai
         :Args:
         - app_package - The package containing the activity to start.
         - app_activity - The activity to start.
-        - app_wait_package - Begin automation after this package starts.
-        - app_wait_activity - Begin automation after this activity starts.
+        - app_wait_package - Begin automation after this package starts (optional).
+        - app_wait_activity - Begin automation after this activity starts (optional).
+        - intent_action - Intent to start (optional).
+        - intent_category - Intent category to start (optional).
+        - intent_flags - Flags to send to the intent (optional).
+        - optional_intent_arguments - Optional arguments to the intent (optional).
+        - stop_app_on_reset - Should the app be stopped on reset (optional)?
         """
         data = {
             'appPackage': app_package,
-            'appActivity': app_activity,
-            'appWaitPackage': app_wait_package,
-            'appWaitActivity': app_wait_activity
+            'appActivity': app_activity
         }
+        arguments = {
+            'app_wait_package': 'appWaitPackage',
+            'app_wait_activity': 'appWaitActivity',
+            'intent_action': 'intentAction',
+            'intent_category': 'intentCategory',
+            'intent_flags': 'intentFlags',
+            'optional_intent_arguments': 'optionalIntentArguments',
+            'stop_app_on_reset': 'stopAppOnReset'
+        }
+        for key in arguments.iterkeys():
+            if opts.has_key(key):
+                data[arguments[key]] = opts[key]
         self.execute(Command.START_ACTIVITY, data)
         return self
 

test/functional/android/appium_tests.py

@@ -191,21 +191,21 @@ def test_send_keys(self):
         self.assertEqual('original text and new text', el.text)
 
     def test_start_activity_this_app(self):
-        self.driver.start_activity("io.appium.android.apis", ".ApiDemos")
+        self.driver.start_activity("com.example.android.apis", ".ApiDemos")
         self._assert_activity_contains('Demos')
 
-        self.driver.start_activity("io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity")
+        self.driver.start_activity("com.example.android.apis", ".accessibility.AccessibilityNodeProviderActivity")
         self._assert_activity_contains('Node')
 
     def test_start_activity_other_app(self):
-        self.driver.start_activity("io.appium.android.apis", ".ApiDemos")
+        self.driver.start_activity("com.example.android.apis", ".ApiDemos")
         self._assert_activity_contains('Demos')
 
         self.driver.start_activity("com.android.contacts", ".ContactsListActivity")
         self._assert_activity_contains('Contact')
 
     def _assert_activity_contains(self, activity):
-        current = self.driver.current_activity()
+        current = self.driver.current_activity
         self.assertTrue(activity in current)
 
     def test_get_settings(self):