From 942462c39c8a40e4afc0d44ac6c1766ec3d4051d Mon Sep 17 00:00:00 2001 From: Jamie Edge Date: Sun, 25 May 2014 18:35:35 +0100 Subject: [PATCH] Updated capability names in sample code. --- .../java/com/saucelabs/appium/AndroidContactsTest.java | 4 ++-- .../test/java/com/saucelabs/appium/AndroidTest.java | 10 ++-------- .../java/com/saucelabs/appium/AndroidWebViewTest.java | 4 ++-- sample-code/examples/node/ios-wd-raw.js | 2 +- sample-code/examples/node/ios-yiewd-catalog.js | 2 +- sample-code/examples/node/local-android-wd-contacts.js | 4 ++-- .../examples/node/local-android-yiewd-contacts.js | 4 ++-- .../examples/node/sauce-android-mocha-wd-notes.js | 4 ++-- .../examples/node/sauce-connect-ios-mocha-wd-raw.js | 2 +- sample-code/examples/node/sauce-ios-mocha-raw.js | 2 +- sample-code/examples/python/android_webview.py | 4 ++-- 11 files changed, 18 insertions(+), 24 deletions(-) diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java index 63ad8674e..7957ab3fb 100644 --- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java +++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java @@ -28,8 +28,8 @@ public class AndroidContactsTest { capabilities.setCapability("deviceName","Android Emulator"); capabilities.setCapability("platformVersion", "4.4"); capabilities.setCapability("app", app.getAbsolutePath()); - capabilities.setCapability("app-package", "com.example.android.contactmanager"); - capabilities.setCapability("app-activity", ".ContactManager"); + capabilities.setCapability("appPackage", "com.example.android.contactmanager"); + capabilities.setCapability("appActivity", ".ContactManager"); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); } diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java index 400fe1103..29afc8eb8 100644 --- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java +++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java @@ -30,8 +30,8 @@ public class AndroidTest { capabilities.setCapability("platformVersion", "4.4"); capabilities.setCapability("platformName","Android"); capabilities.setCapability("app", app.getAbsolutePath()); - capabilities.setCapability("app-package", "com.example.android.apis"); - capabilities.setCapability("app-activity", ".ApiDemos"); + capabilities.setCapability("appPackage", "com.example.android.apis"); + capabilities.setCapability("appActivity", ".ApiDemos"); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); } @@ -53,9 +53,3 @@ public class AndroidTest { } } - - - - - - diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java index cf0f6149f..ccc1a7b4c 100644 --- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java +++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java @@ -26,8 +26,8 @@ public class AndroidWebViewTest { capabilities.setCapability("automationName","Selendroid"); capabilities.setCapability("platformName", "Android"); capabilities.setCapability("app", app.getAbsolutePath()); - capabilities.setCapability("app-package", "io.selendroid.testapp"); - capabilities.setCapability("app-activity", ".HomeScreenActivity"); + capabilities.setCapability("appPackage", "io.selendroid.testapp"); + capabilities.setCapability("appActivity", ".HomeScreenActivity"); driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities); } @After diff --git a/sample-code/examples/node/ios-wd-raw.js b/sample-code/examples/node/ios-wd-raw.js index 2017e8fcd..123be57ff 100644 --- a/sample-code/examples/node/ios-wd-raw.js +++ b/sample-code/examples/node/ios-wd-raw.js @@ -26,7 +26,7 @@ var desired = { platformVersion: '7.1', deviceName: 'iPhone Simulator', app: "http://appium.s3.amazonaws.com/TestApp6.0.app.zip", - 'device-orientation': 'portrait', + 'deviceOrientation': 'portrait', }; if (process.env.SAUCE) { diff --git a/sample-code/examples/node/ios-yiewd-catalog.js b/sample-code/examples/node/ios-yiewd-catalog.js index f775a2f72..395ffaafa 100644 --- a/sample-code/examples/node/ios-yiewd-catalog.js +++ b/sample-code/examples/node/ios-yiewd-catalog.js @@ -37,7 +37,7 @@ var desired = { platformName: 'iOS', platformVersion: '7.1', deviceName: 'iPhone Simulator', - 'device-orientation': 'portrait' + 'deviceOrientation': 'portrait' }; if (process.env.SAUCE_CONNECT) { diff --git a/sample-code/examples/node/local-android-wd-contacts.js b/sample-code/examples/node/local-android-wd-contacts.js index 40cca02cf..085f1e389 100644 --- a/sample-code/examples/node/local-android-wd-contacts.js +++ b/sample-code/examples/node/local-android-wd-contacts.js @@ -20,8 +20,8 @@ var desired = { platformVersion: '4.3', deviceName: 'Android Emulator', "app": path.resolve(__dirname, '../..', 'apps/ContactManager/ContactManager.apk'), - "app-package": "com.android.contacts", // built-in contact app - "app-activity": "activities.PeopleActivity" + "appPackage": "com.android.contacts", // built-in contact app + "appActivity": "activities.PeopleActivity" }; // Default is for very slow ARM emulator diff --git a/sample-code/examples/node/local-android-yiewd-contacts.js b/sample-code/examples/node/local-android-yiewd-contacts.js index 3afde4e54..dd2348170 100644 --- a/sample-code/examples/node/local-android-yiewd-contacts.js +++ b/sample-code/examples/node/local-android-yiewd-contacts.js @@ -21,8 +21,8 @@ var desired = { platformVersion: '4.3', deviceName: 'Android Emulator', "app": path.resolve(__dirname, '../..', 'apps/ContactManager/ContactManager.apk'), - "app-package": "com.android.contacts", // built-in contact app - "app-activity": "activities.PeopleActivity" + "appPackage": "com.android.contacts", // built-in contact app + "appActivity": "activities.PeopleActivity" }; // Default is for very slow ARM emulator diff --git a/sample-code/examples/node/sauce-android-mocha-wd-notes.js b/sample-code/examples/node/sauce-android-mocha-wd-notes.js index 54effaa8e..bad9ea623 100644 --- a/sample-code/examples/node/sauce-android-mocha-wd-notes.js +++ b/sample-code/examples/node/sauce-android-mocha-wd-notes.js @@ -34,8 +34,8 @@ var desired = { deviceName: 'Android Emulator', app: 'http://appium.s3.amazonaws.com/NotesList.apk', name: 'Sauce Android test', - 'app-activity': '.NotesList', - 'app-package': 'com.example.android.notepad' + 'appActivity': '.NotesList', + 'appPackage': 'com.example.android.notepad' }; describe('notes app', function() { diff --git a/sample-code/examples/node/sauce-connect-ios-mocha-wd-raw.js b/sample-code/examples/node/sauce-connect-ios-mocha-wd-raw.js index ae49b97a7..80538e769 100644 --- a/sample-code/examples/node/sauce-connect-ios-mocha-wd-raw.js +++ b/sample-code/examples/node/sauce-connect-ios-mocha-wd-raw.js @@ -51,7 +51,7 @@ var desired = { deviceName: 'iPhone Simulator', app: appUrl, name: "Appium: with WD Mocha", - 'device-orientation': 'portrait', + 'deviceOrientation': 'portrait', }; describe('notes app', function() { diff --git a/sample-code/examples/node/sauce-ios-mocha-raw.js b/sample-code/examples/node/sauce-ios-mocha-raw.js index 9f523f71d..d7ac8bd6a 100644 --- a/sample-code/examples/node/sauce-ios-mocha-raw.js +++ b/sample-code/examples/node/sauce-ios-mocha-raw.js @@ -35,7 +35,7 @@ var desired = { deviceName: 'iPhone Simulator', app: 'http://appium.s3.amazonaws.com/TestApp6.0.app.zip', name: "Appium: with WD Mocha", - 'device-orientation': 'portrait', + 'deviceOrientation': 'portrait', }; describe('notes app', function() { diff --git a/sample-code/examples/python/android_webview.py b/sample-code/examples/python/android_webview.py index 2b57fa83b..db05db6a1 100644 --- a/sample-code/examples/python/android_webview.py +++ b/sample-code/examples/python/android_webview.py @@ -15,8 +15,8 @@ class TestAndroidWebView(unittest.TestCase): desired_caps = { 'device': 'selendroid', 'app': app, - 'app-package': 'io.selendroid.testapp', - 'app-activity': '.HomeScreenActivity' + 'appPackage': 'io.selendroid.testapp', + 'appActivity': '.HomeScreenActivity' } self.driver = webdriver.Remote('http://localhost:4723/wd/hub',