Commit Graph

244 Commits

Author SHA1 Message Date
Yoshi Huang
0509d7fc28 Bug 1054119 - B2G NFC: Don't process data from nfcd if error. r=dimi 2014-08-13 18:12:27 +08:00
Ed Morley
035a32e441 Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-08-15 16:54:17 +01:00
Yoshi Huang
28a952bc1e Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi 2014-08-15 10:04:51 +08:00
Yoshi Huang
e1a9da9bc9 Bug 1053116 - Part 1: update error code in nfc_consts.js. r=dimi 2014-08-15 10:02:01 +08:00
Yoshi Huang
842919f59f Bug 1046554 - Part 2: update marionette tests. r=dimi
From d7dafea4dcff00edbe40ee0880ca71b804893622 Mon Sep 17 00:00:00 2001
---
 .../tests/marionette/test_nfc_error_messages.js    | 43 +---------------------
 dom/nfc/tests/marionette/test_nfc_peer.js          | 20 ++++++++--
 2 files changed, 17 insertions(+), 46 deletions(-)
2014-08-11 17:03:52 +08:00
Yoshi Huang
edd56e7140 Bug 1046554 - Part 1: B2G NFC: pass NFCPeerEvent in onpeerready. r=smaug, dimi 2014-07-31 17:11:04 +08:00
Ed Morley
521f761cdc Backed out changeset 52fc270e59ad (bug 1051754) for intermittent test failures 2014-08-14 17:40:04 +01:00
Garner Lee
0a860d51b6 Bug 1050577: [NFC] Techlost not clearing peer appId correctly. r=allstars.chh 2014-08-11 16:03:35 -07:00
Yoshi Huang
1ac3575c20 Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi 2014-08-12 17:04:51 +08:00
Yoshi Huang
0dc3c5353f Bug 1051754 - B2G NFC: Add marionette test for peer.sendFile. r=dimi
From 3cfb06874b6e838ad76e1817c7b69df81e0f802b Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/head.js                   | 20 +++++++--
 dom/nfc/tests/marionette/manifest.ini              |  1 +
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js | 49 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
2014-08-11 18:26:52 +08:00
Yoshi Huang
6cfcdfece5 Bug 1051738 - B2G NFC: typo in getNFCPeer. r=dimi
From bea6af520beedcc4547ce5c45c4d78faa63d5812 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-08-11 17:19:11 +08:00
Yoshi Huang
60a04de4e4 Bug 1049351 - [NFC] fix testPeerShouldThrow. r=dimi 2014-08-11 15:45:35 +08:00
Yoshi Huang
9402e01151 Bug 1050692 - [NFC] B2G NFC: peer.sendNDEF always return Bad Session ID. r=dimi 2014-08-08 17:22:28 +08:00
Krzysztof Mioduszewski
919659bc81 Bug 1042651 - B2G NFC: getNFCPeer and getNFCTag should not throw error. r=smaug, r=allstars.chh, a=me 2014-08-05 05:06:00 -04:00
Ed Morley
198048c887 Backed out changeset b2ef6a444640 (bug 1046554) since the gaia part has been reverted 2014-08-06 16:58:31 +01:00
Yoshi Huang
ec650f765a Bug 1046554 - B2G NFC: pass NFCPeerEvent in onpeerready. r=smaug, dimi 2014-07-31 17:11:04 +08:00
Yoshi Huang
ca89d4484d Bug 933141 - Move NFC files out of system/gonk. r=gps, dimi
--HG--
rename : dom/system/gonk/NfcContentHelper.js => dom/nfc/NfcContentHelper.js
rename : dom/system/gonk/Nfc.js => dom/nfc/gonk/Nfc.js
rename : dom/system/gonk/Nfc.manifest => dom/nfc/gonk/Nfc.manifest
rename : dom/system/gonk/NfcGonkMessage.h => dom/nfc/gonk/NfcGonkMessage.h
rename : dom/system/gonk/NfcMessageHandler.cpp => dom/nfc/gonk/NfcMessageHandler.cpp
rename : dom/system/gonk/NfcMessageHandler.h => dom/nfc/gonk/NfcMessageHandler.h
rename : dom/system/gonk/NfcOptions.h => dom/nfc/gonk/NfcOptions.h
rename : dom/system/gonk/NfcService.cpp => dom/nfc/gonk/NfcService.cpp
rename : dom/system/gonk/NfcService.h => dom/nfc/gonk/NfcService.h
rename : dom/system/gonk/nfc_consts.js => dom/nfc/gonk/nfc_consts.js
rename : dom/system/gonk/nsINfcService.idl => dom/nfc/gonk/nsINfcService.idl
rename : dom/system/gonk/nsINfcContentHelper.idl => dom/nfc/nsINfcContentHelper.idl
2014-08-01 17:23:14 +08:00
Yoshi Huang
aa5bb45b05 Bug 1043186 - Part 4: Add throw in MozNFCPeer. r=smaug, dimi 2014-07-29 11:36:58 +08:00
Yoshi Huang
7bb1472b96 Bug 1043186 - Part 3: return cached NFCPeer if session matches. 2014-07-25 18:03:37 +08:00
Yoshi Huang
52a632b0c0 Bug 1043186 - Part 2: onpeerlost should be fired to correct target. r=dimi 2014-07-24 18:11:42 +08:00
Yoshi Huang
711dee2366 Bug 1043186 - Part 1: Add a nsINfcPeerEventListener. r=dimi 2014-07-24 12:16:02 +08:00
Yoshi Huang
1e40f67efe Bug 933588 - Part 3: update test cases. r=dimi 2014-07-14 18:57:12 +08:00
Yoshi Huang
2bf4fe0214 Bug 1038617 - B2G NFC: can't access dead object thrown from nsNfc.js. r=smaug 2014-07-21 15:43:45 +08:00
Ms2ger
d9e695483d Bug 1043963 - Collapse test-only moz.build files under dom/ into ancestor moz.build files; r=ted
There is very little benefit to having another layer of moz.build files, and
removing them will speed up the build a minimal amount. It also paves the way
for removing TEST_DIRS, which could simplify the build system somewhat.
2014-07-26 08:17:24 +02:00
Mike Hommey
9ae3c48776 Bug 1041860 - Avoid setting FINAL_LIBRARY to libraries that further use a FINAL_LIBRARY. r=mshal 2014-07-23 08:37:51 +09:00
Dimi Lee
c726fe8a67 Bug 1040619 - [NFC] javascript error "emulator.activateRE is not a function" when run NFC testcase. r=allstars.chh 2014-07-18 15:22:46 +08:00
Thomas Zimmermann
160a24ce35 Bug 1034660 - Exchange NDEF's PAYLOAD and ID fields in emulator interface. r=dlee
The emulator used PAYLOAD and ID fields of NDEF records in an incorrect
order. The fix makes the command-line interface incompatible with the
current test cases. This patch adapts the test cases by putting ID before
PAYLOAD.
2014-07-09 06:27:00 -04:00
Dimi Lee
6733826c58 Bug 1035606 - [NFC] Testcase cleanup. r=tzimmermann 2014-07-10 11:33:10 +08:00
Krzysztof Mioduszewski
e3e2122db0 Bug 1033218 - [NFC] use emulator command triggering tech-lost. r=allstars.chh 2014-07-07 20:40:01 +02:00
Dimi Lee
00f9cabf17 Bug 997576 - [NFC] Testcase for reading empty NFC tag. r=tzimmermann 2014-07-08 11:56:57 +08:00
Yoshi Huang
4a52796740 Bug 1034474 - B2G NFC: onpeerlost is never called. r=dimi
From 6342cf34f7493711317b613a8e30ef6badabcfd1 Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/test_nfc_peer.js | 10 +++++++++-
 dom/system/gonk/Nfc.js                    |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)
