From dbcdef44d124f94c23f7c2d07db50c4a00702dec Mon Sep 17 00:00:00 2001 From: Opie Cyrus Date: Mon, 17 Sep 2012 17:17:04 -0500 Subject: [PATCH 1/2] TIMOB-10355 work around to already fixed issue with platform properties access --- anvil/driver/common.js | 2 +- anvil/driver/platforms/android.js | 2 +- anvil/driver/platforms/ios.js | 2 +- anvil/driver/platforms/mobileweb.js | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anvil/driver/common.js b/anvil/driver/common.js index d7ec5922188..3b5120af191 100755 --- a/anvil/driver/common.js +++ b/anvil/driver/common.js @@ -392,7 +392,7 @@ module.exports = new function() { make sure to only inject if the value doesn't already exist in the config tiapp.xml so we avoid duplicates */ - newTiappXmlContents += "\t" + self.customTiappXmlProperties[key] + "\n"; + newTiappXmlContents += "\t" + self.customTiappXmlProperties[key].value + "\n"; } } } diff --git a/anvil/driver/platforms/android.js b/anvil/driver/platforms/android.js index 86d72809bab..237074a3ad7 100644 --- a/anvil/driver/platforms/android.js +++ b/anvil/driver/platforms/android.js @@ -64,7 +64,7 @@ module.exports = new function() { make sure the harness has access to what port number it should listen on for a connection from the driver */ - common.customTiappXmlProperties["driver.socketPort"] = driverGlobal.config.androidSocketPort; + common.customTiappXmlProperties["driver.socketPort"] = {value: driverGlobal.config.androidSocketPort, type: "string"}; // due to python behavior on windows, we need to escape the slashes in the argument string if (os.platform().substr(0 ,3) === "win") { diff --git a/anvil/driver/platforms/ios.js b/anvil/driver/platforms/ios.js index 70c014a8535..eaac836c809 100644 --- a/anvil/driver/platforms/ios.js +++ b/anvil/driver/platforms/ios.js @@ -84,7 +84,7 @@ module.exports = new function() { make sure the harness has access to what port number it should listen on for a connection from the driver */ - common.customTiappXmlProperties["driver.socketPort"] = driverGlobal.config.iosSocketPort; + common.customTiappXmlProperties["driver.socketPort"] = {value: driverGlobal.config.iosSocketPort, type: "int"}; common.createHarness( "ios", diff --git a/anvil/driver/platforms/mobileweb.js b/anvil/driver/platforms/mobileweb.js index 78c510e084b..870cc51e103 100644 --- a/anvil/driver/platforms/mobileweb.js +++ b/anvil/driver/platforms/mobileweb.js @@ -135,7 +135,7 @@ module.exports = new function() { }; // this is the same whether browser only mode is enabled or not - common.customTiappXmlProperties["driver.httpPort"] = driverGlobal.config.httpPort; + common.customTiappXmlProperties["driver.httpPort"] = {value: driverGlobal.config.httpPort, type: "int"}; /* check for browser only mode. When in browser only mode, we are gonna skip invoking the @@ -151,7 +151,7 @@ module.exports = new function() { since we are running in browser only mode, the harness should use the loopback address when making requests to the driver */ - common.customTiappXmlProperties["driver.httpHost"] = "http://127.0.0.1"; + common.customTiappXmlProperties["driver.httpHost"] = {value: "http://127.0.0.1", type: "string"}; // skip the normal logic of launching the browser on device serverCallback = function() { @@ -182,7 +182,7 @@ module.exports = new function() { make sure that the harness has the correct wifi address to use when making requests to the driver */ - common.customTiappXmlProperties["driver.httpHost"] = driverGlobal.httpHost; + common.customTiappXmlProperties["driver.httpHost"] = {value: driverGlobal.httpHost, type: "string"}; } else { driverUtils.log("unable to get IP address", driverGlobal.logLevels.quiet); From 553a95cf7c884067b7231c7577d44792a3054ce1 Mon Sep 17 00:00:00 2001 From: Opie Cyrus Date: Mon, 17 Sep 2012 18:17:26 -0500 Subject: [PATCH 2/2] TIMOB-10355 fix typo and bump thread stack size to deal with error when running commonjs tests in Rhino --- anvil/driver/platforms/android.js | 2 +- support/anvil/configSet/configs/default_rhino/tiapp.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anvil/driver/platforms/android.js b/anvil/driver/platforms/android.js index 237074a3ad7..18278c0e602 100644 --- a/anvil/driver/platforms/android.js +++ b/anvil/driver/platforms/android.js @@ -64,7 +64,7 @@ module.exports = new function() { make sure the harness has access to what port number it should listen on for a connection from the driver */ - common.customTiappXmlProperties["driver.socketPort"] = {value: driverGlobal.config.androidSocketPort, type: "string"}; + common.customTiappXmlProperties["driver.socketPort"] = {value: driverGlobal.config.androidSocketPort, type: "int"}; // due to python behavior on windows, we need to escape the slashes in the argument string if (os.platform().substr(0 ,3) === "win") { diff --git a/support/anvil/configSet/configs/default_rhino/tiapp.xml b/support/anvil/configSet/configs/default_rhino/tiapp.xml index a4410c5bd50..d6e72bd6633 100644 --- a/support/anvil/configSet/configs/default_rhino/tiapp.xml +++ b/support/anvil/configSet/configs/default_rhino/tiapp.xml @@ -18,7 +18,7 @@ false system - 32768 + 49152 Ti.UI.PORTRAIT