1224478 - Replace do_check_* calls with their Assert.jsm equivalents in PSM xpcshell tests

Status: RESOLVED FIXED

(Core :: Security: PSM, defect)

Description

[:Cykesiopka]

The do_check_* methods have been deprecated for a while: https://developer.mozilla.org/en-US/docs/Mozilla/QA/Writing_xpcshell-based_unit_tests#Assertions_and_logging

Moreover, all the do_check_* methods do now is call the equivalent Assert.jsm methods: https://hg.mozilla.org/mozilla-central/annotate/397c69fa1677/testing/xpcshell/head.js#l863

There's no need for this indirection.

Comment 1

[:Cykesiopka]

Attachment: MozReview Request: Bug 1224478 - Replace do_check_* calls with their Assert.jsm equivalents in PSM xpcshell tests.

Bug 1224478 - Replace do_check_* calls with their Assert.jsm equivalents in PSM xpcshell tests.

Also replaces if-do_throw() blocks with equivalent Assert.jsm method calls.

Comment 2

[:Cykesiopka]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=2dc18de3fa85

Comment 3

[Dana Keeler (she/her) [:keeler]]

Comment on attachment 8687774 [details]
MozReview Request: Bug 1224478 - Replace do_check_* calls with their Assert.jsm equivalents in PSM xpcshell tests.

https://reviewboard.mozilla.org/r/25153/#review22749

Great - thanks!

::: security/manager/ssl/tests/unit/test_sts_preloadlist_perwindowpb.js:67
(Diff revision 1)
>                                           "notsts.nonexistent.mozilla.com.", 0));

nit: indentation

Comment 4

[:Cykesiopka]

Attachment: bug1224478_use-assert-jsm_v2.patch

+ Fix indentation nit

Comment 5

[:Cykesiopka]

Thanks for the review.

(Try push is in comment 2).

Comment 6

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/3df44184a432

Comment 7

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/3df44184a432