Merge pull request #4422 from esl/dead_code

Remove some more complicated dead code

Author: arcusfelis

big_tests/tests/bosh_SUITE.erl

@@ -691,7 +691,7 @@ reply_in_time(ConfigIn) ->
 server_acks(Config) ->
     escalus:story(Config, [{carol, 1}, {geralt, 1}], fun(Carol, Geralt) ->
         bosh_set_active(Carol, false),
-        ExpectedRid = list_to_binary(integer_to_list(get_bosh_rid(Carol))),
+        ExpectedRid = integer_to_binary(get_bosh_rid(Carol)),
         escalus_client:send(Carol, escalus_stanza:chat_to(Geralt, <<"1st!">>)),
         escalus_client:send(Carol, escalus_stanza:chat_to(Geralt, <<"2nd!">>)),
         timer:sleep(200),
@@ -897,7 +897,7 @@ wait_for_stanza(Client) ->
 
 ack_body(Body, Rid) ->
     Attrs = Body#xmlel.attrs,
-    Ack = {<<"ack">>, list_to_binary(integer_to_list(Rid))},
+    Ack = {<<"ack">>, integer_to_binary(Rid)},
     NewAttrs = lists:keystore(<<"ack">>, 1, Attrs, Ack),
     Body#xmlel{attrs = NewAttrs}.
 

big_tests/tests/common_helper.erl

@@ -7,4 +7,4 @@ get_bjid(UserSpec) ->
     <<User/binary,"@",Server/binary>>.
 
 unprep(Bin) when is_binary(Bin) ->
-    list_to_binary(string:titlecase(binary_to_list(Bin))).
+    string:titlecase(Bin).

big_tests/tests/gdpr_SUITE.erl

@@ -1534,15 +1534,14 @@ retrieve_inbox_for_multiple_messages(Config) ->
 retrieve_logs(Config) ->
     escalus:fresh_story(Config, [{alice, 1}],
         fun(Alice) ->
-            User = string:to_lower(binary_to_list(escalus_client:username(Alice))),
-            Domain = string:to_lower(binary_to_list(escalus_client:server(Alice))),
-            JID = string:to_upper(binary_to_list(escalus_client:short_jid(Alice))),
+            User = string:lowercase(escalus_client:username(Alice)),
+            Domain = string:lowercase(escalus_client:server(Alice)),
+            JID = string:uppercase(binary_to_list(escalus_client:short_jid(Alice))),
             #{node := MIM2NodeName} = MIM2Node = distributed_helper:mim2(),
             mongoose_helper:successful_rpc(net_kernel, connect_node, [MIM2NodeName]),
             mongoose_helper:successful_rpc(MIM2Node, error_logger, error_msg,
                                            ["event=disturbance_in_the_force, jid=~s", [JID]]),
-            Dir = request_and_unzip_personal_data(list_to_binary(User), list_to_binary(Domain),
-                                                  Config),
+            Dir = request_and_unzip_personal_data(User, Domain, Config),
             Filename = filename:join(Dir, "logs-" ++ atom_to_list(MIM2NodeName) ++ ".txt"),
             {ok, Content} = file:read_file(Filename),
             {match, _} = re:run(Content, "disturbance_in_the_force")

big_tests/tests/graphql_muc_SUITE.erl

@@ -1925,7 +1925,7 @@ assert_default_room_config(Response) ->
                    <<"logging">> := false}, get_ok_value(?GET_ROOM_CONFIG_PATH, Response)).
 
 atom_to_enum_item(null) -> null;
-atom_to_enum_item(Atom) -> list_to_binary(string:to_upper(atom_to_list(Atom))).
+atom_to_enum_item(Atom) -> string:uppercase(atom_to_binary(Atom)).
 
 get_room_name() ->
     Domain = domain_helper:domain(),

big_tests/tests/mam_send_message_SUITE_data/mam_send_message_example.erl

