Skip to content

Commit 4499855

Browse files
lucioleKilucioleKi
committed
Remove deprecated catch in num_bif_SUITE.erl
1 parent 501f35d commit 4499855

1 file changed

Lines changed: 32 additions & 45 deletions

File tree

‎erts/emulator/test/num_bif_SUITE.erl‎

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -134,25 +134,22 @@ t_float_to_string(Config) when is_list(Config) ->
134134
test_fts("1.00000000000000000000e+00",1.0, []),
135135
test_fts("-1.00000000000000000000e+00",-1.0, []),
136136
test_fts("-1.00000000000000000000",-1.0, [{decimals, 20}]),
137-
%% FIXME: Cleanup.
138-
{'EXIT', {badarg, _}} = (catch float_to_list(1.0, [{decimals, -1}])),
139-
{'EXIT', {badarg, _}} = (catch float_to_list(1.0, [{decimals, 254}])),
140-
{'EXIT', {badarg, _}} = (catch float_to_list(1.0, [{scientific, 250}])),
141-
{'EXIT', {badarg, _}} = (catch float_to_list(1.0e+300, [{decimals, 1}])),
142-
{'EXIT', {badarg, _}} = (catch float_to_binary(1.0, [{decimals, -1}])),
143-
{'EXIT', {badarg, _}} = (catch float_to_binary(1.0, [{decimals, 254}])),
144-
{'EXIT', {badarg, _}} = (catch float_to_binary(1.0, [{scientific, 250}])),
145-
{'EXIT', {badarg, _}} = (catch float_to_binary(1.0e+300, [{decimals, 1}])),
137+
?assertError(badarg, float_to_list(1.0, [{decimals, -1}])),
138+
?assertError(badarg, float_to_list(1.0, [{decimals, 254}])),
139+
?assertError(badarg, float_to_list(1.0, [{scientific, 250}])),
140+
?assertError(badarg, float_to_list(1.0e+300, [{decimals, 1}])),
141+
?assertError(badarg, float_to_binary(1.0, [{decimals, -1}])),
142+
?assertError(badarg, float_to_binary(1.0, [{decimals, 254}])),
143+
?assertError(badarg, float_to_binary(1.0, [{scientific, 250}])),
144+
?assertError(badarg, float_to_binary(1.0e+300, [{decimals, 1}])),
146145
test_fts("1.0e+300",1.0e+300, [{scientific, 1}]),
147146
test_fts("1.0",1.0, [{decimals, 249}, compact]),
148147
test_fts("1",1.0,[{decimals,0}]),
149148
test_fts("2",1.9,[{decimals,0}]),
150149
test_fts("123456789012345680.0",123456789012345678.0,
151150
[{decimals, 236}, compact]),
152-
{'EXIT', {badarg, _}} = (catch float_to_list(
153-
123456789012345678.0, [{decimals, 237}])),
154-
{'EXIT', {badarg, _}} = (catch float_to_binary(
155-
123456789012345678.0, [{decimals, 237}])),
151+
?assertError(badarg, float_to_list(123456789012345678.0, [{decimals, 237}])),
152+
?assertError(badarg, float_to_binary(123456789012345678.0, [{decimals, 237}])),
156153
test_fts("1." ++ lists:duplicate(249, $0) ++ "e+00",
157154
1.0, [{scientific, 249}, compact]),
158155

@@ -552,14 +549,14 @@ t_string_to_float_safe(Config) when is_list(Config) ->
552549
test_stf(127.5,"127.5"),
553550
test_stf(-199.5,"-199.5"),
554551

555-
{'EXIT',{badarg,_}} = (catch list_to_float(id("0"))),
556-
{'EXIT',{badarg,_}} = (catch list_to_float(id("0..0"))),
557-
{'EXIT',{badarg,_}} = (catch list_to_float(id("0e12"))),
558-
{'EXIT',{badarg,_}} = (catch list_to_float(id("--0.0"))),
559-
{'EXIT',{badarg,_}} = (catch binary_to_float(id(<<"0">>))),
560-
{'EXIT',{badarg,_}} = (catch binary_to_float(id(<<"0..0">>))),
561-
{'EXIT',{badarg,_}} = (catch binary_to_float(id(<<"0e12">>))),
562-
{'EXIT',{badarg,_}} = (catch binary_to_float(id(<<"--0.0">>))),
552+
?assertError(badarg, list_to_float(id("0"))),
553+
?assertError(badarg, list_to_float(id("0..0"))),
554+
?assertError(badarg, list_to_float(id("0e12"))),
555+
?assertError(badarg, list_to_float(id("--0.0"))),
556+
?assertError(badarg, binary_to_float(id(<<"0">>))),
557+
?assertError(badarg, binary_to_float(id(<<"0..0">>))),
558+
?assertError(badarg, binary_to_float(id(<<"0e12">>))),
559+
?assertError(badarg, binary_to_float(id(<<"--0.0">>))),
563560

