From 7f5ef836aca92a5c57390320fc36fbbc16fcc4f9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 15:00:24 -0700 Subject: [PATCH 01/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c512d1a1093a Author: autolander Desc: Bug 1163215 - merge pull request #30011 from davidflanagan:bug1163215 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/56716e7ba4e4 Author: David Flanagan Desc: Bug 1163215 - switch MediaFrame back to using instead of background-image update comments to match code changes re-use a single image element and keep it hidden before the image has loaded fix the python tests remove the test for the corrupt jpeg image --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9d54d5cd8bd..ea60dccbd50 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "8897e1810aa6426ca483269af76ce2bfd2029d25", + "git_revision": "85bcb789753f9a185d6a05abb088f8f3440810d0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "de53fb4a9b7df74c088632907e3766fe24e9372a", + "revision": "c512d1a1093ac5c1dd8c678e9f9144592ba274d9", "repo_path": "integration/gaia-central" } From 640a0e837e9c84504ebe745933ed94ac17f90ddc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 15:02:36 -0700 Subject: [PATCH 02/12] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 661d849c27b..c5e508948ed 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7590ee3321f..2109a839875 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7bdbf60189e..c727134b455 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c7f7e8a445e..44c1b8f7b34 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ac73e59b45e..1d347494642 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 5a30d6e6a6a..cb54307c859 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7bdbf60189e..c727134b455 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 45d08b9ba6d..1bb36328e73 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 70d5b1d8bb2..62359d56efc 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 573a5e214e8..8bb9434c6f1 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 5cbe51d5d54fcf2da052f69f5aca3f5aea439534 Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Thu, 14 May 2015 18:51:33 -0400 Subject: [PATCH 03/12] Bug 1164525 - Ignore GAIADIR on B2G device builds, only useful for B2G desktop. r=mshal --- configure.in | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/configure.in b/configure.in index 01ff320910a..7168b9cd94b 100644 --- a/configure.in +++ b/configure.in @@ -166,24 +166,6 @@ if test -z "$PERL" -o "$PERL" = ":"; then AC_MSG_ERROR([perl not found in \$PATH]) fi -if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then - AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory]) -fi - -AC_SUBST(GAIADIR) -if test -n "$GAIADIR" ; then - AC_DEFINE(PACKAGE_GAIA) -fi - -if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then - AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined]) -fi - -if test -n "$FXOS_SIMULATOR" ; then - AC_DEFINE(FXOS_SIMULATOR) - AC_SUBST(FXOS_SIMULATOR) -fi - if test -n "$MOZTTDIR" -a ! -d "$MOZTTDIR" ; then AC_MSG_ERROR([MOZTTDIR '$MOZTTDIR' isn't a valid directory]) fi @@ -7472,6 +7454,29 @@ if test -n "$MOZ_DISABLE_STARTUPCACHE"; then fi AC_SUBST(MOZ_DISABLE_STARTUPCACHE) +dnl ======================================================== +dnl = Enable packaging Gaia with B2G desktop +dnl ======================================================== +if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then + if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then + AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory]) + fi + + AC_SUBST(GAIADIR) + if test -n "$GAIADIR" ; then + AC_DEFINE(PACKAGE_GAIA) + fi + + if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then + AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined]) + fi + + if test -n "$FXOS_SIMULATOR" ; then + AC_DEFINE(FXOS_SIMULATOR) + AC_SUBST(FXOS_SIMULATOR) + fi +fi + dnl ======================================================== dnl = Enable Radio Interface for B2G (Gonk usually) dnl ======================================================== From 879fa3ae3446e693e0fc35c8c341068453412194 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 16:05:32 -0700 Subject: [PATCH 04/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ed0799395807 Author: Zibi Braniecki Desc: Merge pull request #29971 from zbraniecki/1027684-add-subset-of-l20n-format Bug 1027684 - Add support for a subset of l20n file format. r=stas ======== https://hg.mozilla.org/integration/gaia-central/rev/593987477df2 Author: Zibi Braniecki Desc: Bug 1027684 - Add support for a subset of l20n file format --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ea60dccbd50..b49801881b7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "85bcb789753f9a185d6a05abb088f8f3440810d0", + "git_revision": "ad1ef4b324faf0e87a1cdd22d285004094cd5eb0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "c512d1a1093ac5c1dd8c678e9f9144592ba274d9", + "revision": "ed07993958071ce3a1058abc14ca494f06126470", "repo_path": "integration/gaia-central" } From 7a772face9e1148fdfd6074a1607157d80b26a87 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 16:07:46 -0700 Subject: [PATCH 05/12] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index c5e508948ed..f5525523ba7 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 2109a839875..07641a8443c 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c727134b455..58311459e77 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 44c1b8f7b34..4446241a81c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1d347494642..e5132e42e4f 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index cb54307c859..6966d2a32a9 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c727134b455..58311459e77 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 1bb36328e73..6c35ab8fba6 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 62359d56efc..452c9aaafb0 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 8bb9434c6f1..9bf8f2af48c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 410888c34c46dce43e8fd8c2d610e46c2cd5b7bc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 16:25:31 -0700 Subject: [PATCH 06/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/61dfa96d103d Author: Geo Mealer Desc: Merge pull request #30072 from geoelectric/bug-1165026 Bug 1165026 - Disable test_launch_l10n.py ======== https://hg.mozilla.org/integration/gaia-central/rev/deff5b646384 Author: Geo Mealer Desc: Bug 1165026 - Disable test_launch_l10n.py --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b49801881b7..eaa1c5fae79 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "ad1ef4b324faf0e87a1cdd22d285004094cd5eb0", + "git_revision": "960fe3776e5531c24e16eb91ee5ade22c0978919", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "ed07993958071ce3a1058abc14ca494f06126470", + "revision": "61dfa96d103dc99471aa00af33e7cd1c73dd0fd7", "repo_path": "integration/gaia-central" } From 2270f6fdb6816f204ff631cce0ca8559e7ff2e1a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 16:27:46 -0700 Subject: [PATCH 07/12] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index f5525523ba7..87a6cd00a97 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 07641a8443c..6c987d03bec 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 58311459e77..88f5d4f73b0 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4446241a81c..0802e21d722 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index e5132e42e4f..6d492a739fa 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 6966d2a32a9..6d19972bc1f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 58311459e77..88f5d4f73b0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 6c35ab8fba6..0b3746b5ded 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 452c9aaafb0..e46c283c0e5 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 9bf8f2af48c..9c515976b59 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 722aedfc69f1a4ad6df4d5364af5b0587cb2e352 Mon Sep 17 00:00:00 2001 From: Kershaw Chang Date: Wed, 13 May 2015 00:44:00 +0800 Subject: [PATCH 08/12] Bug 1162422 - Fix test cases, r=dhylands --- b2g/components/test/unit/test_logshake_gonk.js | 2 -- dom/system/gonk/nsVolumeService.cpp | 3 ++- dom/system/gonk/tests/marionette/test_fakevolume.js | 8 ++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/b2g/components/test/unit/test_logshake_gonk.js b/b2g/components/test/unit/test_logshake_gonk.js index 887d237302d..60cfddc3977 100644 --- a/b2g/components/test/unit/test_logshake_gonk.js +++ b/b2g/components/test/unit/test_logshake_gonk.js @@ -52,8 +52,6 @@ add_test(function setup_sdcard() { let vol = volumeService.getVolumeByName(volName); ok(vol, "volume shouldn't be null"); equal(volName, vol.name, "name"); - - volumeService.SetFakeVolumeState(volName, Ci.nsIVolume.STATE_MOUNTED); equal(Ci.nsIVolume.STATE_MOUNTED, vol.state, "state"); run_next_test(); diff --git a/dom/system/gonk/nsVolumeService.cpp b/dom/system/gonk/nsVolumeService.cpp index 80fa8c87145..a5a17471f76 100644 --- a/dom/system/gonk/nsVolumeService.cpp +++ b/dom/system/gonk/nsVolumeService.cpp @@ -439,7 +439,7 @@ NS_IMETHODIMP nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path) { if (XRE_GetProcessType() == GeckoProcessType_Default) { - nsRefPtr vol = new nsVolume(name, path, nsIVolume::STATE_MOUNTED, + nsRefPtr vol = new nsVolume(name, path, nsIVolume::STATE_INIT, -1 /* mountGeneration */, true /* isMediaPresent */, false /* isSharing */, @@ -448,6 +448,7 @@ nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path) false /* isUnmounting */, false /* isRemovable */, false /* isHotSwappable */); + vol->SetState(nsIVolume::STATE_MOUNTED); vol->LogState(); UpdateVolume(vol.get()); return NS_OK; diff --git a/dom/system/gonk/tests/marionette/test_fakevolume.js b/dom/system/gonk/tests/marionette/test_fakevolume.js index 5ac84d92ab2..cafc1055c42 100644 --- a/dom/system/gonk/tests/marionette/test_fakevolume.js +++ b/dom/system/gonk/tests/marionette/test_fakevolume.js @@ -18,12 +18,8 @@ ok(vol, "volume shouldn't be null"); is(volName, vol.name, "name"); is(mountPoint, vol.mountPoint, "moutnPoint"); -is(Ci.nsIVolume.STATE_INIT, vol.state, "state"); - - -let oldMountGen = vol.mountGeneration; -volumeService.SetFakeVolumeState(volName, Ci.nsIVolume.STATE_MOUNTED); is(Ci.nsIVolume.STATE_MOUNTED, vol.state, "state"); -ok(vol.mountGeneration > oldMountGen, "mount generation should be incremented"); + +ok(vol.mountGeneration > 0, "mount generation should not be zero"); finish(); From 40e065a936b929525e88f91420f1da3368c4a031 Mon Sep 17 00:00:00 2001 From: John Dai Date: Tue, 12 May 2015 00:53:00 +0800 Subject: [PATCH 09/12] Bug 1159622 - Split test_icc_contact.js into read contact and add contact. r=echen --- dom/icc/tests/marionette/manifest.ini | 3 +- dom/icc/tests/marionette/test_icc_contact.js | 85 ------------------- .../tests/marionette/test_icc_contact_add.js | 70 +++++++++++++++ .../tests/marionette/test_icc_contact_read.js | 50 +++++++++++ 4 files changed, 122 insertions(+), 86 deletions(-) delete mode 100644 dom/icc/tests/marionette/test_icc_contact.js create mode 100644 dom/icc/tests/marionette/test_icc_contact_add.js create mode 100644 dom/icc/tests/marionette/test_icc_contact_read.js diff --git a/dom/icc/tests/marionette/manifest.ini b/dom/icc/tests/marionette/manifest.ini index b500a10c4b8..572fbd3f9cb 100644 --- a/dom/icc/tests/marionette/manifest.ini +++ b/dom/icc/tests/marionette/manifest.ini @@ -3,7 +3,8 @@ b2g = true browser = false qemu = true -[test_icc_contact.js] +[test_icc_contact_read.js] +[test_icc_contact_add.js] [test_icc_card_lock_get_retry_count.js] [test_icc_card_lock_change_pin.js] [test_icc_card_lock_enable_pin.js] diff --git a/dom/icc/tests/marionette/test_icc_contact.js b/dom/icc/tests/marionette/test_icc_contact.js deleted file mode 100644 index c731bc25770..00000000000 --- a/dom/icc/tests/marionette/test_icc_contact.js +++ /dev/null @@ -1,85 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -MARIONETTE_TIMEOUT = 60000; -MARIONETTE_HEAD_JS = "head.js"; - -function testReadContacts(aIcc, aType) { - log("testReadContacts: type=" + aType); - let iccId = aIcc.iccInfo.iccid; - return aIcc.readContacts(aType) - .then((aResult) => { - is(Array.isArray(aResult), true); - - is(aResult[0].name[0], "Mozilla"); - is(aResult[0].tel[0].value, "15555218201"); - is(aResult[0].id, iccId + "1"); - - is(aResult[1].name[0], "Saßê黃"); - is(aResult[1].tel[0].value, "15555218202"); - is(aResult[1].id, iccId + "2"); - - is(aResult[2].name[0], "Fire 火"); - is(aResult[2].tel[0].value, "15555218203"); - is(aResult[2].id, iccId + "3"); - - is(aResult[3].name[0], "Huang 黃"); - is(aResult[3].tel[0].value, "15555218204"); - is(aResult[3].id, iccId + "4"); - }, (aError) => { - ok(false, "Cannot get " + aType + " contacts"); - }); -} - -function testAddContact(aIcc, aType, aPin2) { - log("testAddContact: type=" + aType + ", pin2=" + aPin2); - let contact = new mozContact({ - name: ["add"], - tel: [{value: "0912345678"}], - email:[] - }); - - return aIcc.updateContact(aType, contact, aPin2) - .then((aResult) => { - is(aResult.id, aIcc.iccInfo.iccid + "5"); - is(aResult.name[0], "add"); - is(aResult.tel[0].value, "0912345678"); - // Get ICC contact for checking new contact - return aIcc.readContacts(aType) - .then((aResult) => { - // There are 4 SIM contacts which are harded in emulator - is(aResult.length, 5); - - is(aResult[4].name[0], "add"); - is(aResult[4].tel[0].value, "0912345678"); - is(aResult[4].id, aIcc.iccInfo.iccid + "5"); - }, (aError) => { - ok(false, "Cannot get " + aType + " contacts: " + aError.name); - }) - }, (aError) => { - if (aType === "fdn" && aPin2 === undefined) { - ok(aError.name === "SimPin2", - "expected error when pin2 is not provided"); - } else { - ok(false, "Cannot add " + aType + " contact: " + aError.name); - } - }); -} - -// Start tests -startTestCommon(function() { - let icc = getMozIcc(); - - // Test read adn contacts - return testReadContacts(icc, "adn") - // Test add adn contacts - .then(() => testAddContact(icc, "adn")) - // Test read fdn contact - .then(() => testReadContacts(icc, "fdn")) - // Test add fdn contacts - .then(() => testAddContact(icc, "fdn", "0000")) - // Test add fdn contacts without passing pin2 - .then(() => testAddContact(icc, "fdn")) - // Test read sdn contacts - .then(() => testReadContacts(icc, "sdn")); -}); diff --git a/dom/icc/tests/marionette/test_icc_contact_add.js b/dom/icc/tests/marionette/test_icc_contact_add.js new file mode 100644 index 00000000000..26dd42e5afd --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_contact_add.js @@ -0,0 +1,70 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 90000; +MARIONETTE_HEAD_JS = "head.js"; + +let TEST_ADD_DATA = [{ + name: ["add"], + tel: [{value: "0912345678"}], + email:[] + }]; + +function testAddContact(aIcc, aType, aMozContact, aPin2) { + log("testAddContact: type=" + aType + ", pin2=" + aPin2); + let contact = new mozContact(aMozContact); + + return aIcc.updateContact(aType, contact, aPin2) + .then((aResult) => { + is(aResult.name[0], aMozContact.name[0]); + is(aResult.tel[0].value, aMozContact.tel[0].value); + + // Get ICC contact for checking new contact + return aIcc.readContacts(aType) + .then((aResult) => { + let contact = aResult[aResult.length - 1]; + + is(contact.name[0], aMozContact.name[0]); + is(contact.tel[0].value, aMozContact.tel[0].value); + is(contact.id, aIcc.iccInfo.iccid + aResult.length); + + return contact.id; + }) + .then((aContactId) => { + // Clean up contact + return removeContact(aIcc, aContactId, aType, aPin2); + }); + }, (aError) => { + if (aType === "fdn" && aPin2 === undefined) { + ok(aError.name === "SimPin2", + "expected error when pin2 is not provided"); + } else { + ok(false, "Cannot add " + aType + " contact: " + aError.name); + } + }) +} + +function removeContact(aIcc, aContactId, aType, aPin2) { + log("removeContact: contactId=" + aContactId + + ", type=" + aType + ", pin2=" + aPin2); + + let contact = new mozContact({}); + contact.id = aIcc.iccInfo.iccid + aContactId; + + return aIcc.updateContact(aType, contact, aPin2); +} + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + + for (let i = 0; i < TEST_ADD_DATA.length; i++) { + let test_data = TEST_ADD_DATA[i]; + // Test add adn contacts + return testAddContact(icc, "adn", test_data) + // Test add fdn contacts + .then(() => testAddContact(icc, "fdn", test_data, "0000")) + // Test add fdn contacts without passing pin2 + .then(() => testAddContact(icc, "fdn", test_data)); + } +}); diff --git a/dom/icc/tests/marionette/test_icc_contact_read.js b/dom/icc/tests/marionette/test_icc_contact_read.js new file mode 100644 index 00000000000..bb7025ea186 --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_contact_read.js @@ -0,0 +1,50 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +function testReadContacts(aIcc, aType) { + log("testReadContacts: type=" + aType); + let iccId = aIcc.iccInfo.iccid; + return aIcc.readContacts(aType) + .then((aResult) => { + is(Array.isArray(aResult), true); + is(aResult.length, 4, "Check contact number."); + + // Alpha Id(Encoded with GSM 8 bit): "Mozilla", Dialling Number: 15555218201 + is(aResult[0].name[0], "Mozilla"); + is(aResult[0].tel[0].value, "15555218201"); + is(aResult[0].id, iccId + "1"); + + // Alpha Id(Encoded with UCS2 0x80: "Saßê\u9ec3", Dialling Number: 15555218202 + is(aResult[1].name[0], "Saßê黃"); + is(aResult[1].tel[0].value, "15555218202"); + is(aResult[1].id, iccId + "2"); + + // Alpha Id(Encoded with UCS2 0x81): "Fire \u706b", Dialling Number: 15555218203 + is(aResult[2].name[0], "Fire 火"); + is(aResult[2].tel[0].value, "15555218203"); + is(aResult[2].id, iccId + "3"); + + // Alpha Id(Encoded with UCS2 0x82): "Huang \u9ec3", Dialling Number: 15555218204 + is(aResult[3].name[0], "Huang 黃"); + is(aResult[3].tel[0].value, "15555218204"); + is(aResult[3].id, iccId + "4"); + }, (aError) => { + ok(false, "Cannot get " + aType + " contacts"); + }); +} + + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + + // Test read adn contacts + return testReadContacts(icc, "adn") + // Test read fdn contact + .then(() => testReadContacts(icc, "fdn")) + // Test read sdn contacts + .then(() => testReadContacts(icc, "sdn")); +}); From 1654124a6a7ffe321e152d2934095bd478a91fb8 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 7 May 2015 17:35:34 +0800 Subject: [PATCH 10/12] Bug 1162407 - Increase timeout value of test_replace_short_message_type.js. r=bevis --- .../tests/marionette/test_replace_short_message_type.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js b/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js index b5c6ce512bb..37eaea2b79e 100644 --- a/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js +++ b/dom/mobilemessage/tests/marionette/test_replace_short_message_type.js @@ -1,7 +1,7 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ -MARIONETTE_TIMEOUT = 120000; +MARIONETTE_TIMEOUT = 240000; MARIONETTE_HEAD_JS = 'head.js'; const PDU_SMSC_NONE = "00"; // no SMSC Address From 042934ee5e1cac0cb18aed61efb3a0ac992b1cb9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 20:50:07 -0700 Subject: [PATCH 11/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7fbbf5649868 Author: Sam Foster Desc: Merge pull request #30070 from sfoster/net-error-bidi-bug-1160080 Bug 1160080 - Add isolation characters around URLs in net error msgs. r=fabrice ======== https://hg.mozilla.org/integration/gaia-central/rev/4f795459b3de Author: Sam Foster Desc: Bug 1160080 - Add isolation characters around URLs in net error msgs --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index eaa1c5fae79..7747d4d119f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "960fe3776e5531c24e16eb91ee5ade22c0978919", + "git_revision": "27f6760ceb0c8897bd21461e8b91136d7efff2a1", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "61dfa96d103dc99471aa00af33e7cd1c73dd0fd7", + "revision": "7fbbf564986896c9cf3a1e8d59b49e3eb6d7f7ef", "repo_path": "integration/gaia-central" } From ccdadd113595549051544fa88d5913d393cd82a5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 May 2015 20:52:20 -0700 Subject: [PATCH 12/12] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 87a6cd00a97..11668f8f1e2 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 6c987d03bec..aab2ff30dd5 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 88f5d4f73b0..5f5f27a517c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0802e21d722..8ccd17907c1 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 6d492a739fa..44bc6b22f62 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 6d19972bc1f..047522a30fe 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 88f5d4f73b0..5f5f27a517c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 0b3746b5ded..097629fb0e9 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e46c283c0e5..513af75573d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 9c515976b59..a7d419479c3 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +