Bug 1517059 - Tidy up Mozmill/JSBridge resources: remove mail/test/resources/mozmill/test/. r=darktrojan
authorJorg K <jorgk@jorgk.com>
Thu, 03 Jan 2019 01:58:25 +0100
changeset 34105 246f3ec47ccd4792e79ef0f1d55b233c4094b477
parent 34104 a95b5c837765002c4956b0c7cdf71405cc5a375e
child 34106 d22bfa0e33eb5c78c8d00dbca7d70287674e9e1b
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersdarktrojan
bugs1517059
Bug 1517059 - Tidy up Mozmill/JSBridge resources: remove mail/test/resources/mozmill/test/. r=darktrojan
mail/test/resources/mozmill/test/commonjs/modules1/moda.js
mail/test/resources/mozmill/test/commonjs/modules1/modb.js
mail/test/resources/mozmill/test/commonjs/modules2/modc.js
mail/test/resources/mozmill/test/commonjs/tests/test_require.js
mail/test/resources/mozmill/test/dnd/testDragLink.js
mail/test/resources/mozmill/test/dnd/testTabView.js
mail/test/resources/mozmill/test/dnd/testhtml.js
mail/test/resources/mozmill/test/dnd/testxul.js
mail/test/resources/mozmill/test/elementLib-UnitTest.js
mail/test/resources/mozmill/test/files/iframe.html
mail/test/resources/mozmill/test/files/singlediv.html
mail/test/resources/mozmill/test/first_sunbird_test.js
mail/test/resources/mozmill/test/first_thunderbird_test.js
mail/test/resources/mozmill/test/restart/test_browser/testPost.js
mail/test/resources/mozmill/test/restart/test_browser/testPre.js
mail/test/resources/mozmill/test/restart/test_fails/testPost.js
mail/test/resources/mozmill/test/restart/test_fails/testPre.js
mail/test/resources/mozmill/test/restart/test_multi_restart/test1.js
mail/test/resources/mozmill/test/restart/test_multi_restart/test2.js
mail/test/resources/mozmill/test/restart/test_multi_restart/test3.js
mail/test/resources/mozmill/test/restart/test_multi_restart/test4.js
mail/test/resources/mozmill/test/restart/test_multi_restart/test5.js
mail/test/resources/mozmill/test/restart/test_nothing/testPost.js
mail/test/resources/mozmill/test/restart/test_nothing/testPre.js
mail/test/resources/mozmill/test/restart/test_python_callback/callbacks.py
mail/test/resources/mozmill/test/restart/test_python_callback/testPost.js
mail/test/resources/mozmill/test/restart/test_python_callback/testPre.js
mail/test/resources/mozmill/test/restart/test_user_restart/test1.js
mail/test/resources/mozmill/test/restart/test_user_restart/test2.js
mail/test/resources/mozmill/test/restart/test_user_restart/test3.js
mail/test/resources/mozmill/test/restart/test_user_restart/test4.js
mail/test/resources/mozmill/test/restart/test_user_restart/test5.js
mail/test/resources/mozmill/test/test_assert.js
mail/test/resources/mozmill/test/test_demo.js
mail/test/resources/mozmill/test/test_diggIterator.js
mail/test/resources/mozmill/test/test_focus.js
mail/test/resources/mozmill/test/test_git.js
mail/test/resources/mozmill/test/test_googleIterator.js
mail/test/resources/mozmill/test/test_jum.js
mail/test/resources/mozmill/test/test_menu.js
mail/test/resources/mozmill/test/test_prefs.js
mail/test/resources/mozmill/test/test_property.js
mail/test/resources/mozmill/test/test_python_callbacks.js
mail/test/resources/mozmill/test/test_python_callbacks_callbacks.py
mail/test/resources/mozmill/test/test_radio.js
mail/test/resources/mozmill/test/test_reportErrorConsole.js
mail/test/resources/mozmill/test/test_selector.js
mail/test/resources/mozmill/test/test_setupmodulereporting.js
mail/test/resources/mozmill/test/test_something/test_parents.js
mail/test/resources/mozmill/test/test_something/test_sub/test_deps.js
mail/test/resources/mozmill/test/test_staleelement.js
mail/test/resources/mozmill/test/test_synthesizeEvents.js
mail/test/resources/mozmill/test/test_unit.js
mail/test/resources/mozmill/test/test_usershutdown.js
mail/test/resources/mozmill/test/test_waitForPageLoad.js
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/commonjs/modules1/moda.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var modb = require("modb"),
-    modc = require("../modules2/modc");
-
-exports.add = modc.add;
-
-exports.subtract = function(a, b) {
-  return a - b;
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/commonjs/modules1/modb.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function divide(a, b) {
-  return a / b;
-}
-
-exports.divide = divide;
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/commonjs/modules2/modc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-exports.add = function(a, b) {
-  return a + b;
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/commonjs/tests/test_require.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var moda = require("../modules1/moda");
-
-var six = moda.subtract(10, 4);
-var five = moda.add(2, 3);
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/dnd/testDragLink.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-var testFoo = function(){
-  controller.open('http://www.google.com');
-  controller.waitForPageLoad();
-
-  var urlbar = new elementslib.Lookup(controller.window.document, '/id("main-window")/id("tab-view-deck")/{"flex":"1"}/id("navigator-toolbox")/id("nav-bar")/id("urlbar-container")/id("urlbar")/anon({"class":"urlbar-frontcap-and-textbox"})/anon({"anonid":"stack"})/anon({"anonid":"textbox-container"})/anon({"anonid":"moz-input-box"})/anon({"anonid":"input"})');
-  var link = new elementslib.Link(controller.tabs.activeTab, "Advanced search");
-
-  controller.dragToElement(link, urlbar, 100, 20);
-
-  // should visit advanced search page
-  controller.waitForPageLoad();
-  var advancedSearch = new elementslib.Name(controller.tabs.activeTab, "as_q");
-  controller.assertNode(advancedSearch);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/dnd/testTabView.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var tabview = require("../../../../mozmill-tests/shared-modules/tabview");
-
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-  tabView = new tabview.tabView(controller);
-}
-
-var testFoo = function() {
-  tabView.open();
-
-  // wait for tab candy to open
-  controller.sleep(2000);
-
-  var doc = controller.window.document.getElementById("tab-view").contentDocument;
-
-  var tab = new elementslib.Selector(doc, ".tab");
-  var content = new elementslib.ID(doc, "content");
-  controller.dragToElement(tab, content, 500, 600);
-
-  var looseTabs = new elementslib.Selector(doc, ".tabInGroupItem");
-  controller.assertNode(looseTabs);
-  // there should only be one tab in the group now
-  controller.assert(function() { return !looseTabs.getNode(1); });
-
-  tabView.close();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/dnd/testhtml.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-}
-
-var test = function () {
-  controller.open("chrome://mozmill/content/test/test.html");
-  controller.waitForPageLoad();
-
-  var bar = new elementslib.ID(controller.window.document, "item1");
-  var box = new elementslib.ID(controller.window.document, "item2");
-
-  controller.dragToElement(bar, box);
-
-  // successful drop makes bar disappear
-  controller.assertNodeNotExist(bar);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/dnd/testxul.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-}
-
-var test = function () {
-  controller.open("chrome://mozmill/content/test/test.xul");
-  controller.waitForPageLoad();
-
-  var bar = new elementslib.ID(controller.window.document, "item1");
-  var box = new elementslib.ID(controller.window.document, "item2");
-
-  controller.dragToElement(bar, box);
-
-  // successful drop makes bar disappear
-  controller.assertNodeNotExist(bar);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/elementLib-UnitTest.js
+++ /dev/null
@@ -1,43 +0,0 @@
-var elementslib = {};
-ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {};
-ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-var test_foo = function(){
-  var controller = mozmill.getBrowserController();
-  controller.open("http://en-us.www.mozilla.com/en-US/firefox/3.0.1/firstrun/");
-
-  // Shorthand
-  var content = controller.window.content.document;
-  var chrome = controller.window.document;
-
-  // Test content XPath detection
-  var image = new elementslib.XPath(controller.window.content.document, "/html/body[@id='firstrun']/div[@id='wrapper']/div[@id='doc']/div[@id='main-feature']/h2/img");
-  controller.waitForElement(image);
-  controller.sleep(1000);
-
-  // Test content - ID detection
-  e = new elementslib.ID(content, "return");
-  controller.click(e);
-  controller.sleep(2000);
-
-  // Now go back - test chrome button anonymous lookup detection
-  e = new elementslib.Lookup(chrome, '/id("main-window")/id("navigator-toolbox")/id("nav-bar")/id("unified-back-forward-button")/id("back-button")/anon({"anonid":"button"})');
-  controller.click(e);
-  controller.waitForElement(image);
-
-  // Test chrome ID detection
-  e = new elementslib.ID(chrome, "star-button");
-  controller.click(e);
-  controller.sleep(1000);
-
-  // Test chrome drop down interaction using lookup detection - change searchbox to Yahoo
-  e = new elementslib.Lookup(chrome, '/id("main-window")/id("navigator-toolbox")/id("nav-bar")/id("search-container")/id("searchbar")/anon({"anonid":"searchbar-textbox"})/anon({"anonid":"searchbar-engine-button"})/anon({"anonid":"searchbar-popup"})/id("Yahoo")');
-  controller.click(e);
-  controller.sleep(1000);
-
-  // Type in searchbox and hit return
-  e = new elementslib.Lookup(chrome, '/id("main-window")/id("navigator-toolbox")/id("nav-bar")/id("search-container")/id("searchbar")/anon({"anonid":"searchbar-textbox"})/anon({"anonid":"moz-input-box"})/anon({"anonid":"input"})');
-  controller.type(e, "mozilla");
-  controller.keypress(e, 13);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/files/iframe.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <title>Iframe test page </title>
-  <script type="text/javascript">
-    function loadFrame() {
-      var frame = window.document.getElementById("iframe");
-      frame.src = "http://www.mozilla.com";
-    }
-  </script>
-</head>
-<body>
-  <h2>This iframe should load</h2>
-  <p id="load" onclick="loadFrame()">Load</p>
-  <iframe id="iframe"/>
-</body>
-</html>
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/files/singlediv.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-
-</head>
-<body>
-  <div id="test-div"></div>
-</body>
-</html>
\ No newline at end of file
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/first_sunbird_test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-var setupModule = function (module) {
-  var _w = mozmill.wm.getMostRecentWindow("calendarMainWindow");
-  module.calendar = new mozmill.controller.MozMillController(_w);
-}
-
-var test_foo = function(){
- calendar.type(new elementslib.ID(_w.document, 'unifinder-search-field'), "test");
- calendar.sleep(5000);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/first_thunderbird_test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-var setupModule = function(module) {
-  var _w = mozmill.wm.getMostRecentWindow("mail:3pane");
-  module.messenger = new mozmill.controller.MozMillController(_w);
-}
-
-var test_foo = function(){
- messenger.type(new elementslib.ID(_w.document, 'searchInput'), "test");
- messenger.sleep(5000);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_browser/testPost.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-
-var testKnowRightsDoesNotExist = function(){
-  if (!persisted.test) {
-    throw "Persisted is not working."
-  }
-  var e = new elementslib.Lookup(controller.window.document, '/id("main-window")/id("browser")/id("appcontent")/id("content")/anon({"anonid":"tabbox"})/anon({"anonid":"panelcontainer"})/[0]/{"value":"about-rights"}/{"accesskey":"K"}');
-
-  if (e.exists()) {
-    throw 'First run "know our rights" dialog is up after restart';
-  }
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_browser/testPre.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-persisted.test = true;
-
-var testKnowRightsClick = function(){
-  controller.sleep(1000)
-  controller.waitForPageLoad(2000)
-  controller.sleep(2000)
-  var e = new elementslib.Lookup(controller.window.document, '/id("main-window")/id("browser")/id("appcontent")/id("content")/anon({"anonid":"tabbox"})/anon({"anonid":"panelcontainer"})/[0]/{"value":"about-rights"}/{"accesskey":"K"}');
-  controller.waitForElement(e);
-  controller.click(e);
-  controller.sleep(500);
-  if (controller.window.document.title != "about:rights") {
-    throw "Did not go to the about:rights page."
-  }
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_fails/testPost.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
-
-var testAsyncTimeout = new mozmill.MozMillAsyncTest(1000)
-
-var testNothing = {};
-
-var testNotAsserts = function() {
-  // All of these calls should fail
-  jum.assert(false);
-  jum.assertTrue(false);
-  jum.assertTrue('asf');
-  jum.assertFalse(true);
-  jum.assertFalse('asdf');
-  jum.assertEquals('asdf', 'fdsa');
-  jum.assertNotEquals('asdf', 'asdf');
-  jum.assertNull(true);
-  jum.assertNotNull(null);
-  jum.assertUndefined('asdf');
-  jum.assertNotUndefined({}.asdf);
-  jum.assertNaN(4);
-  jum.assertNotNaN('f');
-  jum.fail();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_fails/testPre.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
-
-var testAsyncTimeout = new mozmill.MozMillAsyncTest(1000)
-
-var testNothing = {};
-
-var testNotAsserts = function() {
-  // All of these calls should fail
-  jum.assert(false);
-  jum.assertTrue(false);
-  jum.assertTrue('asf');
-  jum.assertFalse(true);
-  jum.assertFalse('asdf');
-  jum.assertEquals('asdf', 'fdsa');
-  jum.assertNotEquals('asdf', 'asdf');
-  jum.assertNull(true);
-  jum.assertNotNull(null);
-  jum.assertUndefined('asdf');
-  jum.assertNotUndefined({}.asdf);
-  jum.assertNaN(4);
-  jum.assertNotNaN('f');
-  jum.fail();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_multi_restart/test1.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_multi_restart/test2.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_multi_restart/test3.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_multi_restart/test4.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_multi_restart/test5.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_nothing/testPost.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_nothing/testPre.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_python_callback/callbacks.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def nowCallback(obj):
-    assert obj == "pre"
-
-def postCallback(obj):
-    assert obj == "post"
-
-def failCallback(obj):
-    assert True is False
\ No newline at end of file
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_python_callback/testPost.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-
-var testPythonCallPost = function() {
-  var status = "post";
-  mozmill.firePythonCallbackAfterRestart("postCallback", status);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_python_callback/testPre.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-
-var testPythonCallNow = function() {
-  var state = "pre"
-  mozmill.firePythonCallback("nowCallback", state)
-}
-
-var testPythonFail = function() {
-    mozmill.firePythonCallback("failCallback", null);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_user_restart/test1.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-/**
- * This test should pass
- */
-var testRestartBeforeTimeout = function() {
-  controller.startUserShutdown(2000, true);
-  controller.sleep(1000);
-  controller.window.Application.restart();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_user_restart/test2.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-/**
- * This test should pass
- */
-var testShutdownBeforeTimeout = function() {
-  controller.startUserShutdown(4000, false);
-  controller.click(new elementslib.Elem(controller.menus["file-menu"].menu_FileQuitItem));
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_user_restart/test3.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-}
-
-/**
- * This test should fail
- * (Restart expected but none detected before timeout)
- */
-var testNoExpectedRestartByTimeout = function(){
-  controller.startUserShutdown(1000, true);
-  controller.sleep(2000);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_user_restart/test4.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-}
-
-/**
- * This test should fail
- * (Restart expected but none detected before end of test)
- */
-var testNoExpectedRestartByEndTest = function(){
-  controller.startUserShutdown(1000, true);
-  controller.sleep(100);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/restart/test_user_restart/test5.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var setupModule = function () {
-  controller = mozmill.getBrowserController();
-}
-
-var teardownModule = function () {
-  controller.startUserShutdown(1000, true);
-  controller.window.Application.restart();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_assert.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-var elementslib = {};
-ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {};
-ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-var test_assert = function(){
- var controller = mozmill.getBrowserController();
- controller.open('http://www.google.com');
- controller.sleep(2000);
- controller.type(new elementslib.Name(controller.window.content.document, 'q'), 'Mozilla');
- controller.assertValue(new elementslib.Name(controller.window.content.document, 'q'), 'Mozilla');
- controller.keypress(new elementslib.Name(controller.window.content.document, 'btnG'), 13);
- controller.sleep(2000);
- controller.type(new elementslib.Name(controller.window.content.document, 'q'), 'Mozilla Summit');
- controller.click(new elementslib.Name(controller.window.content.document, 'btnG'));
- controller.sleep(2000);
-
- // chrome
- controller.assertNode(new elementslib.ID(controller.window.document, 'searchbar'));
- controller.type(new elementslib.ID(controller.window.document, 'searchbar'), 'Mozilla Summit');
- controller.assertValue(new elementslib.ID(controller.window.document, 'searchbar'), 'Mozilla Summit');
- controller.keypress(new elementslib.ID(controller.window.document, 'searchbar'), '13');
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_demo.js
+++ /dev/null
@@ -1,71 +0,0 @@
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-var controller = {};  ChromeUtils.import("chrome://mozmill/content/modules/controller.js", controller);
-
-var test_PrefsContentTab = function() {
-  // Bring up preferences controller.
-  var controller = new controller.MozMillController(mozmill.utils.getWindowByType("Browser:Preferences"));
-
-  // click on the Content prefs tab
-  controller.click(new elementslib.Elem( controller.tabs.Content.button ));
-  controller.sleep(1000);
-  // sleep for a second
-  e = new elementslib.ID(controller.window.document, 'popupPolicy')
-  controller.waitForElement(e);
-  // disable "Block popups"
-  controller.click(e);
-  controller.sleep(1000);
-  // disable "Load Images"
-  controller.click(new elementslib.ID(controller.window.document, 'loadImages'));
-  controller.sleep(1000);
-  // disable JavaScript
-  controller.click(new elementslib.ID(controller.window.document, 'enableJavaScript'));
-  controller.sleep(1000);
-  // disable Java
-  controller.click(new elementslib.ID(controller.window.document, 'enableJava'));
-  controller.sleep(1000);
-}
-
-var test_GoogleDotCom = function () {
-  // Bring up browser controller.
-  var controller = mozmill.getBrowserController();
-  controller.window.focus();
-  controller.open('http://www.google.com');
-  controller.sleep(2000);
-  controller.type(new elementslib.Name(controller.window.content.document, 'q'), 'Mozilla');
-  controller.assertValue(new elementslib.Name(controller.window.content.document, 'q'), 'Mozilla');
-  controller.sleep(2000);
-  controller.click(new elementslib.Name(controller.window.content.document, 'btnG'));
-  controller.sleep(2000);
-}
-
-var test_mozillaorg = function () {
-  // Bring up browser controller.
-  var controller = mozmill.getBrowserController();
-  controller.window.focus();
-  controller.open('http://www.mozilla.org');
-  controller.sleep(5000);
-  controller.type(new elementslib.Name(controller.window.content.document, 'q'), 'QA');
-  controller.waitForElement(new elementslib.Name(controller.window.content.document, 'q'));
-  controller.click(new elementslib.ID(controller.window.content.document, 'submit'));
-  controller.sleep(3000);
-  controller.click(new elementslib.Link(controller.window.content.document, 'Mozilla'));
-  controller.sleep(2000);
-  controller.waitForElement(new elementslib.Link(controller.window.content.document, 'Tools'));
-  controller.click(new elementslib.Link(controller.window.content.document, 'Tools'));
-  controller.waitForElement(new elementslib.ID(controller.window.content.document, 'searchInput'));
-  controller.type(new elementslib.ID(controller.window.content.document, 'searchInput'), 'MozMill');
-  controller.sleep(1000);
-  controller.click(new elementslib.Name(controller.window.content.document, 'fulltext'));
-  controller.sleep(3000);
-  controller.open('http://code.google.com/p/mozmill/');
-  controller.sleep(3000);
-  controller.waitForElement(new elementslib.Link(controller.window.content.document, 'Downloads'));
-  controller.click(new elementslib.Link(controller.window.content.document, 'Downloads'));
-  controller.sleep(3000);
-  controller.click(new elementslib.Link(controller.window.content.document, 'Source'));
-  controller.sleep(3000);
-  controller.open('http://www.mozilla.org');
-}
-
-test_mozillaorg.EXCLUDED_PLATFORMS = ['darwin'];
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_diggIterator.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-// var test_DiggIterator = function () {
-//   // Bring up browser controller.
-//   var controller = mozmill.getBrowserController();
-//   controller.open('http://www.digg.com');
-//   controller.waitForElement(new elementslib.Elem( controller.window.content.document.body ));
-//   controller.sleep(5000);
-//   var links = controller.window.content.document.getElementsByTagName('a');
-//
-//   for (var i = 0; i<links.length; i++){
-//     controller.click(new elementslib.Elem( links[i] ));
-//     controller.sleep(3000);
-//     links = controller.window.content.document.getElementsByTagName('a');
-//     controller.sleep(2000);
-//   }
-// }
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_focus.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/* * ***** 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 MozMill Test code.
- *
- * The Initial Developer of the Original Code is Mozilla Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Henrik Skupin <hskupin@mozilla.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 gDelay = 500;
-
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-}
-
-var checkKeypressFunction = function(element) {
-  element.getNode().value = "";
-
-  // controller.keypress should not focus element when window is given as element
-  controller.keypress(null, "F", {});
-  controller.sleep(gDelay);
-  controller.assertValue(element, "");
-
-  // controller.keypress should focus the element when the element itself is given as parameter
-  controller.keypress(element, "M", {});
-  controller.sleep(gDelay);
-  controller.assertValue(element, "M");
-
-  // controller.keypress should not clear formerly entered text
-  controller.keypress(element, "F", {});
-  controller.sleep(gDelay);
-  controller.assertValue(element, "MF");
-}
-
-var checkTypeFunction = function(element) {
-  element.getNode().value = "";
-
-  // controller.type should not focus element when window is given as element
-  controller.type(null, "Firefox");
-  controller.sleep(gDelay);
-  controller.assertValue(element, "");
-
-  // controller.type should focus the element when the element itself is given as parameter
-  controller.type(element, "Mozilla");
-  controller.sleep(gDelay);
-  controller.assertValue(element, "Mozilla");
-
-  // controller.type should not clear formerly entered text
-  controller.type(element, " Firefox");
-  controller.sleep(gDelay);
-  controller.assertValue(element, "Mozilla Firefox");
-}
-
-var testContentTextboxFocus = function() {
-  controller.open("http://www.mozilla.org");
-  controller.waitForPageLoad(controller.tabs.activeTab);
-
-  var searchField = new elementslib.ID(controller.tabs.activeTab, "q");
-  controller.waitForElement(searchField, 5000);
-  controller.sleep(gDelay);
-
-  checkKeypressFunction(searchField);
-  checkTypeFunction(searchField);
-}
-
-var testChromeTextboxFocus = function() {
-  var searchBar = new elementslib.ID(controller.window.document, "searchbar");
-
-  checkKeypressFunction(searchBar);
-
-  // Move focus to the location bar to blur the search bar
-  controller.keypress(null, "l", {accelKey: true});
-  checkTypeFunction(searchBar);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_git.js
+++ /dev/null
@@ -1,5 +0,0 @@
-this is a dummy test file so I can learn some git
-checking up on the workflow to make sure the wiki is right
-and one more because there is this debate on historical branch only commits.
-It's a sad day when I'm the one having to do this to settle the score.
-
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_googleIterator.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-// var test_GoogleIterator = function () {
-//   // Bring up browser controller.
-//   var controller = mozmill.getBrowserController();
-//   controller.open('http://www.google.com');
-//   controller.waitForElement(new elementslib.Elem( controller.window.content.document.body ));
-//   controller.sleep(5000);
-//   controller.type(new elementslib.Name(controller.window.content.document, 'q'), 'Mozilla');
-//   controller.click(new elementslib.Name(controller.window.content.document, 'btnG'));
-//   controller.sleep(2000);
-//   var links = controller.window.content.document.getElementsByTagName('a');
-//
-//   for (var i = 0; i<links.length; i++){
-//     controller.click(new elementslib.Elem( links[i] ));
-//     controller.sleep(5000);
-//     links = controller.window.content.document.getElementsByTagName('a');
-//     controller.sleep(2000);
-//   }
-// }
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_jum.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-
-var testFails = function() {
- jum.assert(false, "failed");
- jum.assertTrue(false, "failed");
- jum.assertFalse(true, "failed");
- jum.assertEquals(2, 3, "failed");
- jum.assertNotEquals(3, 3, "failed");
- jum.assertNull(true, "failed");
- jum.assertNotNull(null, "failed");
- jum.assertUndefined(true, "failed");
- jum.assertNotUndefined(undefined, "failed");
- jum.assertNaN(3, "failed");
- jum.assertNotNaN(NaN, "failed");
- jum.fail("failed");
-}
-
-var testPass = function() {
- jum.assert(true, "shouldn't fail");
- jum.assertTrue(true, "shouldn't fail");
- jum.assertFalse(false, "shouldn't fail");
- jum.assertEquals(3, 3, "shouldn't fail");
- jum.assertNotEquals(2, 3, "shouldn't fail");
- jum.assertNull(null, "shouldn't fail");
- jum.assertNotNull(true, "shouldn't fail");
- jum.assertUndefined(undefined, "shouldn't fail");
- jum.assertNotUndefined(true, "shouldn't fail");
- jum.assertNaN(NaN, "shouldn't fail");
- jum.assertNotNaN(true, "shouldn't fail");
- jum.pass("shouldn't fail");
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_menu.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var setupTest = function() {
-  controller = mozmill.getBrowserController();
-
-  // Create a new menu instance for the context menu
-  contextMenu = controller.getMenu("#contentAreaContextMenu");
-}
-
-var testMenuAPI = function() {
-  // Open a new tab by using the main menu
-  controller.mainMenu.click("#menu_newNavigatorTab");
-
-  controller.open("http://www.mozilla.org");
-  controller.waitForPageLoad();
-
-  // Enter text in a text field and select all via the context menu
-  var search = new elementslib.ID(controller.tabs.activeTab, "q");
-  controller.type(search, "mozmill");
-  contextMenu.select("#context-selectall", search);
-
-  // Reopen the context menu and check the 'Paste' menu item
-  contextMenu.open(search);
-  var state = contextMenu.getItem("#context-viewimage");
-  controller.assert(function() {
-    return state.getNode().hidden;
-  }, "Context menu entry 'View Image' is not visible");
-
-  // Remove the text by selecting 'Undo'
-  contextMenu.keypress("VK_DOWN", {});
-  contextMenu.keypress("VK_RETURN", {});
-  contextMenu.close();
-
-  controller.assert(function() {
-    return search.getNode().value == "";
-  }, "Text field has been emptied.");
-}
-
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_prefs.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var elementslib = {}; ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-var controller = {};  ChromeUtils.import("chrome://mozmill/content/modules/controller.js", controller);
-
-var setupModule = function(module) {
-  module.controller = new controller.MozMillController(mozmill.utils.getWindowByType("Browser:Preferences"));
-}
-
-var test_TabsTab = function() {
-  // Click on Tab tab
-  controller.click(new elementslib.Elem( controller.tabs.Tabs.button ));
-  // Warn on close
-  var warnElem = new elementslib.ID(controller.window.document, 'warnCloseMultiple');
-  controller.waitForElement(warnElem);
-  controller.click(warnElem);
-  // Warn on opening many windows
-  controller.click(new elementslib.ID(controller.window.document, 'warnOpenMany'));
-  // Show the tab bar
-  controller.click(new elementslib.ID(controller.window.document, 'showTabBar'));
-  // Switch to new Tabs
-  controller.click(new elementslib.ID(controller.window.document, 'switchToNewTabs'));
-  controller.sleep(1000);
-}
-
-var test_ContentTab = function() {
-  // Click on the proper Tab Button
-  controller.click(new elementslib.Elem( controller.tabs.Content.button ));
-  controller.sleep(1000);
-
-  // disable "Block popups"
-  controller.click(new elementslib.ID(controller.window.document, 'popupPolicy'));
-  // disable "Load Images"
-  controller.click(new elementslib.ID(controller.window.document, 'loadImages'));
-  // disable JavaScript
-  controller.click(new elementslib.ID(controller.window.document, 'enableJavaScript'));
-  // disable Java
-  controller.click(new elementslib.ID(controller.window.document, 'enableJava'));
-
-  // Set Default Font
-  // controller.click(new elementslib.ID(controller.window.document, 'defaultFont'))
-  // controller.click(new elementslib.XPATH(controller.window.document, '/prefwindow[@id='BrowserPreferences']/prefpane[@id='paneContent']/xul:vbox'))
-
-}
-
-var test_ApplicationsTab = function() {
-  e = new elementslib.Elem( controller.tabs.Applications.button );
-  controller.click(e);
-  controller.sleep(500);
-
-  // // Click on the search box
-  // var node = controller.window.document.getAnonymousElementByAttribute(
-  //    controller.window.document.getElementById('paneApplications').querySelector(
-  //     'hbox').querySelector('textbox'),
-  //     'class',
-  //     'textbox-input-box');
-  //
-  // e = new elementslib.Elem(node.childNodes[0]);
-  //
-  // controller.click(new elementslib.Elem(node.childNodes[0]));
-  // controller.sleep(1000);
-
-}
-
-var test_PrivacyTab = function() {
-  controller.click(new elementslib.Elem( controller.tabs.Privacy.button ));
-  controller.sleep(500);
-  controller.click(new elementslib.ID(controller.window.document, 'rememberHistoryDays'));
-  controller.click(new elementslib.ID(controller.window.document, 'rememberForms'));
-  controller.click(new elementslib.ID(controller.window.document, 'rememberDownloads'));
-  controller.click(new elementslib.ID(controller.window.document, 'acceptThirdParty'));
-  controller.click(new elementslib.ID(controller.window.document, 'acceptCookies'));
-  controller.click(new elementslib.ID(controller.window.document, 'alwaysClear'));
-  controller.click(new elementslib.ID(controller.window.document, 'askBeforeClear'));
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_property.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/* * ***** 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 MozMill Test code.
- *
- * The Initial Developer of the Original Code is Fidesfit.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  M.-A. Darche  (Original Author)
- *
- * 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 ***** */
-
-ChromeUtils.import("chrome://mozmill/content/modules/jum.js");
-
-var setupModule = function(module) {
-  controller = mozmill.getBrowserController();
-};
-
-var testProperty = function() {
-  var res;
-
-  var menu_item = new elementslib.ID(controller.window.document, 'file-menu');
-  controller.click(menu_item);
-
-  var new_tab_menu_item = new elementslib.ID(controller.window.document,
-                                             'menu_newNavigatorTab');
-  res = controller.assertProperty(new_tab_menu_item, 'command', 'cmd_newNavigatorTab');
-  assertEquals(true, res);
-
-  res = controller.assertProperty(new_tab_menu_item, 'command', '');
-  assertEquals(false, res);
-};
-
-var testPropertyNotEquals = function() {
-  var res;
-
-  var menu_item = new elementslib.ID(controller.window.document, 'file-menu');
-  controller.click(menu_item);
-
-  var new_tab_menu_item = new elementslib.ID(controller.window.document,
-                                             'menu_newNavigatorTab');
-  res = controller.assertPropertyNotEquals(new_tab_menu_item, 'command', 'cmd_newNavigatorTab');
-  assertEquals(false, res);
-
-  res = controller.assertPropertyNotEquals(new_tab_menu_item, 'command', '');
-  assertEquals(true, res);
-};
-
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_python_callbacks.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-
-var testPythonCallback = function() {
-  var state = "test"
-  mozmill.firePythonCallback("nowCallback", state)
-}
-
-var testPythonFail = function() {
-    mozmill.firePythonCallback("failCallback", null);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_python_callbacks_callbacks.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def nowCallback(obj):
-    assert obj == "test"
-
-def failCallback(obj):
-    assert True is False
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_radio.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Set to your local copy of shared-modules
-var prefs = require("../../mozmill-tests/shared-modules/prefs");
-
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-var testHTMLRadio = function() {
-  controller.open('http://www.google.com/cse?cx=002443141534113389537%3Aysdmevkkknw&cof=FORID%3A0&q=mozmill&x=0&y=0');
-  controller.waitForPageLoad();
-
-  var radio = new elementslib.ID(controller.tabs.activeTab, "www");
-  controller.radio(radio);
-  controller.sleep(2000);
-}
-
-var testXULRadio = function() {
-  prefs.openPreferencesDialog(controller, prefDialogCallback);
-}
-
-var prefDialogCallback = function(controller) {
-  var prefDialog = new prefs.preferencesDialog(controller);
-
-  var radio = new elementslib.ID(controller.window.document, "alwaysAsk");
-  controller.radio(radio);
-  controller.sleep(2000);
-
-  radio = new elementslib.ID(controller.window.document, "saveTo");
-  controller.radio(radio);
-  controller.sleep(2000);
-
-  prefDialog.close(true);
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_reportErrorConsole.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var setupModule = function() {
-  controller = mozmill.getBrowserController();
-}
-
-var testErrorConsole = function() {
-  controller.open("http://www.mozilla.org");
-  controller.waitForPageLoad();
-
-  var syntaxError =
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_selector.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var setupTest = function() {
-  controller = mozmill.getBrowserController();
-}
-
-var testSelector = function() {
-  controller.open('www.google.com');
-  controller.waitForPageLoad();
-
-  var elem = new elementslib.ID(controller.tabs.activeTab, "q");
-  var elemBySelector = new elementslib.Selector(controller.tabs.activeTab, "#q");
-
-  controller.assert(function() { return elem.getNode() == elemBySelector.getNode() });
-  controller.assert(function() { return elem.getNode() == elemBySelector.getNode(0) });
-}
-
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_setupmodulereporting.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var elementslib = {};
-ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elementslib);
-var mozmill = {};
-ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-var setupModule = function(){
-  controller = mozmill.getBrowserController();
-  controller.open("http://mozilla.org");
-}
-
-var setupTest = function(){
-  controller.open("http://mozilla.org");
-  controller.waitForPageLoad();
-}
-
-var testSetupModuleReporting = function() {
-  // We should have mozilla.org page open
-  var q = new elementslib.ID(controller.tabs.activeTab, "q");
-  controller.type(q, "firefox");
-
-  var btn = new elementslib.ID(controller.tabs.activeTab, "quick-search-btn");
-  controller.click(btn);
-
-  controller.waitForPageLoad();
-}
-
-var teardownTest = function(){
-  controller.open("http://www.google.com");
-  controller.waitForPageLoad();
-}
-
-var teardownModule = function(){
-  controller.open("http://www.bing.com");
-  controller.waitForPageLoad();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_something/test_parents.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-var MODULE_NAME = 'test_parent';
-
-var asdf = 'asdf'
-
-var setupModule = function (module) {
-
-}
-
-var testInParent = function () {
-
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_something/test_sub/test_deps.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-
-var RELATIVE_ROOT = '..';
-
-var MODULE_REQUIRES = ['test_parent'];
-
-var setupModule = function(module) {
-  // module.asdf = module.collector.getModule('test_parent').asdf;
-}
-
-var testDependencies = function() {
-  jum.assertEquals(test_parent.asdf, 'asdf');
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_staleelement.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var localTestFolder = collector.addHttpResource('./files/');
-
-var setupTest = function() {
-  controller = mozmill.getBrowserController();
-}
-
-var testReload = function() {
-  var testPage = localTestFolder + "singlediv.html";
-  controller.open(testPage);
-  controller.waitForPageLoad();
-
-  var elem = new elementslib.Selector(controller.tabs.activeTab, "#test-div");
-  controller.assertNode(elem);
-
-  controller.open(testPage);
-  controller.waitForPageLoad();
-
-  controller.assertNode(elem);
-}
-
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_synthesizeEvents.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var setupTest = function() {
-  controller = mozmill.getBrowserController();
-}
-
-var testExpectedEvent = function() {
-  controller.open("http://www.mozilla.com/en-US/");
-  controller.waitForPageLoad();
-
-  var search = new elementslib.ID(controller.tabs.activeTab, "query");
-  var submit = new elementslib.ID(controller.tabs.activeTab, "submit");
-
-  // Clicking the search field should raise a focus event
-  controller.click(search, 2, 2, {type: "focus"});
-
-  // Synthesize a keypress without and with an expected event
-  controller.keypress(search, "F", {});
-  controller.keypress(search, "i", {}, {type: "keypress"});
-
-  // Synthesize a keypress without and with an expected event
-  controller.type(search, "ref");
-  controller.type(search, "ox", {type: "keypress"});
-
-  // Using Cmd/Ctrl+A should fire a select event on that element
-  controller.keypress(search, "a", {accelKey: true}, {type: "keypress"});
-
-  // A focus event for the next element in the tab order should be fired
-  controller.keypress(null, "VK_TAB", {}, {type: "focus", target: submit});
-
-  // Opening the context menu shouldn't raise a click event
-  try {
-    controller.rightClick(submit, 2, 2, {type: "click", target: submit});
-    throw new Error("Opening a context menu has raised a click event.");
-  } catch (ex) {
-  }
-
-  // ... but a contextmenu event
-  controller.rightClick(submit, 2, 2, {type: "contextmenu", target: submit});
-
-  // With no event type specified we should throw an error
-  var caught = true;
-  try {
-    controller.keypress(null, "VK_TAB", {}, {target: submit});
-    caught = false;
-  } catch (ex) {}
-
-  if (!caught) {
-    throw new Error("Missing event type should cause a failure.")
-  }
-}
-
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_unit.js
+++ /dev/null
@@ -1,59 +0,0 @@
-var jum = {}; ChromeUtils.import("chrome://mozmill/content/modules/jum.js", jum);
-var mozmill = {}; ChromeUtils.import("chrome://mozmill/content/modules/mozmill.js", mozmill);
-
-
-var testAsserts = function() {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-}
-testAsserts.meta = {'litmusids':[2345678]}
-
-var testAsyncPass = new mozmill.MozMillAsyncTest();
-
-testAsyncPass.testOnePasses = function () {
-  jum.assert(true);
-  jum.assertTrue(true);
-  jum.assertFalse(false);
-  jum.assertEquals('asdf', 'asdf');
-  jum.assertNotEquals('asdf', 'fdsa');
-  jum.assertNull(null);
-  jum.assertNotNull(true);
-  jum.assertUndefined({}.asdf);
-  jum.assertNotUndefined('asdf');
-  jum.assertNaN('a');
-  jum.assertNotNaN(4);
-  jum.pass();
-  testAsyncPass.finish();
-}
-
-var testAsyncTimeout = new mozmill.MozMillAsyncTest(1000)
-
-var testNothing = {};
-
-var testNotAsserts = function() {
-  // All of these calls should fail
-  jum.assert(false);
-  jum.assertTrue(false);
-  jum.assertTrue('asf');
-  jum.assertFalse(true);
-  jum.assertFalse('asdf');
-  jum.assertEquals('asdf', 'fdsa');
-  jum.assertNotEquals('asdf', 'asdf');
-  jum.assertNull(true);
-  jum.assertNotNull(null);
-  jum.assertUndefined('asdf');
-  jum.assertNotUndefined({}.asdf);
-  jum.assertNaN(4);
-  jum.assertNotNaN('f');
-  jum.fail();
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_usershutdown.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var setupModule = function(module) {
-  module.controller = mozmill.getBrowserController();
-}
-
-/**
- * This test should pass
- */
-var testRestartBeforeTimeout = function() {
-  controller.startUserShutdown(4000, false);
-  controller.click(new elementslib.Elem(controller.menus["file-menu"].menu_FileQuitItem));
-}
deleted file mode 100644
--- a/mail/test/resources/mozmill/test/test_waitForPageLoad.js
+++ /dev/null
@@ -1,151 +0,0 @@
-var LOCATIONS = [
-  // Normal pages
-  {url : "http://www.google.de", type: "id", value : "logo"},
-  {url : "https://addons.mozilla.org/en-US/firefox/?browse=featured", type: "id", value : "search-q"},
-  {url : "http://addons.mozilla.org", type: "id", value : "search-q"},
-
-  // FTP pages
-  {url : "ftp://ftp.mozilla.org/pub/", type : "link", value : "firefox" },
-
-  // Error pages
- {url : "https://mur.at", type: "id", value : "cert_domain_link"},
- {url : "http://www.mozilla.com/firefox/its-a-trap.html", type: "id", value : "ignoreWarningButton"},
- {url : "https://mozilla.org/", type: "id", value : "getMeOutOfHereButton"}
-];
-
-
-var setupTest = function() {
-  controller = mozmill.getBrowserController();
-}
-
-var testWaitForPageLoad = function() {
-
-  /**
-   * PART I - Check different types of pages
-   */
-  for (var location of LOCATIONS) {
-    controller.open(location.url);
-    controller.waitForPageLoad();
-
-    // Check that the expected element exists
-    if (location.type) {
-      var elem = null;
-
-      switch (location.type) {
-        case "link":
-          elem = new elementslib.Link(controller.tabs.activeTab, location.value);
-          break;
-        case "name":
-          elem = new elementslib.Name(controller.tabs.activeTab, location.value);
-          break;
-        case "id":
-          elem = new elementslib.ID(controller.tabs.activeTab, location.value);
-          break;
-        default:
-      }
-
-      controller.assertNode(elem);
-    }
-  }
-
-  /**
-   * PART II - Test different parameter sets
-   */
-  var location = LOCATIONS[0];
-  for (var i = 0; i < 7; i++) {
-    controller.open(location.url);
-
-    switch (i) {
-      case 0:
-        controller.waitForPageLoad(controller.tabs.activeTab);
-        break;
-      case 1:
-        controller.waitForPageLoad(controller.tabs.activeTab, undefined, 10);
-        break;
-      case 2:
-        controller.waitForPageLoad(controller.tabs.activeTab, "invalid");
-        break;
-      case 3:
-        controller.waitForPageLoad(undefined, null, 100);
-        break;
-      case 4:
-        controller.waitForPageLoad(null, undefined, 100);
-        break;
-      case 5:
-        controller.waitForPageLoad("invalid", undefined);
-        break;
-      case 6:
-        controller.waitForPageLoad(undefined, "invalid");
-        break;
-    }
-  }
-
-  /**
-   * PART III - Check that we correctly handle timeouts for waitForPageLoad
-   */
-  try {
-    controller.open(LOCATIONS[0].url);
-    controller.waitForPageLoad(0);
-
-    throw new Error("controller.waitForPageLoad() not timed out for timeout=0.");
-  } catch (ex) {}
-
-  /**
-   * PART IV - Make sure we don't fail when clicking links on a page
-   */
-  controller.open("http://www.mozilla.org");
-  controller.waitForPageLoad();
-
-  var link = new elementslib.Link(controller.tabs.activeTab, "Get Involved");
-  controller.click(link);
-  controller.waitForPageLoad();
-
-  var target = new elementslib.Name(controller.tabs.activeTab, "area");
-  controller.waitForElement(target, 1000);
-
-  /**
-   * PART V - When waitForPageLoad is called when the page has already been loaded
-   * we shouldn't fail
-   */
-  controller.open(LOCATIONS[0].url);
-  controller.waitForPageLoad();
-  controller.waitForPageLoad(500);
-
-
-  /**
-   * PART VI - Loading a page in another tab should wait for its completion
-   */
-  controller.open(LOCATIONS[1].url);
-
-  controller.keypress(null, "t", {accelKey: true});
-  controller.open(LOCATIONS[0].url);
-
-  var firstTab = controller.tabs.getTab(0);
-  var element = new elementslib.ID(firstTab, LOCATIONS[1].value);
-  controller.waitForPageLoad(firstTab);
-  controller.assertNode(element);
-
-  /**
-   * PART VII - Loading an iFrame
-   */
-
-  // Load the container page
-  var page = collector.addHttpResource('./files/') + "iframe.html";
-  controller.open(page);
-  controller.waitForPageLoad();
-
-  // Get trigger element and the controller for the iFrame
-  var trigger = new elementslib.Selector(controller.tabs.activeTab, "#load");
-  var frame = new elementslib.Selector(controller.tabs.activeTab, "#iframe");
-  var frameWindow = frame.getNode().contentWindow;
-  var frameController = new mozmill.controller.MozMillController(frameWindow);
-
-  // Trigger the loading of the iframe from the main controller
-  controller.click(trigger);
-  controller.waitForPageLoad(frameController.window.document);
-
-  // Once the iframe has been loaded assert that the element exists
-  var home = new elementslib.Selector(frameController.window.document, "#home");
-  frameController.assertNode(home);
-}
-