2014-07-07 11:56:29 +08:00
Dimi Lee
db7eee2ec6 Bug 1035041 - [NFC] Add lost head.js for testcase. r=tzimmermann 2014-07-07 10:44:29 +08:00
Dimi Lee
49fa679042 Bug 1023079 - [NFC]Testcae for triggering tech-lost. r=tzimmermann 2014-07-04 10:21:18 +08:00
Dimi Lee
38d8da26a1 Bug 1028037 - NFC testcase failure with error message 'Accessing TypedArray data over Xrays is slow'. r=bholley 2014-07-03 14:55:13 +08:00
Dimi Lee
4a8bbee469 Bug 1027479 - Testcase for reading NDEF data from type 4 tag. r=tzimmermann 2014-07-02 14:23:02 +08:00
Dimi Lee
cb06ef8c86 Bug 1023683 - Testcase for reading NDEF data from type 3 tag. r=tzimmermann 2014-07-01 14:44:39 +08:00
Dimi Lee
86c99290c8 Bug 1028046 - NFC testcase failure with error message "setTagData undefined". r=yoshi 2014-06-20 16:41:07 +08:00
Thomas Zimmermann
6040a728de Bug 980851 - Add Marionette test case for receiving NDEF message on P2P mode. r=dlee
This patch adds a test for receiving an NDEF message in P2P mode. The
content of the message is known beforehand and validated against
the reference message.
2014-06-17 03:52:00 -04:00
Thomas Zimmermann
9bdfc43b80 Bug 980851 - Move NFC emulator helpers to head.js. r=dlee
The functions |activateRE|, |notifyDiscoverRE|, and |setTagData| are
of general usefulness. They are now defined in the object |emulator|.
Callers have been adapted.
2014-06-10 02:21:00 -04:00
Carsten "Tomcat" Book
b96ca5789c merge b2g-inbound to mozilla-central a=merge 2014-06-17 14:23:57 +02:00
Ben Kelly
bf1b5506d6 Bug 1025973 - Part 1: Rename GlobalObject::GetContext() to Context(). r=bz 2014-06-16 14:08:00 -04:00
Krzysztof Mioduszewski
4f20de83d7 Bug 1019668 - Part 2: Re-enable missing marionette tests (error_messages, checkP2PRegistartion). r=allstars.chh 2014-06-09 05:34:00 -04:00
Krzysztof Mioduszewski
03aae793a2 Bug 1019668 - Part 1: Don't add errorMsg if the status property is undefined. r=allstars.chh 2014-06-16 07:54:00 -04:00
Boris Zbarsky
b6c8784504 Bug 1009675 part 3. Return WebIDL 'object' values as handles. r=peterv 2014-06-11 16:26:52 -04:00
Gijs Kruitbosch
2ed6ea2cec Bug 1022003 - remove ObjectWrapper.jsm, r=bholley,gwagner
--HG--
extra : rebase_source : cdafaf22aaddbb04519a9bc1099b6a10f7b6c886
2014-06-10 16:15:42 +01:00
Ed Morley
05d48599a0 Backed out changeset 3e7908638c2a (bug 1019668) for timeouts during test_nfc_error_messages.js 2014-06-10 13:03:57 +01:00
Ed Morley
48e16ec9d9 Backed out changeset 9d7ae79baf16 (bug 1019668) 2014-06-10 13:03:39 +01:00
Dimi Lee
e7d73c4901 Bug 1016777 - Testcase for reading NDEF data from type 1 tag.
From 4bd160a590ab40916b83eeb48eba7dca0b3f7313 Mon Sep 17 00:00:00 2001
 r=tzimmermann
