Bug 1107706: Part 12: Drop marionette-* prefix on files
☠☠ backed out by 4c2c50594967 ☠ ☠
authorAndreas Tolfsen <ato@mozilla.com>
Mon, 23 Mar 2015 21:32:03 +0000
changeset 264222 18c48c6a0cd5a040832959351ccf8783c252e19e
parent 264221 5dce917aeb925d0e8e0ae412d73414fb97a06140
child 264223 3ca5a996676e64c796d6190b5d7b99edd2378266
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1107706
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1107706: Part 12: Drop marionette-* prefix on files
testing/marionette/actions.js
testing/marionette/common.js
testing/marionette/driver.js
testing/marionette/elements.js
testing/marionette/frame-manager.js
testing/marionette/jar.mn
testing/marionette/listener.js
testing/marionette/marionette-actions.js
testing/marionette/marionette-common.js
testing/marionette/marionette-elements.js
testing/marionette/marionette-frame-manager.js
testing/marionette/marionette-listener.js
testing/marionette/marionette-sendkeys.js
testing/marionette/marionette-simpletest.js
testing/marionette/sendkeys.js
testing/marionette/server.js
testing/marionette/simpletest.js
rename from testing/marionette/marionette-actions.js
rename to testing/marionette/actions.js
rename from testing/marionette/marionette-common.js
rename to testing/marionette/common.js
--- a/testing/marionette/marionette-common.js
+++ b/testing/marionette/common.js
@@ -1,18 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/**
- *
- * This file contains common code that is shared between marionette-server.js
- * and marionette-listener.js.
- *
- */
+// This file contains common code that is shared between
+// driver.jj and listener.js.
 
 /**
  * Creates an error message for a JavaScript exception thrown during
  * execute_(async_)script.
  *
  * This will generate a [msg, trace] pair like:
  *
  * ['ReferenceError: foo is not defined',
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -17,35 +17,35 @@ Cu.import("resource://gre/modules/Task.j
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 this.DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils.js");
 
 XPCOMUtils.defineLazyServiceGetter(
     this, "cookieManager", "@mozilla.org/cookiemanager;1", "nsICookieManager");
 
+Cu.import("chrome://marionette/content/elements.js");
 Cu.import("chrome://marionette/content/emulator.js");
 Cu.import("chrome://marionette/content/error.js");
-Cu.import("chrome://marionette/content/marionette-elements.js");
-Cu.import("chrome://marionette/content/marionette-simpletest.js");
 Cu.import("chrome://marionette/content/modal.js");
-
-loader.loadSubScript("chrome://marionette/content/marionette-common.js");
+Cu.import("chrome://marionette/content/simpletest.js");
+
+loader.loadSubScript("chrome://marionette/content/common.js");
 
 // preserve this import order:
 let utils = {};
 loader.loadSubScript("chrome://marionette/content/EventUtils.js", utils);
 loader.loadSubScript("chrome://marionette/content/ChromeUtils.js", utils);
 loader.loadSubScript("chrome://marionette/content/atoms.js", utils);
-loader.loadSubScript("chrome://marionette/content/marionette-sendkeys.js", utils);
-loader.loadSubScript("chrome://marionette/content/marionette-frame-manager.js");
+loader.loadSubScript("chrome://marionette/content/sendkeys.js", utils);
+loader.loadSubScript("chrome://marionette/content/frame-manager.js");
 
 this.EXPORTED_SYMBOLS = ["GeckoDriver", "Context"];
 
-const FRAME_SCRIPT = "chrome://marionette/content/marionette-listener.js";
+const FRAME_SCRIPT = "chrome://marionette/content/listener.js";
 const BROWSER_STARTUP_FINISHED = "browser-delayed-startup-finished";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const SECURITY_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
 const CLICK_TO_START_PREF = "marionette.debugging.clicktostart";
 const CONTENT_LISTENER_PREF = "marionette.contentListener";
 
 const logger = Log.repository.getLogger("Marionette");
 const uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
@@ -87,17 +87,17 @@ this.Context.fromString = function(s) {
  *
  * Calls to this object will  be proxied via the message manager to the active
  * browsing context (content) and responses will be provided back as
  * promises.
  *
  * The argument sequence is serialised and passed as an array, unless it
  * consists of a single object type that isn't null, in which case it's
  * passed literally.  The latter specialisation is temporary to achieve
- * backwards compatibility with marionette-listener.js.
+ * backwards compatibility with listener.js.
  *
  * @param {function(): nsIMessageManager} mmFn
  *     Function returning the current message manager.
  * @param {function(string, Object, number)} sendAsyncFn
  *     Callback for sending async messages to the current listener.
  * @param {function(): BrowserObj} curBrowserFn
  *     Function that returns the current browser.
  */
