diff -r 000000000000 -r 6474c204b198 dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,76 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 30000;
+MARIONETTE_HEAD_JS = 'head.js';
+
+let Promise =
+  SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise;
+
+// See nfc-nci.h.
+const NCI_LAST_NOTIFICATION  = 0;
+const NCI_LIMIT_NOTIFICATION = 1;
+const NCI_MORE_NOTIFICATIONS = 2;
+
+function handleTechnologyDiscoveredRE0(msg) {
+  log('Received \'nfc-manager-tech-discovered\'');
+  is(msg.type, 'techDiscovered', 'check for correct message type');
+  is(msg.techList[0], 'P2P', 'check for correct tech type');
+  toggleNFC(false, runNextTest);
+}
+
+function activateRE(re) {
+  let deferred = Promise.defer();
+  let cmd = 'nfc ntf rf_intf_activated ' + re;
+
+  emulator.run(cmd, function(result) {
+    is(result.pop(), 'OK', 'check activation of RE0');
+    deferred.resolve();
+  });
+
+  return deferred.promise;
+}
+
+function notifyDiscoverRE(re, type) {
+  let deferred = Promise.defer();
+  let cmd = 'nfc ntf rf_discover ' + re + ' ' + type;
+
+  emulator.run(cmd, function(result) {
+    is(result.pop(), 'OK', 'check discover of RE' + re);
+    deferred.resolve();
+  });
+
+  return deferred.promise;
+}
+
+function testActivateRE0() {
+  log('Running \'testActivateRE0\'');
+  window.navigator.mozSetMessageHandler(
+    'nfc-manager-tech-discovered', handleTechnologyDiscoveredRE0);
+
+  toggleNFC(true, function() {
+    activateRE(0);
+  });
+}
+
+// Check NCI Spec 5.2, this will change NCI state from
+// DISCOVERY -> W4_ALL_DISCOVERIES -> W4_HOST_SELECT -> POLL_ACTIVE
+function testRfDiscover() {
+  log('Running \'testRfDiscover\'');
+  window.navigator.mozSetMessageHandler(
+    'nfc-manager-tech-discovered', handleTechnologyDiscoveredRE0);
+
+  toggleNFC(true, function() {
+    notifyDiscoverRE(0, NCI_MORE_NOTIFICATIONS)
+    .then(() => notifyDiscoverRE(1, NCI_LAST_NOTIFICATION))
+    .then(() => activateRE(0));
+  });
+}
+
+let tests = [
+  testActivateRE0,
+  testRfDiscover
+];
+
+SpecialPowers.pushPermissions(
+  [{'type': 'nfc-manager', 'allow': true, context: document}], runTests);