---
 dom/nfc/tests/marionette/test_nfc_tag.js |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
2014-06-10 08:52:20 +02:00
Krzysztof Mioduszewski
13c1c25018 Bug 1019668 - Part 2: Reenabling missing marionette tests (error_messages, checkP2PRegistartion), r=allstars.chh 2014-06-09 14:21:53 +02:00
Krzysztof Mioduszewski
b00dcc5c80 Bug 1019668 - Part 1: Not adding errorMsg if status property undefined, test cases for changes, r=allstars.chh 2014-06-05 18:53:45 +02:00
Krzysztof Mioduszewski
b054fc6881 Bug 1019436 - NFC: Assertion failed: (rfst != NUMBER_OF_NFC_RFSTS), function nfc_create_rf_discovery_ntf, r=dlee 2014-06-09 11:49:12 +02:00
Krzysztof Mioduszewski
e23c22fb4b Bug 1022534 - [NFC] Fix marionette web-api test test_nfc_tag.js to use Promise in toggleNFC, r=allstars.chh 2014-06-09 11:25:40 +02:00
Dimi Lee
77d3522b28 Bug 1018068 - [NFC] NFC sharing does not work. r=Waldo 2014-06-03 19:05:46 +08:00
Siddartha Pothapragada
79e6ecc187 Bug 976402 - Part 2 - Throw an error when sessionToken is incorrect while using the interfaces getNFCTag() and getNFCPeer(). r=smaug 2014-05-27 15:12:00 +02:00
Siddartha Pothapragada
58e8f1385f Bug 976402 - Part 3 - Add marionette test case to validate access to MozNfcPeer interface with invalid sessionToken. r=allstars.chh 2014-05-27 11:17:00 +02:00
Dimi Lee
96c7e22b01 Bug 993836 - Testcase for reading NDEF data from type 2 tag. r=tzimmermann 2014-05-27 14:53:45 +08:00
Krzysztof Mioduszewski
ef50a9e004 Bug 1012620 - [NFC] toggleNFC in Marionette tests should use Promise. r=allstars.chh 2014-05-26 17:02:24 +02:00
Krzysztof Mioduszewski
cc438b55c8 Bug 933595 - Part 3: Marionette tests - error messages, mozNfc.checkP2PRegistration. r=allstars.chh 2014-05-23 09:04:40 +02:00
Krzysztof Mioduszewski
fb2871d672 Bug 933595 - Part 2: Adding promise to toggleNFC, adding enableRE0. r=allstars.chh 2014-05-22 16:33:45 +02:00
Thomas Zimmermann
7c2d2b9c76 Bug 1008854: Move NFC NDEF helpers to shared test code, r=dlee
There are helper functions for parsing and comparing NDEF messages
in test_nfc_peer_sendndef.js. This patch moves these functions to
the shared code for NFC Marionette tests to make them available for
other tests as well.
2014-05-12 11:45:04 +02:00
Thomas Zimmermann
4f7b9c969f Bug 1000935: Added Marionette test for NfcPeer.sendNDEF, r=dlee 2014-05-12 15:19:13 +08:00
Thomas Zimmermann
a8af4d8d4a Bug 1000935: Added NDEF helpers for NFC test cases. r=vicamo 2014-05-12 15:19:08 +08:00
Siddartha Pothapragada
bfd4a608b9 Bug 996426 - Re-enable nfc marionette test cases that talk to emulator. r=vicamo 2014-05-08 21:08:55 +08:00
Siddartha Pothapragada
24f307bdc4 Bug 996426 - Rename emulator command in marionette tests from 'nfc ntf' to 'nfc nci'. r=tzimmermann,vicamo
This change also disables nfc marionette testcases  that talk to the emulator.
2014-05-07 10:37:09 +08:00
Siddartha Pothapragada
126c15aded Bug 959059 - B2G NFC: Marionette test to check P2P registration for an incorrect manifest Url. r=allstars.chh 2014-04-30 10:17:00 +02:00
Yoshi Huang
daeede27f6 Bug 987596 - B2G NFC: Marionette tests for onpeerready. r=dimi
From bfece1daa040d5e7e4ff965adea343831b2484c4 Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/head.js                   |  5 +-
 dom/nfc/tests/marionette/manifest.ini              |  1 +
 dom/nfc/tests/marionette/test_nfc_enabled.js       |  1 -
 .../marionette/test_nfc_manager_tech_discovered.js |  5 +-
 dom/nfc/tests/marionette/test_nfc_peer.js          | 64 ++++++++++++++++++++++
 5 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 dom/nfc/tests/marionette/test_nfc_peer.js
2014-04-25 19:22:09 +08:00
Dimi Lee
0d1d424bd1 Bug 996452 - [NFC] Add emulator rf_discover test case. r=tzimmermann 2014-04-23 18:32:02 +08:00
"allstars.chh"
645bb20e92 Bug 970263 - B2G NFC: Enable NFC when running NFC marionette tests. r=dimi 2014-04-15 17:19:14 +08:00
"allstars.chh"
e214d09d1c Bug 970251 - Part 3: Marionette tests. r=dimi 2014-04-15 16:21:49 +08:00
"allstars.chh"
81aaa2bb6b Bug 970251 - Part 2: Impl. r=dimi
From e1c730487df90a5edfe416be9b9219da02652be3 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js                        |   17 +++++++++--
 dom/system/gonk/Nfc.js                  |   35 ++++++++++++++++++++--
 dom/system/gonk/NfcContentHelper.js     |   48 ++++++++++++++++++++++++++++++-
 dom/system/gonk/nsINfcContentHelper.idl |   17 ++++++++++-
 4 files changed, 111 insertions(+), 6 deletions(-)
2014-04-15 14:47:42 +08:00
Siddartha Pothapragada
be6be08fef Bug 964693 - Do not perform slice on blob as slice does not retain metadata 'file'. r=smaug 2014-04-09 16:38:53 -07:00
Boris Zbarsky
fdbb455d4f Bug 991742 part 8. Remove the "aScope" argument of WebIDL/nsWrapperCache WrapObject() methods. r=bholley
This patch was mostly generated with the following command:

