From 5ad5df488b47e02dd262af6de98a04228871e388 Mon Sep 17 00:00:00 2001 From: Jonathan Lipps Date: Thu, 17 Oct 2013 12:33:42 -0700 Subject: [PATCH] move all android-related files together into devices/android --- .gitignore | 12 +++++------- .npmignore | 8 +++++--- grunt-helpers.js | 6 ++++-- lib/appium.js | 6 +++--- {android => lib/devices/android}/adb.js | 16 +++++++++------- lib/devices/{ => android}/android.js | 15 +++++++-------- .../devices/android}/bootstrap/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../devices/android}/bootstrap/README.md | 0 .../devices/android}/bootstrap/build.xml | 0 .../devices/android}/bootstrap/pom.xml | 0 .../android/bootstrap/AndroidCommand.java | 0 .../bootstrap/AndroidCommandExecutor.java | 0 .../android/bootstrap/AndroidCommandResult.java | 0 .../android/bootstrap/AndroidCommandType.java | 0 .../android/bootstrap/AndroidElement.java | 0 .../bootstrap/AndroidElementClassMap.java | 0 .../android/bootstrap/AndroidElementsHash.java | 0 .../io/appium/android/bootstrap/Bootstrap.java | 0 .../android/bootstrap/CommandHandler.java | 0 .../io/appium/android/bootstrap/Dynamic.java | 0 .../src/io/appium/android/bootstrap/Logger.java | 0 .../android/bootstrap/OrientationEnum.java | 0 .../appium/android/bootstrap/SocketServer.java | 0 .../io/appium/android/bootstrap/WDStatus.java | 0 .../exceptions/AndroidCommandException.java | 0 .../exceptions/CommandTypeException.java | 0 .../exceptions/ElementNotFoundException.java | 0 .../exceptions/ElementNotInHashException.java | 0 .../exceptions/InvalidCoordinatesException.java | 0 .../exceptions/InvalidStrategyException.java | 0 .../exceptions/NoAttributeFoundException.java | 0 .../exceptions/SocketServerException.java | 0 .../exceptions/UnallowedTagNameException.java | 0 .../appium/android/bootstrap/handler/Clear.java | 0 .../appium/android/bootstrap/handler/Click.java | 0 .../appium/android/bootstrap/handler/Drag.java | 0 .../bootstrap/handler/DumpWindowHierarchy.java | 0 .../EnableCompressedLayoutHeirarchy.java | 0 .../appium/android/bootstrap/handler/Find.java | 0 .../appium/android/bootstrap/handler/Flick.java | 0 .../android/bootstrap/handler/GetAttribute.java | 0 .../bootstrap/handler/GetDeviceSize.java | 0 .../android/bootstrap/handler/GetLocation.java | 0 .../android/bootstrap/handler/GetName.java | 0 .../android/bootstrap/handler/GetSize.java | 0 .../android/bootstrap/handler/GetStrings.java | 0 .../android/bootstrap/handler/GetText.java | 0 .../android/bootstrap/handler/Orientation.java | 0 .../appium/android/bootstrap/handler/Pinch.java | 0 .../android/bootstrap/handler/PressBack.java | 0 .../android/bootstrap/handler/PressKeyCode.java | 0 .../android/bootstrap/handler/ScrollTo.java | 0 .../android/bootstrap/handler/SetAttribute.java | 0 .../android/bootstrap/handler/SetText.java | 0 .../appium/android/bootstrap/handler/Swipe.java | 0 .../bootstrap/handler/TakeScreenshot.java | 0 .../bootstrap/handler/TouchLongClick.java | 0 .../android/bootstrap/handler/WaitForIdle.java | 0 .../appium/android/bootstrap/handler/Wake.java | 0 .../android/bootstrap/selector/Strategy.java | 0 .../appium/android/bootstrap/utils/Point.java | 0 .../android/bootstrap/utils/TheWatchers.java | 0 .../{chrome_android.js => android/chrome.js} | 8 ++++---- .../devices/android}/device-state.js | 2 +- .../devices/android}/helpers/dump2json.jar | Bin .../devices/android}/helpers/move_manifest.jar | Bin .../devices/android}/helpers/sign.jar | Bin .../android}/helpers/strings_from_apk.jar | Bin .../devices/android}/helpers/unsign.jar | Bin .../devices/android}/helpers/verify.jar | Bin {android => lib/devices/android}/logcat.js | 2 +- lib/devices/{ => android}/selendroid.js | 12 ++++++------ reset.sh | 4 ++-- test/functional/android/device-state.js | 4 ++-- 77 files changed, 49 insertions(+), 46 deletions(-) rename {android => lib/devices/android}/adb.js (99%) rename lib/devices/{ => android}/android.js (98%) rename {android => lib/devices/android}/bootstrap/.project (100%) rename {android => lib/devices/android}/bootstrap/.settings/org.eclipse.jdt.core.prefs (100%) rename {android => lib/devices/android}/bootstrap/.settings/org.eclipse.jdt.ui.prefs (100%) rename {android => lib/devices/android}/bootstrap/.settings/org.eclipse.m2e.core.prefs (100%) rename {android => lib/devices/android}/bootstrap/README.md (100%) rename {android => lib/devices/android}/bootstrap/build.xml (100%) rename {android => lib/devices/android}/bootstrap/pom.xml (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidCommand.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidCommandExecutor.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidCommandResult.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidCommandType.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidElement.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/AndroidElementsHash.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/Bootstrap.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/CommandHandler.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/Dynamic.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/Logger.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/OrientationEnum.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/SocketServer.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/WDStatus.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/AndroidCommandException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/CommandTypeException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotFoundException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotInHashException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidCoordinatesException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidStrategyException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/NoAttributeFoundException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/SocketServerException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/exceptions/UnallowedTagNameException.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Click.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/DumpWindowHierarchy.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/EnableCompressedLayoutHeirarchy.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Find.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetDeviceSize.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetLocation.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetStrings.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Orientation.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Pinch.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/PressBack.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/PressKeyCode.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/ScrollTo.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/TakeScreenshot.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/TouchLongClick.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/WaitForIdle.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/handler/Wake.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/selector/Strategy.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/utils/Point.java (100%) rename {android => lib/devices/android}/bootstrap/src/io/appium/android/bootstrap/utils/TheWatchers.java (100%) rename lib/devices/{chrome_android.js => android/chrome.js} (96%) rename {android => lib/devices/android}/device-state.js (94%) rename {android => lib/devices/android}/helpers/dump2json.jar (100%) rename {android => lib/devices/android}/helpers/move_manifest.jar (100%) rename {android => lib/devices/android}/helpers/sign.jar (100%) rename {android => lib/devices/android}/helpers/strings_from_apk.jar (100%) rename {android => lib/devices/android}/helpers/unsign.jar (100%) rename {android => lib/devices/android}/helpers/verify.jar (100%) rename {android => lib/devices/android}/logcat.js (97%) rename lib/devices/{ => android}/selendroid.js (93%) diff --git a/.gitignore b/.gitignore index b399bac60ea..2085c49044a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,16 +22,14 @@ test/functional/_joined *.autosave .idea/ appium*.log* -android/bootstrap/bin/* -android/bootstrap/local.properties -android/bootstrap/project.properties -android/bootstrap/.classpath +lib/devices/android/bootstrap/bin/* +lib/devices/android/bootstrap/local.properties +lib/devices/android/bootstrap/project.properties +lib/devices/android/bootstrap/.classpath +lib/devices/android/bootstrap/target/ sample-code/apps/ApiDemos -lib/android/AndroidManifest.xml.apk -lib/android/AndroidManifest.xml .*~ *~ -android/bootstrap/target/ org.eclipse.ltk.core.refactoring.prefs /selendroid .appiumconfig diff --git a/.npmignore b/.npmignore index bbe8441503c..3c8f8b04b12 100644 --- a/.npmignore +++ b/.npmignore @@ -6,9 +6,11 @@ reset.bat bin/test.sh sample-code/ test/ -android/bootstrap/bin/ -android/bootstrap/target/ -lib/android/AndroidManifest.xml.apk +lib/devices/android/bootstrap/bin/ +lib/devices/android/bootstrap/target/ +lib/devices/android/bootstrap/local.properties +lib/devices/android/bootstrap/project.properties +lib/devices/android/bootstrap/.classpath _vimrc_local.vim *.swp *.swo diff --git a/grunt-helpers.js b/grunt-helpers.js index 549bf64d775..b2817bf7a09 100644 --- a/grunt-helpers.js +++ b/grunt-helpers.js @@ -342,7 +342,8 @@ var setupAndroidProj = function(grunt, projPath, args, cb) { }; module.exports.setupAndroidBootstrap = function(grunt, cb) { - var projPath = path.resolve(__dirname, "android", "bootstrap"); + var projPath = path.resolve(__dirname, "lib", "devices", "android", + "bootstrap"); var args = ["create", "uitest-project", "-n", "AppiumBootstrap", "-t", "android-18", "-p", "."]; // TODO: possibly check output of `android list target` to make sure api level 18 is available? @@ -392,7 +393,8 @@ var buildAndroidProj = function(grunt, projPath, target, cb) { }; module.exports.buildAndroidBootstrap = function(grunt, cb) { - var projPath = path.resolve(__dirname, "android", "bootstrap"); + var projPath = path.resolve(__dirname, "lib", "devices", "android", + "bootstrap"); var binSrc = path.resolve(projPath, "bin", "AppiumBootstrap.jar"); var binDestDir = path.resolve(__dirname, "build", "android_bootstrap"); var binDest = path.resolve(binDestDir, "AppiumBootstrap.jar"); diff --git a/lib/appium.js b/lib/appium.js index a676dad403a..926e4e1b8d9 100644 --- a/lib/appium.js +++ b/lib/appium.js @@ -16,9 +16,9 @@ var routing = require('./server/routing.js') , _ = require('underscore') , fs = require('fs') , ios = require('./devices/ios/ios.js') - , android = require('./devices/android.js') - , selendroid = require('./devices/selendroid.js') - , chrome = require('./devices/chrome_android.js') + , android = require('./devices/android/android.js') + , selendroid = require('./devices/android/selendroid.js') + , chrome = require('./devices/android/chrome.js') , firefoxOs = require('./devices/firefoxos/firefoxos.js') , status = require("./server/status.js") , helpers = require('./helpers.js') diff --git a/android/adb.js b/lib/devices/android/adb.js similarity index 99% rename from android/adb.js rename to lib/devices/android/adb.js index 45a7ef69c35..9a4cba39a91 100644 --- a/android/adb.js +++ b/lib/devices/android/adb.js @@ -5,13 +5,13 @@ var spawn = require('win-spawn') , path = require('path') , fs = require('fs') , net = require('net') - , logger = require('../lib/server/logger.js').get('appium') - , status = require('../lib/server/status.js') + , logger = require('../../server/logger.js').get('appium') + , status = require('../../server/status.js') , async = require('async') , ncp = require('ncp') , mkdirp = require('mkdirp') , _ = require('underscore') - , helpers = require('../lib/helpers.js') + , helpers = require('../../helpers.js') , unzipFile = helpers.unzipFile , testZipArchive = helpers.testZipArchive , AdmZip = require('adm-zip') @@ -158,8 +158,8 @@ ADB.prototype.insertSelendroidManifest = function(serverPath, cb) { logger.info("Inserting selendroid manifest"); var newServerPath = this.selendroidServerPath , newPackage = this.appPackage + '.selendroid' - , srcManifest = path.resolve(__dirname, '..', 'build', 'selendroid', - 'AndroidManifest.xml') + , srcManifest = path.resolve(__dirname, '..', '..', '..', 'build', + 'selendroid', 'AndroidManifest.xml') , dstDir = path.resolve(getTempPath(), this.appPackage) , dstManifest = path.resolve(dstDir, 'AndroidManifest.xml'); @@ -1122,7 +1122,8 @@ ADB.prototype.getLogcatLogs = function() { ADB.prototype.pushAppium = function(cb) { this.debug("Pushing appium bootstrap to device..."); - var binPath = path.resolve(__dirname, "..", "build", "android_bootstrap", "AppiumBootstrap.jar"); + var binPath = path.resolve(__dirname, "..", "..", "..", "build", + "android_bootstrap", "AppiumBootstrap.jar"); fs.stat(binPath, function(err) { if (err) { cb(new Error("Could not find AppiumBootstrap.jar; please run " + @@ -1146,7 +1147,8 @@ ADB.prototype.pushUnlock = function(cb) { // TODO: calling `adb install` may not be necessary if its already there. // can we check if app exists first? may speed this up. this.debug("Pushing unlock helper app to device..."); - var unlockPath = path.resolve(__dirname, "..", "build", "unlock_apk", "unlock_apk-debug.apk"); + var unlockPath = path.resolve(__dirname, "..", "..", "..", "build", + "unlock_apk", "unlock_apk-debug.apk"); fs.stat(unlockPath, function(err) { if (err) { cb(new Error("Could not find unlock.apk; please run " + diff --git a/lib/devices/android.js b/lib/devices/android/android.js similarity index 98% rename from lib/devices/android.js rename to lib/devices/android/android.js index 3590b3d4538..e03cda04c12 100644 --- a/lib/devices/android.js +++ b/lib/devices/android/android.js @@ -1,13 +1,13 @@ "use strict"; -var errors = require('../server/errors.js') - , adb = require('../../android/adb.js') +var errors = require('../../server/errors.js') + , adb = require('./adb.js') , _ = require('underscore') - , logger = require('../server/logger.js').get('appium') - , deviceCommon = require('./common.js') - , status = require("../server/status.js") + , logger = require('../../server/logger.js').get('appium') + , deviceCommon = require('../common.js') + , status = require("../../server/status.js") , NotYetImplementedError = errors.NotYetImplementedError - , parseXpath = require('../xpath.js').parseXpath + , parseXpath = require('../../xpath.js').parseXpath , exec = require('child_process').exec , fs = require('fs') , temp = require('temp') @@ -576,8 +576,7 @@ Android.prototype.getPageSource = function(cb) { }); }.bind(this), function(cb) { - var jar = path.resolve(__dirname, '..', '..', 'android', 'helpers', - 'dump2json.jar'); + var jar = path.resolve(__dirname, 'helpers', 'dump2json.jar'); var cmd = 'java -jar "' + jar + '" "' + xmlFile + '"'; logger.debug('json command: ' + cmd); exec(cmd, { maxBuffer: 524288 }, function(err, stdout, stderr) { diff --git a/android/bootstrap/.project b/lib/devices/android/bootstrap/.project similarity index 100% rename from android/bootstrap/.project rename to lib/devices/android/bootstrap/.project diff --git a/android/bootstrap/.settings/org.eclipse.jdt.core.prefs b/lib/devices/android/bootstrap/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from android/bootstrap/.settings/org.eclipse.jdt.core.prefs rename to lib/devices/android/bootstrap/.settings/org.eclipse.jdt.core.prefs diff --git a/android/bootstrap/.settings/org.eclipse.jdt.ui.prefs b/lib/devices/android/bootstrap/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from android/bootstrap/.settings/org.eclipse.jdt.ui.prefs rename to lib/devices/android/bootstrap/.settings/org.eclipse.jdt.ui.prefs diff --git a/android/bootstrap/.settings/org.eclipse.m2e.core.prefs b/lib/devices/android/bootstrap/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from android/bootstrap/.settings/org.eclipse.m2e.core.prefs rename to lib/devices/android/bootstrap/.settings/org.eclipse.m2e.core.prefs diff --git a/android/bootstrap/README.md b/lib/devices/android/bootstrap/README.md similarity index 100% rename from android/bootstrap/README.md rename to lib/devices/android/bootstrap/README.md diff --git a/android/bootstrap/build.xml b/lib/devices/android/bootstrap/build.xml similarity index 100% rename from android/bootstrap/build.xml rename to lib/devices/android/bootstrap/build.xml diff --git a/android/bootstrap/pom.xml b/lib/devices/android/bootstrap/pom.xml similarity index 100% rename from android/bootstrap/pom.xml rename to lib/devices/android/bootstrap/pom.xml diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommand.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommand.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidCommand.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommand.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandExecutor.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandExecutor.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandExecutor.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandExecutor.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandResult.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandResult.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandResult.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandResult.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandType.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandType.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandType.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidCommandType.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElement.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElement.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidElement.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElement.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementsHash.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementsHash.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/AndroidElementsHash.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementsHash.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/Bootstrap.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/Bootstrap.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/Bootstrap.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/Bootstrap.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/CommandHandler.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/CommandHandler.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/CommandHandler.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/CommandHandler.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/Dynamic.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/Dynamic.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/Dynamic.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/Dynamic.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/Logger.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/Logger.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/Logger.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/Logger.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/OrientationEnum.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/OrientationEnum.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/OrientationEnum.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/OrientationEnum.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/WDStatus.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/WDStatus.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/WDStatus.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/WDStatus.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/AndroidCommandException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/AndroidCommandException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/AndroidCommandException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/AndroidCommandException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/CommandTypeException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/CommandTypeException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/CommandTypeException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/CommandTypeException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotFoundException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotFoundException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotFoundException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotFoundException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotInHashException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotInHashException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotInHashException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/ElementNotInHashException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidCoordinatesException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidCoordinatesException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidCoordinatesException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidCoordinatesException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidStrategyException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidStrategyException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidStrategyException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/InvalidStrategyException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/NoAttributeFoundException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/NoAttributeFoundException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/NoAttributeFoundException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/NoAttributeFoundException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/SocketServerException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/SocketServerException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/SocketServerException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/SocketServerException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/exceptions/UnallowedTagNameException.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/UnallowedTagNameException.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/exceptions/UnallowedTagNameException.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/exceptions/UnallowedTagNameException.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/DumpWindowHierarchy.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/DumpWindowHierarchy.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/DumpWindowHierarchy.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/DumpWindowHierarchy.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/EnableCompressedLayoutHeirarchy.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/EnableCompressedLayoutHeirarchy.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/EnableCompressedLayoutHeirarchy.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/EnableCompressedLayoutHeirarchy.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetDeviceSize.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetDeviceSize.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetDeviceSize.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetDeviceSize.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetLocation.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetLocation.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetLocation.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetLocation.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetStrings.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetStrings.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetStrings.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetStrings.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Orientation.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Orientation.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Orientation.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Orientation.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Pinch.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Pinch.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Pinch.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Pinch.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/PressBack.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/PressBack.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/PressBack.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/PressBack.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/PressKeyCode.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/PressKeyCode.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/PressKeyCode.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/PressKeyCode.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/ScrollTo.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/ScrollTo.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/ScrollTo.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/ScrollTo.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/TakeScreenshot.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/TakeScreenshot.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/TakeScreenshot.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/TakeScreenshot.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/TouchLongClick.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/TouchLongClick.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/TouchLongClick.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/TouchLongClick.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/WaitForIdle.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/WaitForIdle.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/WaitForIdle.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/WaitForIdle.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Wake.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Wake.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/handler/Wake.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Wake.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/selector/Strategy.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/selector/Strategy.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/selector/Strategy.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/selector/Strategy.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/utils/Point.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/utils/Point.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/utils/Point.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/utils/Point.java diff --git a/android/bootstrap/src/io/appium/android/bootstrap/utils/TheWatchers.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/utils/TheWatchers.java similarity index 100% rename from android/bootstrap/src/io/appium/android/bootstrap/utils/TheWatchers.java rename to lib/devices/android/bootstrap/src/io/appium/android/bootstrap/utils/TheWatchers.java diff --git a/lib/devices/chrome_android.js b/lib/devices/android/chrome.js similarity index 96% rename from lib/devices/chrome_android.js rename to lib/devices/android/chrome.js index bdacc535875..b03c9db95bd 100644 --- a/lib/devices/chrome_android.js +++ b/lib/devices/android/chrome.js @@ -2,14 +2,14 @@ var Android = require('./android.js').Android , _ = require('underscore') - , proxyTo = require('./common.js').proxyTo - , logger = require('../server/logger.js').get('appium') + , proxyTo = require('../common.js').proxyTo + , logger = require('../../server/logger.js').get('appium') , exec = require('child_process').exec , spawn = require('child_process').spawn , async = require('async') , through = require('through') - , isWindows = require('../helpers.js').isWindows() - , adb = require('../../android/adb.js'); + , isWindows = require('../../helpers.js').isWindows() + , adb = require('./adb.js'); var ChromeAndroid = function(opts) { this.initialize(opts); diff --git a/android/device-state.js b/lib/devices/android/device-state.js similarity index 94% rename from android/device-state.js rename to lib/devices/android/device-state.js index 26148ded3e7..75bdb89e91a 100644 --- a/android/device-state.js +++ b/lib/devices/android/device-state.js @@ -1,7 +1,7 @@ "use strict"; var exec = require('child_process').exec - , logger = require('../lib/server/logger.js').get('appium'); + , logger = require('../../server/logger.js').get('appium'); function log(msg) { logger.info("[ADB] " + msg); diff --git a/android/helpers/dump2json.jar b/lib/devices/android/helpers/dump2json.jar similarity index 100% rename from android/helpers/dump2json.jar rename to lib/devices/android/helpers/dump2json.jar diff --git a/android/helpers/move_manifest.jar b/lib/devices/android/helpers/move_manifest.jar similarity index 100% rename from android/helpers/move_manifest.jar rename to lib/devices/android/helpers/move_manifest.jar diff --git a/android/helpers/sign.jar b/lib/devices/android/helpers/sign.jar similarity index 100% rename from android/helpers/sign.jar rename to lib/devices/android/helpers/sign.jar diff --git a/android/helpers/strings_from_apk.jar b/lib/devices/android/helpers/strings_from_apk.jar similarity index 100% rename from android/helpers/strings_from_apk.jar rename to lib/devices/android/helpers/strings_from_apk.jar diff --git a/android/helpers/unsign.jar b/lib/devices/android/helpers/unsign.jar similarity index 100% rename from android/helpers/unsign.jar rename to lib/devices/android/helpers/unsign.jar diff --git a/android/helpers/verify.jar b/lib/devices/android/helpers/verify.jar similarity index 100% rename from android/helpers/verify.jar rename to lib/devices/android/helpers/verify.jar diff --git a/android/logcat.js b/lib/devices/android/logcat.js similarity index 97% rename from android/logcat.js rename to lib/devices/android/logcat.js index cbe250c1116..4e107752364 100644 --- a/android/logcat.js +++ b/lib/devices/android/logcat.js @@ -3,7 +3,7 @@ var spawn = require('win-spawn') , through = require('through') , _ = require('underscore') - , logger = require('../lib/server/logger.js').get('appium'); + , logger = require('../../server/logger.js').get('appium'); var Logcat = function(opts) { this.adbCmd = opts.adbCmd; diff --git a/lib/devices/selendroid.js b/lib/devices/android/selendroid.js similarity index 93% rename from lib/devices/selendroid.js rename to lib/devices/android/selendroid.js index 0e343e6bb2a..6e611bbb418 100644 --- a/lib/devices/selendroid.js +++ b/lib/devices/android/selendroid.js @@ -1,15 +1,15 @@ "use strict"; -var errors = require('../server/errors.js') - , adb = require('../../android/adb.js') +var errors = require('../../server/errors.js') + , adb = require('./adb.js') , _ = require('underscore') - , deviceCommon = require('./common.js') + , deviceCommon = require('../common.js') , request = deviceCommon.request , proxyTo = deviceCommon.proxyTo , getLog = deviceCommon.getLog , getLogTypes = deviceCommon.getLogTypes - , logger = require('../server/logger.js').get('appium') - , status = require("../server/status.js") + , logger = require('../../server/logger.js').get('appium') + , status = require("../../server/status.js") , fs = require('fs') , async = require('async') , path = require('path') @@ -66,7 +66,7 @@ Selendroid.prototype.keyevent = function(body, cb) { Selendroid.prototype.ensureServerExists = function(cb) { logger.info("Checking whether selendroid is built yet"); - var selBin = path.resolve(__dirname, "..", "..", "build", "selendroid", + var selBin = path.resolve(__dirname, "..", "..", "..", "build", "selendroid", "selendroid.apk"); fs.stat(selBin, function(err) { if (err) { diff --git a/reset.sh b/reset.sh index 2d24066acbf..defd4d74cf1 100755 --- a/reset.sh +++ b/reset.sh @@ -250,11 +250,11 @@ reset_selendroid() { echo "* Linking selendroid test app: WebViewDemo" run_cmd rm -rf $appium_home/sample-code/apps/WebViewDemo run_cmd ln -s $appium_home/submodules/selendroid/selendroid-test-app $appium_home/sample-code/apps/WebViewDemo - uninstall_android_app io.selendroid.testapp uninstall_android_app io.selendroid.testapp.selendroid + uninstall_android_app io.selendroid.testapp # keep older versions of package around to clean up - uninstall_android_app org.openqa.selendroid.testapp uninstall_android_app org.openqa.selendroid.testapp.selendroid + uninstall_android_app org.openqa.selendroid.testapp fi echo "* Setting Selendroid config to Appium's version" run_cmd $grunt setConfigVer:selendroid diff --git a/test/functional/android/device-state.js b/test/functional/android/device-state.js index 02edd1b7722..6ebc66a1cad 100644 --- a/test/functional/android/device-state.js +++ b/test/functional/android/device-state.js @@ -1,11 +1,11 @@ /*global describe:true, it:true, beforeEach:true */ "use strict"; -var deviceState = require('../../../android/device-state.js') +var deviceState = require('../../../lib/devices/android/device-state.js') , should = require('should') , childProcess = require('child_process') , it = require("../../helpers/driverblock.js").it - , ADB = require('../../../android/adb'); + , ADB = require('../../../lib/devices/android/adb'); describe('Android Device State module', function() { beforeEach(function(done) {