Add getWindow and sleep functions; include test_resizeWindow.js

peptest/extension/chrome/content/pepinit.js

@@ -1,39 +1,39 @@
-/* ***** BEGIN LICENSE BLOCK ***** 
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1 
- * 
- * The contents of this file are subject to the Mozilla Public License Version 
- * 1.1 (the "License"); you may not use this file except in compliance with 
- * the License. You may obtain a copy of the License at 
- * http://www.mozilla.org/MPL/ 
- * 
- * Software distributed under the License is distributed on an "AS IS" basis, 
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
- * for the specific language governing rights and limitations under the 
- * License. 
- * 
- * The Original Code is peptest. 
- * 
- * The Initial Developer of the Original Code is 
- *   Mozilla Corporation. 
- * Portions created by the Initial Developer are Copyright (C) 2011. 
- * the Initial Developer. All Rights Reserved. 
- * 
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is peptest.
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2011.
+ * the Initial Developer. All Rights Reserved.
+ *
  * Contributor(s):
- *   Andrew Halberstadt <halbersa@gmail.com> 
- * 
- * Alternatively, the contents of this file may be used under the terms of 
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), 
- * in which case the provisions of the GPL or the LGPL are applicable instead 
- * of those above. If you wish to allow use of your version of this file only 
- * under the terms of either the GPL or the LGPL, and not to allow others to 
- * use your version of this file under the terms of the MPL, indicate your 
- * decision by deleting the provisions above and replace them with the notice 
- * and other provisions required by the GPL or the LGPL. If you do not delete 
- * the provisions above, a recipient may use your version of this file under 
- * the terms of any one of the MPL, the GPL or the LGPL. 
- * 
- ***** END LICENSE BLOCK ***** */ 
+ *   Andrew Halberstadt <halbersa@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ ***** END LICENSE BLOCK ***** */
 
 Components.utils.import('resource://gre/modules/NetUtil.jsm');
 var broker = {}; Components.utils.import('resource://mozmill/driver/msgbroker.js', broker);
@@ -79,7 +79,7 @@ function runTests(tests) {
     // TODO Figure out why they interfere with each other
     utils.sleep(1000);
   }
-  utils.dumpLine('FINISHED');
+  utils.dumpLine('INFO FINISHED');
   // quit the application
   goQuitApplication();
 }
