diff -r 000000000000 -r 6474c204b198 dom/system/tests/marionette/test_proximity_init.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/system/tests/marionette/test_proximity_init.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,70 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 10000;
+
+function testEventInit() {
+  let initValue = 7;
+  let initMin = 1;
+  let initMax = 30;
+
+  // Test DeviceProximityEvent initialization
+  log("Verifying DeviceProximityEvent constructor.");
+  let event = new DeviceProximityEvent("deviceproximity",
+      {value: initValue, min: initMin, max: initMax});
+  is(event.type, "deviceproximity", "event type");
+  is(event.value, initValue, "value");
+  is(event.min, initMin, "min");
+  is(event.max, initMax, "max");
+  if (event.value !== initValue ||
+      event.min !== initMin ||
+      event.max !== initMax) {
+    log("DeviceProximityEvent not initialized correctly.");
+  }
+
+  // Test UserProximityEvent initialization
+  log("Verifying UserProximityEvent constructor.");
+  let event = new UserProximityEvent("userproximity", {near: true});
+  is(event.type, "userproximity", "event type");
+  ok(event.near, "Initialization of UserProximityEvent");
+  verifyDefaultStatus();
+}
+
+function verifyDefaultStatus() {
+  let emulatorDone = false;
+
+  // Ensure that device proximity is enabled by default
+  log("Getting sensor status from emulator.");
+
+  runEmulatorCmd("sensor status", function(result) {
+    log("Received sensor status (" + result[4] + ").");
+    is(result[4], "proximity: enabled.", "Proximity sensor enabled by default");
+    emulatorDone = true;
+  });
+
+  // Have this here so test doesn't drop out if emulator callback is slow
+  waitFor(getDefaultProximity, function() {
+    return(emulatorDone);
+  });
+}
+
+function getDefaultProximity() {
+  let expected = "1:0:0";
+
+  // Get and verify the default emulator proximity value
+  log("Getting device proximity from emulator.");
+
+  runEmulatorCmd("sensor get proximity", function(result) {
+    let values = result[0].split(" ")[2];
+    log("Received emulator proximity (" + values + ").");
+    is(values, "1:0:0", "Default proximity values");
+    cleanUp();
+  });
+}
+
+function cleanUp() {
+  finish();
+}
+
+// Start the test
+testEventInit();