set stage for rearchitecture of appiumutils.js

app/uiauto/lib/appiumutils.js → app/uiauto/appium/base.js

@@ -19,20 +19,12 @@
  *	under the License.
  */
 
-#import "mechanic.js"
-#import "status.js"
+#import "../lib/mechanic.js"
+#import "../lib/status.js"
+#import "utility.js"
 // TODO: rewrite this entire file using helper methods from mechanic?
 
-// Obtaining Device Property Information like Name, OS ver, Model etc
 
-function getDeviceDetail() {
-    var deviceMap = new Object();
-    deviceMap['deviceName'] = UIATarget.localTarget().name();
-    deviceMap['deviceModel'] = UIATarget.localTarget().model();
-    deviceMap['systemName'] = UIATarget.localTarget().systemName();
-    deviceMap['systemVersion'] = UIATarget.localTarget().systemVersion();
-    return deviceMap;
- }
 
 // Misc utils
 
@@ -540,22 +532,22 @@ UIAElement.prototype.touchFlick = function(xoffset, yoffset) {
 
 // alerts
 
-getAlertText = function() {
+var getAlertText = function() {
   return {
     status: codes.Success.code,
     value: target.frontMostApp().alert().name()
   };
 }
 
-acceptAlert = function() {
+var acceptAlert = function() {
   target.frontMostApp().alert().defaultButton().tap()
   return {
     status: codes.Success.code,
     value: null
   };
 }
 
-dismissAlert = function() {
+var dismissAlert = function() {
   target.frontMostApp().alert().cancelButton().tap()
   return {
     status: codes.Success.code,

app/uiauto/appium/utility.js

@@ -0,0 +1,19 @@
+/*global au:true $:true UIATarget:true */
+"use strict";
+var au;
+
+if (typeof au === "undefined") {
+  au = {};
+}
+
+$.extend(au, {
+  // Obtaining Device Property Information like Name, OS ver, Model etc
+  getDeviceDetail: function() {
+    return {
+      deviceName: UIATarget.localTarget().name()
+      , deviceModel: UIATarget.localTarget().model()
+      , systemName: UIATarget.localTarget().systemName()
+      , systemVersion: UIATarget.localTarget().systemVersion()
+    };
+  }
+});

app/uiauto/bootstrap.js

@@ -1,8 +1,6 @@
 #import "lib/console.js"
 #import "lib/instruments_client.js"
-#import "lib/delay.js"
-#import "lib/appiumutils.js"
-#import "lib/status.js"
+#import "appium/base.js"
 
 // automation globals
 var target = UIATarget.localTarget();

app/uiauto/lib/status.js

@@ -100,4 +100,7 @@ var codes = {
     summary: 'Target provided for a move action is out of bounds.'
   }
 };
-module.exports.codes = codes;
+
+if (typeof module !== "undefined") {
+  module.exports.codes = codes;
+}

grunt.js

@@ -30,6 +30,7 @@ module.exports = function(grunt) {
     }
     , mochaTest: {
       unit: ['app/test/unit/*.js']
+      , appiumutils: ['test/appiumutils/*.js']
     }
     , mochaTestWithServer: {
       TestApp: {
@@ -55,8 +56,9 @@ module.exports = function(grunt) {
   grunt.registerTask('uicatalog', "Run UICatalog tests", function(log) {
     runTestsWithServer(grunt, 'UICatalog', 'uicatalog', log === "log", this.async());
   });
-  grunt.registerTask('test', 'lint buildApp:TestApp buildApp:UICatalog unit functional uicatalog');
+  grunt.registerTask('test', 'lint buildApp:TestApp buildApp:UICatalog unit appiumutils functional uicatalog');
   grunt.registerTask('unit', 'mochaTest:unit');
+  grunt.registerTask('appiumutils', 'mochaTest:appiumutils');
   grunt.registerTask('default', 'lint test');
   grunt.registerTask('appium', "Start the Appium server", function(appName) {
     if (typeof appName === "undefined") {

test/appiumutils/appiumutils.js

@@ -0,0 +1,61 @@
+/*global it:true, describe:true, before:true, after:true, beforeEach:true */
+/*global afterEach:true */
+"use strict";
+
+var runServer = require("../../server.js").run
+  , should = require("should")
+  , path = require("path");
+
+describe("appiumutils", function() {
+
+  var appium = null;
+  var device = null;
+  var server = null;
+  var onServerClose = function() {};
+
+  before(function(done) {
+    server = runServer({
+      app: path.resolve(__dirname, "../../sample-code/apps/UICatalog/build/Release-iphonesimulator/UICatalog.app")
+      , verbose: false
+      , udid: null
+      , port: 4723
+      , address: '127.0.0.1'
+      , remove: true }
+      , function(appiumServer) {
+          appium = appiumServer;
+          done();
+        }
+      , function() {
+          onServerClose();
+        }
+    );
+  });
+
+  beforeEach(function(done) {
+    appium.start({}, function() {
+      device = appium.device;
+      done();
+    });
+  });
+
+  afterEach(function(done) {
+    appium.stop(done);
+  });
+
+  after(function(done) {
+    onServerClose = done;
+    server.close();
+  });
+
+  it('should get device details', function(done) {
+    device.proxy("au.getDeviceDetail()", function(err, res) {
+      should.not.exist(err);
+      should.exist(res.value.deviceName);
+      should.exist(res.value.deviceModel);
+      should.exist(res.value.systemName);
+      should.exist(res.value.systemVersion);
+      done();
+    });
+  });
+
+});