@@ -300,17 +300,17 @@ GeckoDriver.prototype.switchToGlobalMess
     this.sendAsync("sleepSession");
     this.curBrowser.frameManager.currentRemoteFrame = null;
   }
   this.mm = globalMessageManager;
 };
 
 /**
  * Helper method to send async messages to the content listener.
- * Correct usage is to pass in the name of a function in marionette-listener.js,
+ * Correct usage is to pass in the name of a function in listener.js,
  * a message object consisting of JSON serialisable primitives,
  * and the current command's ID.
  *
  * @param {string} name
  *     Suffix of the targetted message listener ({@code Marionette:<suffix>}).
  * @param {Object=} msg
  *     JSON serialisable object to send to the listener.
  * @param {number=} cmdId
rename from testing/marionette/marionette-elements.js
rename to testing/marionette/elements.js
rename from testing/marionette/marionette-frame-manager.js
rename to testing/marionette/frame-manager.js
--- a/testing/marionette/marionette-frame-manager.js
+++ b/testing/marionette/frame-manager.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 let {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 this.EXPORTED_SYMBOLS = ["FrameManager"];
 
-let FRAME_SCRIPT = "chrome://marionette/content/marionette-listener.js";
+let FRAME_SCRIPT = "chrome://marionette/content/listener.js";
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
                .getService(Ci.mozIJSSubScriptLoader);
 let specialpowers = {};
 
--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -1,23 +1,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 marionette.jar:
 % content marionette %content/
   content/server.js (server.js)
   content/driver.js (driver.js)
-  content/marionette-listener.js    (marionette-listener.js)
-  content/marionette-elements.js    (marionette-elements.js)
-  content/marionette-sendkeys.js    (marionette-sendkeys.js)
-  content/marionette-common.js      (marionette-common.js)
-  content/marionette-actions.js     (marionette-actions.js)
-  content/marionette-simpletest.js  (marionette-simpletest.js)
-  content/marionette-frame-manager.js  (marionette-frame-manager.js)
+  content/actions.js (actions.js)
+  content/listener.js (listener.js)
+  content/elements.js (elements.js)
+  content/sendkeys.js (sendkeys.js)
+  content/common.js (common.js)
+  content/simpletest.js (simpletest.js)
+  content/frame-manager.js (frame-manager.js)
   content/EventUtils.js  (EventUtils.js)
   content/ChromeUtils.js  (ChromeUtils.js)
   content/error.js (error.js)
   content/command.js (command.js)
   content/dispatcher.js (dispatcher.js)
   content/emulator.js (emulator.js)
   content/modal.js (modal.js)
 #ifdef ENABLE_TESTS
rename from testing/marionette/marionette-listener.js
rename to testing/marionette/listener.js
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/listener.js
@@ -6,30 +6,30 @@
 let {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 let uuidGen = Cc["@mozilla.org/uuid-generator;1"]
                 .getService(Ci.nsIUUIDGenerator);
 
 let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
                .getService(Ci.mozIJSSubScriptLoader);
 
-loader.loadSubScript("chrome://marionette/content/marionette-simpletest.js");
-loader.loadSubScript("chrome://marionette/content/marionette-common.js");
-loader.loadSubScript("chrome://marionette/content/marionette-actions.js");
-Cu.import("chrome://marionette/content/marionette-elements.js");
+loader.loadSubScript("chrome://marionette/content/simpletest.js");
+loader.loadSubScript("chrome://marionette/content/common.js");
+loader.loadSubScript("chrome://marionette/content/actions.js");
+Cu.import("chrome://marionette/content/elements.js");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 let utils = {};
 utils.window = content;
 // Load Event/ChromeUtils for use with JS scripts:
 loader.loadSubScript("chrome://marionette/content/EventUtils.js", utils);
 loader.loadSubScript("chrome://marionette/content/ChromeUtils.js", utils);
 loader.loadSubScript("chrome://marionette/content/atoms.js", utils);
-loader.loadSubScript("chrome://marionette/content/marionette-sendkeys.js", utils);
+loader.loadSubScript("chrome://marionette/content/sendkeys.js", utils);
 
 loader.loadSubScript("chrome://specialpowers/content/specialpowersAPI.js");
 loader.loadSubScript("chrome://specialpowers/content/specialpowers.js");
 
 let marionetteLogObj = new MarionetteLogObj();
 
 let isB2G = false;
 
@@ -69,17 +69,17 @@ let navTimer = Cc["@mozilla.org/timer;1"
 let onDOMContentLoaded;
 // Send move events about this often
 let EVENT_INTERVAL = 30; // milliseconds
 // last touch for each fingerId
 let multiLast = {};
 
 Cu.import("resource://gre/modules/Log.jsm");
 let logger = Log.repository.getLogger("Marionette");
-logger.info("loaded marionette-listener.js");
+logger.info("loaded listener.js");
 let modalHandler = function() {
   // This gets called on the system app only since it receives the mozbrowserprompt event
   sendSyncMessage("Marionette:switchedToFrame", { frameValue: null, storePrevious: true });
   let isLocal = sendSyncMessage("MarionetteFrame:handleModal", {})[0].value;
   if (isLocal) {
     previousFrame = curFrame;
   }
   curFrame = content;
rename from testing/marionette/marionette-sendkeys.js
rename to testing/marionette/sendkeys.js
--- a/testing/marionette/server.js
+++ b/testing/marionette/server.js
@@ -9,27 +9,27 @@ const {Constructor: CC, classes: Cc, int
 const loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
 const ServerSocket = CC("@mozilla.org/network/server-socket;1", "nsIServerSocket", "initSpecialConnection");
 
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://marionette/content/dispatcher.js");
 Cu.import("chrome://marionette/content/driver.js");
-Cu.import("chrome://marionette/content/marionette-elements.js");
-Cu.import("chrome://marionette/content/marionette-simpletest.js");
+Cu.import("chrome://marionette/content/elements.js");
+Cu.import("chrome://marionette/content/simpletest.js");
 
 // Bug 1083711: Load transport.js as an SDK module instead of subscript
 loader.loadSubScript("resource://gre/modules/devtools/transport/transport.js");
 
 // Preserve this import order:
 let events = {};
 loader.loadSubScript("chrome://marionette/content/EventUtils.js", events);
 loader.loadSubScript("chrome://marionette/content/ChromeUtils.js", events);
-loader.loadSubScript("chrome://marionette/content/marionette-frame-manager.js");
+loader.loadSubScript("chrome://marionette/content/frame-manager.js");
 
 const logger = Log.repository.getLogger("Marionette");
 
 this.EXPORTED_SYMBOLS = ["MarionetteServer"];
 const SPECIAL_POWERS_PREF = "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer";
 const CONTENT_LISTENER_PREF = "marionette.contentListener";
 
 /**
rename from testing/marionette/marionette-simpletest.js
rename to testing/marionette/simpletest.js