Update test cases for erlang:hash/2 removal

6 files changed, 30 insertions, 77 deletions

diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index 36e82c1459..5e90b79aa2 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -1559,7 +1559,6 @@ t_warn_pair_key_overloaded(Config) when is_list(Config) ->
 	    "hi2" => lists:subtract([1,2],[1]),
 	    "hi3" => +3,
 	    "hi1" => erlang:min(1,2),
-	    "hi1" => erlang:hash({1,2},35),
 	    "hi1" => erlang:phash({1,2},33),
 	    "hi1" => erlang:phash2({1,2},34),
 	    "hi1" => erlang:integer_to_binary(1337),
diff --git a/lib/debugger/test/map_SUITE.erl b/lib/debugger/test/map_SUITE.erl
index 42484ff723..4d8a86f5a2 100644
--- a/lib/debugger/test/map_SUITE.erl
+++ b/lib/debugger/test/map_SUITE.erl
@@ -1714,10 +1714,8 @@ t_bif_map_values(Config) when is_list(Config) ->
 
 
 t_erlang_hash(Config) when is_list(Config) ->
-
     ok = t_bif_erlang_phash2(),
     ok = t_bif_erlang_phash(),
-    ok = t_bif_erlang_hash(),
     ok.
 
 t_bif_erlang_phash2() ->
@@ -1759,26 +1757,6 @@ t_bif_erlang_phash() ->
     2620391445 = erlang:phash(M2,Sz), % 3590546636
     ok.
 
