1120805 - [B2G][RIL] Remove deprecated xpcshell test functions used in RIL test code

Status: RESOLVED FIXED

(Firefox OS Graveyard :: RIL, defect)

Description

[John Dai[:jdai]]

Base on [1], many of xpcshell test case assertions are deprecated since Gecko 32.0. We need to rename all of them.


[1] https://developer.mozilla.org/en-US/docs/Mozilla/QA/Writing_xpcshell-based_unit_tests

Comment 1

[John Dai[:jdai]]

Attachment: Remove deprecated xpcshell test functions used in RIL test code.(V1)

Comment 2

[John Dai[:jdai]]

Attachment: Remove deprecated xpcshell test functions used in RIL test code.(V2)

Remove some modified code which are unintended to be.

Comment 3

[Edgar Chen [:edgar]]

Comment on attachment 8551650 [details] [diff] [review]
Remove deprecated xpcshell test functions used in RIL test code.(V2)

Review of attachment 8551650 [details] [diff] [review]:
-----------------------------------------------------------------

Sorry for the late review, I was busy in other things with higher priority.
Please see my comments below, thank you.

`do_throws` is also deprecated [1], please also help to replace it by [2].
And I got conflict when applying this patch into latest m-c, please help to provide a rebased version.

[1] https://dxr.mozilla.org/mozilla-central/source/dom/system/gonk/tests/header_helpers.js#218-219,223-224
[2] https://dxr.mozilla.org/mozilla-central/source/testing/modules/Assert.jsm#411-448

::: dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js
@@ +1346,5 @@
>      recordHelper.readCphsInfo(() => { onsuccess = true; },
>                                () => { onerror = true; });
>  
> +    ok((cphsSt) ? onsuccess : onerror);
> +    ok(!(cphsSt) ? onerror : onsuccess);

Should this be `ok(!((cphsSt) ? onerror : onsuccess));`?

Comment 4

[John Dai[:jdai]]

Attachment: Remove deprecated xpcshell test functions used in RIL test code.(V3)

1. Updating relative testcase to address comment 3.
2. Providing a rebased version patch to the latest m-c.

Comment 5

[Edgar Chen [:edgar]]

Comment on attachment 8561802 [details] [diff] [review]
Remove deprecated xpcshell test functions used in RIL test code.(V3)

Review of attachment 8561802 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with comments addressed, thank you.

::: dom/system/gonk/tests/test_ril_worker_buf.js
@@ +56,5 @@
>        self.context.Buf.readInt32();
> +    } catch (e) {
> +      ex = e;
> +    }
> +    ok(!ex);

try {
  ....
} catch (e) {
  ok(false, "Got exception: " + e);
}

@@ +71,5 @@
>        self.context.Buf.readUint16();
> +    } catch (e) {
> +      ex = e;
> +    }
> +    ok(!ex);

Ditto

@@ -77,5 @@
>      while (buf.readAvailable > 0) {
>        buf.readUint8();
>      }
>  
> -    do_check_throws(function over_read_handler() {

Please also removes the `do_check_throws()` defined in header_helpers.js.

Comment 6

[John Dai[:jdai]]

Thanks Edgar!
Try looks good: https://treeherder.mozilla.org/#/jobs?repo=try&revision=fc9280ffcc63

Comment 7

[John Dai[:jdai]]

Attachment: Remove deprecated xpcshell test functions used in RIL test code.(Final), r=echen

Comment 8

[Edgar Chen [:edgar]]

b2g-inbound is closed now, I will try pushing later.

Comment 9

[Edgar Chen [:edgar]]

https://hg.mozilla.org/integration/b2g-inbound/rev/f42a62ac4fcc

Comment 10

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/f42a62ac4fcc