find . -name "*.h" -o -name "*.cpp" | xargs sed -e '/WrapObject(JSContext/ {; N; s/\(WrapObject(JSContext *\* *a\{0,1\}[Cc]x\),\n\{0,1\} *JS::Handle<JSObject\*> a\{0,1\}[sS]cope/\1/ ; }' -i ""

and then reverting the changes that made to
dom/bindings/BindingUtils.h, since those WrapObject methods are not
the ones we're trying to change here, plus a bunch of manual fixups
for cases that this command did not catch (including all the callsites
of WrapObject()).
2014-04-08 18:27:18 -04:00
Boris Zbarsky
3f26a82832 Bug 991742 part 6. Remove the "aScope" argument of binding Wrap() methods. r=bholley
This patch was mostly generated with this command:

find . -name "*.h" -o -name "*.cpp" | xargs sed -e 's/Binding::Wrap(aCx, aScope, this/Binding::Wrap(aCx, this/' -e 's/Binding_workers::Wrap(aCx, aScope, this/Binding_workers::Wrap(aCx, this/' -e 's/Binding::Wrap(cx, scope, this/Binding::Wrap(cx, this/' -i ""

plus a few manual fixes to dom/bindings/Codegen.py, js/xpconnect/src/event_impl_gen.py, and a few C++ files that were not caught in the search-and-replace above.
2014-04-08 18:27:17 -04:00
"allstars.chh"
5e729db875 Bug 960510 - Part 2: marionette test for MozNDEFRecord. r=dimi, kyle 2014-02-17 11:10:26 +08:00
"allstars.chh"
79d040c848 Bug 960510 - Part 1: Make type, id and payload optional. r=khuey
From 4ac0853ddabfadb99bfcd037d3831904d8353fbf Mon Sep 17 00:00:00 2001
---
 dom/nfc/MozNDEFRecord.cpp       |   26 +++++++++++++++++++-------
 dom/nfc/MozNDEFRecord.h         |   36 +++++++++++++++++++++++++-----------
 dom/webidl/MozNDEFRecord.webidl |    8 ++++----
 3 files changed, 48 insertions(+), 22 deletions(-)
2014-02-20 15:08:46 +08:00
Thomas Zimmermann
c4ab7fd29f Bug 935525: Added Marionette test for nfc-manager-tech-discovered, r=vyang 2013-11-13 13:23:20 +01:00
Thomas Zimmermann
2806eb0236 Bug 935525: Added Marionette test for turning NFC on and off, r=vyang 2013-11-06 13:00:25 +01:00
Thomas Zimmermann
bcb63bfab0 Bug 935525: Added NFC test infrastructure to build scripts, r=vyang,jgriffin 2013-11-06 12:59:41 +01:00
Kyle Huey (khuey@mozilla.com)
00d7e1bef1 Bug 968742 - B2G NFC: Assertion failure: !aGCThing. r=allstars.chh 2014-02-12 17:21:09 +08:00
Garner Lee
cec673c139 Bug 964186 - Rename MozNdefRecord to MozNDEFRecord. r=smaug, sr=sicking
--HG--
rename : dom/nfc/MozNdefRecord.cpp => dom/nfc/MozNDEFRecord.cpp
rename : dom/nfc/MozNdefRecord.h => dom/nfc/MozNDEFRecord.h
rename : dom/webidl/MozNdefRecord.webidl => dom/webidl/MozNDEFRecord.webidl
2014-01-28 16:20:17 -08:00
Vicamo Yang
cc52c6715d Bug 968063: fix missed right parenthesis in nsNfc.js. r=fabrice 2014-02-06 10:35:32 +08:00
Fabrice Desré
157c7c94a9 Bug 966502 - Use Cu.cloneInto() instead of ObjectWrapper.jsm r=baku 2014-02-01 11:06:59 -08:00
Siddartha Pothapragada
c7e1b29ca1 Bug 959437 - Part 1: Add new interfaces 'notifyUserAcceptedP2P' and 'notifySendFileStatus' to MozNfcManager DOM. r+sr=smaug 2014-01-17 18:38:26 -08:00
Siddartha Pothapragada
c7a6cbbbe3 Bug 933093 - Part 1: Add 'sendFile' interface to MozNFCPeer. r=khuey, sr=smaug 2013-12-13 23:24:02 -08:00
Dimi Lee
4f76f0a722 Bug 947100 - B2G NFC: enable/disable NFC worker at runtime. r=yoshi 2013-12-11 14:04:27 +08:00
Arno Puder
b44a60b2e2 Bug 933585 - C++ implementation for WebIDL. r=khuey 2013-11-08 15:10:23 -08:00
Siddartha Pothapragada
a47318a090 Bug 933136 - Part 1: Add Nfc DOM event handlers 'onpeerready' and 'onpeerlost'. r=khuey, sr=smaug
Add new interface 'checkP2PRegistration' to MozNfc and two 'ChromeOnly' interfaces 'eventListenerWasAdded' 'eventListenerWasRemoved' to support basic PeerToPeer use cases.

--HG--
extra : rebase_source : 43f0021b85624d87fdcb5e9445c976bb6efb9219
2013-11-24 20:40:39 -08:00
Mike Hommey
931cb49886 Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps
Landing on a CLOSED TREE.
2013-11-19 11:50:54 +09:00
Mike Hommey
db9e5129bc Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps 2013-11-19 11:48:10 +09:00
Mike Hommey
f0d1cd1e10 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Mike Hommey
f81885e53b Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps 2013-11-19 11:47:14 +09:00
Garner Lee
28ef93aa8d Bug 674741 - Part 6: NFC Build System Changes. r=khuey
--HG--
extra : rebase_source : 259fbadf1e2dad187d2704a34ec94f883c25baeb
2013-11-12 10:11:39 -08:00
Garner Lee
a496280190 Bug 674741 - Part 3: NFC DOM Implementation. r=khuey
--HG--
extra : rebase_source : 8244ade575bebd2026cc9bd4d350b91acfcbbf41
2013-11-06 09:53:19 -08:00
Bobby Holley
30602c16ab Bug 1052052 - Hoist Auto*JSContext into nsContentUtils and kill nsCxPusher.{cpp,h}. r=gabor 2014-08-14 18:47:15 -07:00