564561
UBin = <<0:3,(id(<<"0.0">>))/binary,0:5>>,
565562
<<_:3,UnAlignedBin:3/binary,0:5>> = id(UBin),
@@ -577,10 +574,10 @@ t_string_to_float_safe(Config) when is_list(Config) ->
577574
t_string_to_float_risky(Config) when is_list(Config) ->
578575
Many_Ones = lists:duplicate(25000, id($1)),
579576
id(list_to_float("2."++Many_Ones)),
580-
{'EXIT', {badarg, _}} = (catch list_to_float("2"++Many_Ones)),
577+
?assertError(badarg, list_to_float("2"++Many_Ones)),
581578

582579
id(binary_to_float(list_to_binary("2."++Many_Ones))),
583-
{'EXIT', {badarg, _}} = (catch binary_to_float(
580+
?assertError(badarg, binary_to_float(
584581
list_to_binary("2"++Many_Ones))),
585582
ok.
586583

@@ -750,10 +747,8 @@ t_integer_to_string(Config) when is_list(Config) ->
750747

751748
%% Invalid types
752749
lists:foreach(fun(Value) ->
753-
{'EXIT', {badarg, _}} =
754-
(catch erlang:integer_to_binary(Value)),
755-
{'EXIT', {badarg, _}} =
756-
(catch erlang:integer_to_list(Value))
750+
?assertError(badarg, erlang:integer_to_binary(Value)),
751+
?assertError(badarg, erlang:integer_to_list(Value))
757752
end,[atom,1.2,0.0,[$1,[$2]]]),
758753

759754
%% Base-2 integers
@@ -772,10 +767,8 @@ t_integer_to_string(Config) when is_list(Config) ->
772767
16),
773768

774769
lists:foreach(fun(Value) ->
775-
{'EXIT', {badarg, _}} =
776-
(catch erlang:integer_to_binary(Value, 8)),
777-
{'EXIT', {badarg, _}} =
778-
(catch erlang:integer_to_list(Value, 8))
770+
?assertError(badarg, erlang:integer_to_binary(Value, 8)),
771+
?assertError(badarg, erlang:integer_to_list(Value, 8))
779772
end,[atom,1.2,0.0,[$1,[$2]]]),
780773

781774
ok.
@@ -829,26 +822,20 @@ t_string_to_integer(Config) when is_list(Config) ->
829822

830823
%% Invalid types
831824
lists:foreach(fun(Value) ->
832-
{'EXIT', {badarg, _}} =
833-
(catch bin_to_int(Value)),
834-
{'EXIT', {badarg, _}} =
835-
(catch list_to_integer(Value))
825+
?assertError(badarg, bin_to_int(Value)),
826+
?assertError(badarg, list_to_integer(Value))
836827
end,[atom,1.2,0.0,[$1,[$2]]]),
837828

838829
%% Default base error cases
839830
lists:foreach(fun(Value) ->
840-
{'EXIT', {badarg, _}} =
841-
(catch bin_to_int(list_to_binary(Value))),
842-
{'EXIT', {badarg, _}} =
843-
(catch list_to_integer(Value))
831+
?assertError(badarg, bin_to_int(list_to_binary(Value))),
832+
?assertError(badarg, list_to_integer(Value))
844833
end,["1.0"," 1"," -1","","+"]),
845834

846835
%% Custom base error cases
847836
lists:foreach(fun({Value,Base}) ->
848-
{'EXIT', {badarg, _}} =
849-
(catch binary_to_integer(list_to_binary(Value), Base)),
850-
{'EXIT', {badarg, _}} =
851-
(catch list_to_integer(Value, Base))
837+
?assertError(badarg, binary_to_integer(list_to_binary(Value), Base)),
838+
?assertError(badarg, list_to_integer(Value, Base))
852839
end,
853840
[{" 1",1},{" 1",37},{"2",2},{"B",11},{"b",11},{":", 16},
854841
{"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111z",16},
@@ -865,9 +852,9 @@ t_string_to_integer(Config) when is_list(Config) ->
865852

866853
%% System limit
867854
Digits = lists:duplicate(3_000_000, $9),
868-
{'EXIT',{system_limit,_}} = catch list_to_integer(Digits),
855+
?assertError(system_limit, list_to_integer(Digits)),
869856
_ = erlang:garbage_collect(),
870-
{'EXIT',{system_limit,_}} = catch list_to_integer(Digits, 16),
857+
?assertError(system_limit, list_to_integer(Digits, 16)),
871858
_ = erlang:garbage_collect(),
872859
{error,system_limit} = string:to_integer(Digits),
873860
_ = erlang:garbage_collect(),

0 commit comments

Comments
 (0)