@@ -43,9 +43,9 @@ extend_message(_HostType, _ArcJID, Row = #{}) ->
     Row#{some_hash => erlang:phash2(Row, 32)}.
 
 send_message(Row, From, To, Mess) ->
-    Res = xml:get_subtag(Mess, <<"result">>),
-    Res2 = xml:append_subtags(Res, [new_subelem(Row)]),
-    Mess2 = xml:replace_subelement(Mess, Res2),
+    Res = exml_query:subelement(Mess, <<"result">>),
+    Res2 = jlib:append_subtags(Res, [new_subelem(Row)]),
+    Mess2 = jlib:replace_subelement(Mess, Res2),
     mod_mam_utils:send_message(Row, From, To, Mess2).
 
 new_subelem(#{some_hash := SomeHash}) ->

big_tests/tests/muc_SUITE.erl

@@ -4678,7 +4678,7 @@ skip_undefined(Xs) ->
     [X || X <- Xs, X =/= undefined].
 
 i2b(X) when is_integer(X) ->
-    list_to_binary(integer_to_list(X)).
+    integer_to_binary(X).
 
 wait_room_range(Client, FromN, ToN) ->
     wait_room_range(Client, 15, FromN-1, FromN, ToN).

big_tests/tests/muc_light_helper.erl

@@ -211,12 +211,12 @@ aff_msg_verify_fun(AffUsersChanges) ->
     end.
 
 -spec lbin(Bin :: binary()) -> binary().
-lbin(Bin) -> list_to_binary(string:to_lower(binary_to_list(Bin))).
-
+lbin(Bin) ->
+    string:lowercase(Bin).
 
 -spec bin_aff_users(AffUsers :: ct_aff_users()) -> [{LBinJID :: binary(), AffBin :: binary()}].
 bin_aff_users(AffUsers) ->
-    [ {lbin(escalus_client:short_jid(User)), list_to_binary(atom_to_list(Aff))}
+    [ {lbin(escalus_client:short_jid(User)), atom_to_binary(Aff)}
       || {User, Aff} <- AffUsers ].
 
 -spec verify_aff_users(Items :: [exml:element()], BinAffUsers :: [{binary(), binary()}]) -> [].
@@ -288,7 +288,7 @@ clear_db(HostType) ->
 
 -spec ver(Int :: integer()) -> binary().
 ver(Int) ->
-  <<"ver-", (list_to_binary(integer_to_list(Int)))/binary>>.
+  <<"ver-", (integer_to_binary(Int))/binary>>.
 
 assert_no_aff_duplicates(AffUsers) ->
     Users = [US || {US, _} <- AffUsers],
@@ -302,8 +302,8 @@ assert_no_aff_duplicates(AffUsers) ->
 
 -spec stanza_blocking_set(BlocklistChanges :: [ct_block_item()]) -> exml:element().
 stanza_blocking_set(BlocklistChanges) ->
-    Items = [#xmlel{ name = list_to_binary(atom_to_list(What)),
-                     attrs = [{<<"action">>, list_to_binary(atom_to_list(Action))}],
+    Items = [#xmlel{ name = atom_to_binary(What),
+                     attrs = [{<<"action">>, atom_to_binary(Action)}],
                      children = [#xmlcdata{ content = Who }] }
              || {What, Action, Who} <- BlocklistChanges],
     escalus_stanza:to(escalus_stanza:iq_set(?NS_MUC_LIGHT_BLOCKING, Items), muc_host()).

big_tests/tests/oauth_SUITE.erl

@@ -435,7 +435,7 @@ serialize(ServerSideToken) ->
     end.
 
 to_lower(B) when is_binary(B) ->
-    list_to_binary(string:to_lower(binary_to_list(B))).
+    string:lowercase(B).
 
 required_modules() ->
     KeyOpts = #{backend => ct_helper:get_internal_database(),

big_tests/tests/offline_SUITE.erl

@@ -406,7 +406,7 @@ make_chat_text(I) ->
     <<"Hi, Offline ", Number/binary>>.
 
 make_message_with_expiry(Target, Expiry, Text) ->
-    ExpiryBin = list_to_binary(integer_to_list(Expiry)),
+    ExpiryBin = integer_to_binary(Expiry),
     Stanza = escalus_stanza:chat_to(Target, Text),
     #xmlel{children = Children} = Stanza,
     ExpiryElem = #xmlel{name = <<"x">>,

big_tests/tests/push_SUITE.erl

@@ -774,7 +774,7 @@ push_notification(PubsubJID, Payload, PublishOpts) ->
 
 bare_jid(JIDOrClient) ->
     ShortJID = escalus_client:short_jid(JIDOrClient),
-    list_to_binary(string:to_lower(binary_to_list(ShortJID))).
+    string:lowercase(ShortJID).
 
 add_pubsub_jid(Config) ->
     CaseName = proplists:get_value(case_name, Config),