@@ -93,11 +93,11 @@ function runFile(test) {
                        .createInstance(Components.interfaces.nsILocalFile);
   file.initWithPath(test.path);
   let uri = gIOS.newFileURI(file).spec;
- 
+
   try {
     // initialize test scope
     let testScope = new pep.PepAPI(test.name);
-    
+
     utils.dumpLine('TEST-START ' + test.name);
     let startTime = Date.now();
     subscriptLoader.loadSubScript(uri, testScope);
@@ -118,18 +118,20 @@ function runFile(test) {
  */
 function loadManifest(manifest) {
   let data = utils.readFile(manifest);
-  let json = data.join(' '); 
+  let json = data.join(' ');
   return JSON.parse(json);
 };
 
+
 function MozmillMsgListener() {}
 MozmillMsgListener.prototype.pass = function(obj) {
-  utils.dumpLine('MOZMILL pass ' + JSON.stringify(obj) + '\n'); 
+  utils.dumpLine('MOZMILL pass ' + JSON.stringify(obj) + '\n');
 }
 MozmillMsgListener.prototype.fail = function(obj) {
-  utils.dumpLine('MOZMILL fail ' + JSON.stringify(obj) + '\n'); 
+  // TODO Should this cause an error?
+  utils.dumpLine('WARNING MOZMILL fail ' + JSON.stringify(obj) + '\n');
 }
 MozmillMsgListener.prototype.log = function(obj) {
-  utils.dumpLine('MOZMILL log ' + JSON.stringify(obj) + '\n'); 
+  utils.dumpLine('MOZMILL log ' + JSON.stringify(obj) + '\n');
 }
 broker.addObject(new MozmillMsgListener());

peptest/extension/install.rdf

@@ -12,15 +12,15 @@
        <Description>
          <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
          <em:minVersion>3.6</em:minVersion>
-         <em:maxVersion>10.*</em:maxVersion>
+         <em:maxVersion>15.*</em:maxVersion>
        </Description>
      </em:targetApplication>
      <em:targetApplication>
        <!-- Thunderbird -->
        <Description>
          <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
          <em:minVersion>3.0a1pre</em:minVersion>
-         <em:maxVersion>10.*</em:maxVersion>
+         <em:maxVersion>15.*</em:maxVersion>
        </Description>
      </em:targetApplication>
    </Description>

peptest/extension/resource/pep/pep.js

@@ -1,44 +1,47 @@
-/* ***** BEGIN LICENSE BLOCK ***** 
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1 
- * 
- * The contents of this file are subject to the Mozilla Public License Version 
- * 1.1 (the "License"); you may not use this file except in compliance with 
- * the License. You may obtain a copy of the License at 
- * http://www.mozilla.org/MPL/ 
- * 
- * Software distributed under the License is distributed on an "AS IS" basis, 
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
- * for the specific language governing rights and limitations under the 
- * License. 
- * 
- * The Original Code is peptest. 
- * 
- * The Initial Developer of the Original Code is 
- *   Mozilla Corporation. 
- * Portions created by the Initial Developer are Copyright (C) 2011. 
- * the Initial Developer. All Rights Reserved. 
- * 
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is peptest.
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2011.
+ * the Initial Developer. All Rights Reserved.
+ *
  * Contributor(s):
- *   Andrew Halberstadt <halbersa@gmail.com> 
- * 
- * Alternatively, the contents of this file may be used under the terms of 
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), 
- * in which case the provisions of the GPL or the LGPL are applicable instead 
- * of those above. If you wish to allow use of your version of this file only 
- * under the terms of either the GPL or the LGPL, and not to allow others to 
- * use your version of this file under the terms of the MPL, indicate your 
- * decision by deleting the provisions above and replace them with the notice 
- * and other provisions required by the GPL or the LGPL. If you do not delete 
- * the provisions above, a recipient may use your version of this file under 
- * the terms of any one of the MPL, the GPL or the LGPL. 
- * 
- ***** END LICENSE BLOCK ***** */ 
+ *   Andrew Halberstadt <halbersa@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ ***** END LICENSE BLOCK ***** */
 
 var EXPORTED_SYMBOLS = ['PepAPI'];
 var results = {}; Components.utils.import('resource://pep/results.js', results);
 var utils = {}; Components.utils.import('resource://pep/utils.js', utils);
 
+var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                            .getService(Components.interfaces.nsIWindowMediator);
+
 /**
  * This is the API exposed to tests
  * Any properties of this object will be directly injected into test scope
@@ -53,8 +56,15 @@ PepAPI.prototype.performAction = function(actionName, func) {
   func();
   this.resultHandler.endAction();
 }
+PepAPI.prototype.getWindow = function() {
+  // TODO Return other windows depending on app (e.g Mail3Pane)
+  return wm.getMostRecentWindow("navigator:browser");
+}
+PepAPI.prototype.sleep = function(milliseconds) {
+  utils.sleep(milliseconds);
+}
 
-// Logging wrapper for tests 
+// Logging wrapper for tests
 function Log(testName) {
   this.testName = testName;
 }

peptest/extension/resource/pep/results.js

@@ -1,39 +1,39 @@
-/* ***** BEGIN LICENSE BLOCK ***** 
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1 
-* 
-* The contents of this file are subject to the Mozilla Public License Version 
-* 1.1 (the "License"); you may not use this file except in compliance with 
-* the License. You may obtain a copy of the License at 
-* http://www.mozilla.org/MPL/ 
-* 
-* Software distributed under the License is distributed on an "AS IS" basis, 
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
-* for the specific language governing rights and limitations under the 
-* License. 
-* 
-* The Original Code is peptest. 
-* 
-* The Initial Developer of the Original Code is 
-*   Mozilla Corporation. 
-* Portions created by the Initial Developer are Copyright (C) 2011. 
-* the Initial Developer. All Rights Reserved. 
-* 
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: MPL 1.1/GPL 2.0/LGPL 2.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is peptest.
+*
+* The Initial Developer of the Original Code is
+*   Mozilla Corporation.
+* Portions created by the Initial Developer are Copyright (C) 2011.
+* the Initial Developer. All Rights Reserved.
+*
 * Contributor(s):
-*   Andrew Halberstadt <halbersa@gmail.com> 
-* 
-* Alternatively, the contents of this file may be used under the terms of 
-* either the GNU General Public License Version 2 or later (the "GPL"), or 
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), 
-* in which case the provisions of the GPL or the LGPL are applicable instead 
-* of those above. If you wish to allow use of your version of this file only 
-* under the terms of either the GPL or the LGPL, and not to allow others to 
-* use your version of this file under the terms of the MPL, indicate your 
-* decision by deleting the provisions above and replace them with the notice 
-* and other provisions required by the GPL or the LGPL. If you do not delete 
-* the provisions above, a recipient may use your version of this file under 
-* the terms of any one of the MPL, the GPL or the LGPL. 
-* 
-***** END LICENSE BLOCK ***** */ 
+*   Andrew Halberstadt <halbersa@gmail.com>
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+***** END LICENSE BLOCK ***** */
 
 var EXPORTED_SYMBOLS = ['ResultHandler'];
 
@@ -55,6 +55,12 @@ ResultHandler.prototype.startAction = function(actionName) {
 
 ResultHandler.prototype.endAction = function() {
   if (this.currentAction['start_time']) {
+    // Sleep for 200 milliseconds
+    // This is here because there may still be event tracer events
+    // propagating through the event loop. We don't want to miss
+    // unresponsiveness caused by operations executed towards the
+    // end of a performAction call.
+    utils.sleep(200);
     this.currentAction['end_time'] = Date.now();
     this.results.push(this.currentAction);
     utils.dumpLine('ACTION-END ' + this.testName + ' ' + this.currentAction['action_name']);

peptest/pepprocess.py

@@ -84,7 +84,7 @@ def processOutputLine(self, line):
                 line = line[len('PEP ' + tokens[1]):]
                 getattr(self.logger, tokens[1].lower())(line.strip())
                 if tokens[1] == 'ERROR':
-                    results.fails[results.currentTest].append(tokens[3].rstrip())
+                    results.fails[results.currentTest].append("fail")
             else:
                 line = line[len('PEP'):]
                 self.logger.debug(line.strip())

peptest/runpeptests.py

@@ -261,8 +261,7 @@ def __init__(self, **kwargs):
         self.add_option("--timeout",
                         type="int", dest="timeout",
                         default=None,
-                        help="global timeout in seconds")
-
+                        help="global timeout in seconds (with no output)")
         LOG_LEVELS = ("DEBUG", "INFO", "WARNING", "ERROR")
         LEVEL_STRING = ", ".join(LOG_LEVELS)
         self.add_option("--log-level",

tests/firefox/all_tests.ini

@@ -3,3 +3,4 @@
 [test_openBookmarksMenu.js]
 [test_searchGoogle.js]
 [test_openWindow.js]
+[test_resizeWindow.js]

tests/firefox/test_contextMenu.js

@@ -12,7 +12,7 @@ c.open("http://mozilla.org");
 c.waitForPageLoad();
 
 // Grab reference to element on page (this is the <body> element in this case)
-let page = findElement.ID(c.tabs.activeTab, 'home');
+let page = findElement.ID(c.tabs.activeTab, 'header');
 // Perform our first action, reload.
 // It is very important to only place things that we
 // are interested in testing inside of a performAction call
@@ -40,6 +40,7 @@ performAction('content_scroll', function() {
   page.rightClick();
   for (let i = 0; i < 15; ++i) {
     page.keypress('VK_DOWN');
+    // Sleep to emulate a user better
     c.sleep(10);
   }
 });
@@ -61,6 +62,7 @@ performAction('chrome_scroll', function() {
   bar.rightClick();
   for (let i = 0; i < 15; ++i) {
     page.keypress('VK_DOWN');
+    // Sleep to emulate a user better
     c.sleep(10);
   }
 });

tests/firefox/test_openBlankTab.js

@@ -9,11 +9,8 @@ c.waitForPageLoad();
 let page = findElement.ID(c.tabs.activeTab, "home");
 performAction('open_blank_tab', function() {
   page.keypress('t', {'ctrlKey': true});
-  // Sleep so that the consequences of pushing new tab get tested for responsiveness
-  c.sleep(100);
 });
 
 performAction('close_blank_tab', function() {
   page.keypress('w', {'ctrlKey': true});
-  c.sleep(100);
 });