diff options
| author | Eric Avdey <eiri@eiri.ca> | 2019-02-01 12:39:42 -0400 |
|---|---|---|
| committer | Eric Avdey <eiri@eiri.ca> | 2019-02-04 21:55:25 -0400 |
| commit | d3618bf0d5a275d669c2a846279c458ceb4b6a97 (patch) | |
| tree | fdb07559bb83abd0df03ffbbd8f458512b2835d9 | |
| parent | 04a8f832fdaf31b31de15cc0500b3d47546da3a4 (diff) | |
| download | couchdb-d3618bf0d5a275d669c2a846279c458ceb4b6a97.tar.gz | |
Make from_json_error_cases tests idiomatic
| -rw-r--r-- | src/couch/test/couch_doc_json_tests.erl | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/couch/test/couch_doc_json_tests.erl b/src/couch/test/couch_doc_json_tests.erl index cc5dc3222..848bae888 100644 --- a/src/couch/test/couch_doc_json_tests.erl +++ b/src/couch/test/couch_doc_json_tests.erl @@ -288,18 +288,14 @@ from_json_error_cases() -> lists:map(fun ({Fun, Expect, Msg}) when is_function(Fun, 0) -> - Error = (catch couch_doc:from_json_obj_validate(Fun())), - {Msg, ?_assertMatch(Expect, Error)}; + {Msg, + ?_assertThrow(Expect, couch_doc:from_json_obj_validate(Fun()))}; ({EJson, Expect, Msg}) -> - Error = (catch couch_doc:from_json_obj_validate(EJson)), - {Msg, ?_assertMatch(Expect, Error)}; + {Msg, + ?_assertThrow(Expect, couch_doc:from_json_obj_validate(EJson))}; ({EJson, Msg}) -> - try - couch_doc:from_json_obj_validate(EJson), - {"Conversion failed to raise an exception", ?_assert(false)} - catch - _:_ -> {Msg, ?_assert(true)} - end + {Msg, + ?_assertThrow(_, couch_doc:from_json_obj_validate(EJson))} end, Cases). from_json_with_dbname_error_cases() -> |