-t_bif_erlang_hash() ->
-    Sz = 1 bsl 27 - 1,
-    39684169 = erlang:hash(#{},Sz),  % 5158
-    33673142 = erlang:hash(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 },Sz), % 71555838
-    95337869 = erlang:hash(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} },Sz), % 5497225
-    108959561 = erlang:hash(#{ 1 => a },Sz), % 126071654
-    59623150 = erlang:hash(#{ a => 1 },Sz), % 126426236
-
-    42775386 = erlang:hash(#{{} => <<>>},Sz), % 101655720
-    71692856 = erlang:hash(#{<<>> => {}},Sz), % 101655720
-
-    M0 = #{ a => 1, "key" => <<"value">> },
-    M1 = maps:remove("key",M0),
-    M2 = M1#{ "key" => <<"value">> },
-
-    70254632 = erlang:hash(M0,Sz), % 38260486
-    59623150 = erlang:hash(M1,Sz), % 126426236
-    70254632 = erlang:hash(M2,Sz), % 38260486
-    ok.
-
 t_map_encode_decode(Config) when is_list(Config) ->
     <<131,116,0,0,0,0>> = erlang:term_to_binary(#{}),
     Pairs = [
diff --git a/lib/dialyzer/test/map_SUITE_data/results/map_galore b/lib/dialyzer/test/map_SUITE_data/results/map_galore
index 6ea88f01f8..c34ba5cf30 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/map_galore
+++ b/lib/dialyzer/test/map_SUITE_data/results/map_galore
@@ -20,9 +20,9 @@ map_galore.erl:186: The pattern #{'x':=2} can never match the type #{'x':=3}
 map_galore.erl:187: The pattern #{'x':=3} can never match the type {'a','b','c'}
 map_galore.erl:188: The pattern #{'x':=3} can never match the type #{'y':=3}
 map_galore.erl:189: The pattern #{'x':=3} can never match the type #{'x':=[101 | 104 | 114 | 116,...]}
-map_galore.erl:2304: Cons will produce an improper list since its 2nd argument is {'b','a'}
-map_galore.erl:2304: The call maps:from_list(nonempty_improper_list({'a','b'},{'b','a'})) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
-map_galore.erl:2305: The call maps:from_list('a') will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
-map_galore.erl:2306: The call maps:from_list(42) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
+map_galore.erl:2280: Cons will produce an improper list since its 2nd argument is {'b','a'}
+map_galore.erl:2280: The call maps:from_list(nonempty_improper_list({'a','b'},{'b','a'})) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
+map_galore.erl:2281: The call maps:from_list('a') will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
+map_galore.erl:2282: The call maps:from_list(42) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
 map_galore.erl:997: A key of type 'nonexisting' cannot exist in a map of type #{}
 map_galore.erl:998: A key of type 'nonexisting' cannot exist in a map of type #{1:='a', 2:='b', 4:='d', 5:='e', float()=>'c'}
diff --git a/lib/dialyzer/test/map_SUITE_data/src/map_galore.erl b/lib/dialyzer/test/map_SUITE_data/src/map_galore.erl
index 2611241379..99eb73a5f6 100644
--- a/lib/dialyzer/test/map_SUITE_data/src/map_galore.erl
+++ b/lib/dialyzer/test/map_SUITE_data/src/map_galore.erl
@@ -2070,11 +2070,8 @@ t_bif_map_values(Config) when is_list(Config) ->
     ok.
 
 t_erlang_hash(Config) when is_list(Config) ->
-
     ok = t_bif_erlang_phash2(),
     ok = t_bif_erlang_phash(),
-    ok = t_bif_erlang_hash(),
-
     ok.
 
 t_bif_erlang_phash2() ->
@@ -2117,27 +2114,6 @@ t_bif_erlang_phash() ->
     2620391445 = erlang:phash(M2,Sz), % 3590546636
     ok.
 
-t_bif_erlang_hash() ->
-    Sz = 1 bsl 27 - 1,
-    39684169 = erlang:hash(#{},Sz),  % 5158
-    33673142 = erlang:hash(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 },Sz), % 71555838
-    95337869 = erlang:hash(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} },Sz), % 5497225
-    108959561 = erlang:hash(#{ 1 => a },Sz), % 126071654
-    59623150 = erlang:hash(#{ a => 1 },Sz), % 126426236
-
-    42775386 = erlang:hash(#{{} => <<>>},Sz), % 101655720
-    71692856 = erlang:hash(#{<<>> => {}},Sz), % 101655720
-
-    M0 = #{ a => 1, "key" => <<"value">> },
-    M1 = maps:remove("key",M0),
-    M2 = M1#{ "key" => <<"value">> },
-
-    70254632 = erlang:hash(M0,Sz), % 38260486
-    59623150 = erlang:hash(M1,Sz), % 126426236
-    70254632 = erlang:hash(M2,Sz), % 38260486
-    ok.
-
-
 t_map_encode_decode(Config) when is_list(Config) ->
     <<131,116,0,0,0,0>> = erlang:term_to_binary(#{}),
     Pairs = [
diff --git a/lib/hipe/test/maps_SUITE_data/maps_warn_pair_key_overloaded.erl b/lib/hipe/test/maps_SUITE_data/maps_warn_pair_key_overloaded.erl
index 76b2a91f94..cce91530f4 100644
--- a/lib/hipe/test/maps_SUITE_data/maps_warn_pair_key_overloaded.erl
+++ b/lib/hipe/test/maps_SUITE_data/maps_warn_pair_key_overloaded.erl
@@ -14,7 +14,6 @@ test() ->
 	    "hi2" => lists:subtract([1,2],[1]),
 	    "hi3" => +3,
 	    "hi1" => erlang:min(1,2),
-	    "hi1" => erlang:hash({1,2},35),
 	    "hi1" => erlang:phash({1,2},33),
 	    "hi1" => erlang:phash2({1,2},34),
 	    "hi1" => erlang:integer_to_binary(1337),
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index c90f855b3b..c7dcd9ae16 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -2002,22 +2002,22 @@ otp_5362(Config) when is_list(Config) ->
            <<"-compile(nowarn_deprecated_function).
               -compile(nowarn_bif_clash).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
-           {[nowarn_unused_function, 
+           {[nowarn_unused_function,
              warn_deprecated_function,
              warn_bif_clash]},
            {error,
             [{5,erl_lint,{call_to_redefined_old_bif,{spawn,1}}}],
-	    [{4,erl_lint,{deprecated,{erlang,hash,2},{erlang,phash2,2},
-			  "a future release"}}]}},
-
+            [{4,erl_lint,{deprecated,{erlang,now,0},
+                          "Deprecated BIF. See the \"Time and Time Correction in Erlang\" "
+                          "chapter of the ERTS User's Guide for more information."}}]}},
           {otp_5362_5,
            <<"-compile(nowarn_deprecated_function).
               -compile(nowarn_bif_clash).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function]},
@@ -2026,37 +2026,37 @@ otp_5362(Config) when is_list(Config) ->
 
           %% The special nowarn_X are not affected by general warn_X.
           {otp_5362_6,
-           <<"-compile({nowarn_deprecated_function,{erlang,hash,2}}).
+           <<"-compile({nowarn_deprecated_function,{erlang,now,0}}).
               -compile({nowarn_bif_clash,{spawn,1}}).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
-           {[nowarn_unused_function, 
-             warn_deprecated_function, 
+           {[nowarn_unused_function,
+             warn_deprecated_function,
              warn_bif_clash]},
            {errors,
             [{2,erl_lint,disallowed_nowarn_bif_clash}],[]}},
 
           {otp_5362_7,
            <<"-export([spawn/1]).
-              -compile({nowarn_deprecated_function,{erlang,hash,2}}).
+              -compile({nowarn_deprecated_function,{erlang,now,0}}).
               -compile({nowarn_bif_clash,{spawn,1}}).
               -compile({nowarn_bif_clash,{spawn,2}}). % bad
               -compile([{nowarn_deprecated_function, 
-                                [{erlang,hash,-1},{3,hash,-1}]}, % 2 bad
-                     {nowarn_deprecated_function, {{a,b,c},hash,-1}}]). % bad
+                                [{erlang,now,-1},{3,now,-1}]}, % 2 bad
+                     {nowarn_deprecated_function, {{a,b,c},now,-1}}]). % bad
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function]},
            {error,[{3,erl_lint,disallowed_nowarn_bif_clash},
 		   {4,erl_lint,disallowed_nowarn_bif_clash},
 		   {4,erl_lint,{bad_nowarn_bif_clash,{spawn,2}}}],
-            [{5,erl_lint,{bad_nowarn_deprecated_function,{3,hash,-1}}},
-             {5,erl_lint,{bad_nowarn_deprecated_function,{erlang,hash,-1}}},
-             {5,erl_lint,{bad_nowarn_deprecated_function,{{a,b,c},hash,-1}}}]}
+            [{5,erl_lint,{bad_nowarn_deprecated_function,{3,now,-1}}},
+             {5,erl_lint,{bad_nowarn_deprecated_function,{erlang,now,-1}}},
+             {5,erl_lint,{bad_nowarn_deprecated_function,{{a,b,c},now,-1}}}]}
            },
 
           {otp_5362_8,
@@ -2064,14 +2064,15 @@ otp_5362(Config) when is_list(Config) ->
               -compile(warn_deprecated_function).
               -compile(warn_bif_clash).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function,
              {nowarn_bif_clash,{spawn,1}}]}, % has no effect
            {warnings,
-            [{5,erl_lint,{deprecated,{erlang,hash,2},{erlang,phash2,2},
-			  "a future release"}}]}},
+            [{5,erl_lint,{deprecated,{erlang,now,0},
+                          "Deprecated BIF. See the \"Time and Time Correction in Erlang\" "
+                          "chapter of the ERTS User's Guide for more information."}}]}},
 
           {otp_5362_9,
            <<"-include_lib(\"stdlib/include/qlc.hrl\").
@@ -2083,11 +2084,11 @@ otp_5362(Config) when is_list(Config) ->
            []},
 
           {otp_5362_10,
-           <<"-compile({nowarn_deprecated_function,{erlang,hash,2}}).
+           <<"-compile({nowarn_deprecated_function,{erlang,now,0}}).
               -compile({nowarn_bif_clash,{spawn,1}}).
               -import(x,[spawn/1]).
               spin(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function,
@@ -2097,11 +2098,11 @@ otp_5362(Config) when is_list(Config) ->
             [{2,erl_lint,disallowed_nowarn_bif_clash}],[]}},
 
 	  {call_deprecated_function,
-	   <<"t(X) -> erlang:hash(X, 2000).">>,
+	   <<"t(X) -> crypto:md5(X).">>,
 	   [],
 	   {warnings,
-            [{1,erl_lint,{deprecated,{erlang,hash,2},
-			  {erlang,phash2,2},"a future release"}}]}},
+            [{1,erl_lint,{deprecated,{crypto,md5,1},
+			  {crypto,hash,2}, "a future release"}}]}},
 
 	  {call_removed_function,
 	   <<"t(X) -> regexp:match(X).">>,