dict_SUITE: Eliminate use of parameterized modules

Since the support for parameterized modules will be removed in R16,
we should not use them in test cases.

2 files changed, 28 insertions, 47 deletions

diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index c46fc47b34..df9c769c67 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -53,7 +53,7 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(5)),
+    Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
@@ -65,22 +65,22 @@ create(Config) when is_list(Config) ->
     test_all(fun create_1/1).
 
 create_1(M) ->
-    ?line D0 = M:empty(),
-    ?line [] = M:to_list(D0),
-    ?line 0 = M:size(D0),
+    D0 = M(empty, []),
+    [] = M(to_list, D0),
+    0 = M(size, D0),
     D0.
 
 store(Config) when is_list(Config) ->
     test_all([{0,132},{253,258},{510,514}], fun store_1/2).
 
 store_1(List, M) ->
-    ?line D0 = M:from_list(List),
+    D0 = M(from_list, List),
 
     %% Make sure that we get the same result by inserting
     %% elements one at the time.
-    ?line D1 = foldl(fun({K,V}, Dict) -> M:enter(K, V, Dict) end,
-		     M:empty(), List),
-    ?line true = M:equal(D0, D1),
+    D1 = foldl(fun({K,V}, Dict) -> M(enter, {K,V,Dict}) end,
+	       M(empty, []), List),
+    true = M(equal, {D0,D1}),
     D0.
 
 %%%
@@ -98,7 +98,7 @@ dict_mods() ->
     [Orddict,Dict,Gb].
 
 test_all(Tester) ->
-    ?line Pids = [spawn_tester(M, Tester) || M <- dict_mods()],
+    Pids = [spawn_tester(M, Tester) || M <- dict_mods()],
     collect_all(Pids, []).
 
 spawn_tester(M, Tester) ->
@@ -106,7 +106,7 @@ spawn_tester(M, Tester) ->
     spawn_link(fun() ->
 		       random:seed(1, 2, 42),
 		       S = Tester(M),
-		       Res = {M:size(S),lists:sort(M:to_list(S))},
+		       Res = {M(size, S),lists:sort(M(to_list, S))},
 		       Parent ! {result,self(),Res}
 	       end).
 
diff --git a/lib/stdlib/test/dict_test_lib.erl b/lib/stdlib/test/dict_test_lib.erl
index 92a75dad89..7167014310 100644
--- a/lib/stdlib/test/dict_test_lib.erl
+++ b/lib/stdlib/test/dict_test_lib.erl
@@ -17,67 +17,48 @@
 %% %CopyrightEnd%
 %%
 
--module(dict_test_lib, [Mod,Equal]).
+-module(dict_test_lib).
 
--export([module/0,equal/2,empty/0,size/1,to_list/1,from_list/1,
-	 enter/3,delete/2,lookup/2]).
+-export([new/2]).
 
-module() ->
-    Mod.
-
-equal(X, Y) ->
-    Equal(X, Y).
+new(Mod, Eq) ->
+    fun (enter, {K,V,D}) -> enter(Mod, K, V, D);
+	(empty, []) -> empty(Mod);
+	(equal, {D1,D2}) -> Eq(D1, D2);
+	(from_list, L) -> from_list(Mod, L);
+	(module, []) -> Mod;
+	(size, D) -> Mod:size(D);
+	(to_list, D) -> to_list(Mod, D)
+    end.
 
-empty() ->
+empty(Mod) ->
     case erlang:function_exported(Mod, new, 0) of
 	false -> Mod:empty();
 	true -> Mod:new()
     end.
 
-size(S) ->
-    Mod:size(S).
-
-to_list(S) ->
-    Mod:to_list(S).
+to_list(Mod, D) ->
+    Mod:to_list(D).
 
-from_list(S) ->
+from_list(Mod, L) ->
     case erlang:function_exported(Mod, from_orddict, 1) of
 	false ->
-	    Mod:from_list(S);
+	    Mod:from_list(L);
 	true ->
 	    %% The gb_trees module has no from_list/1 function.
 	    %%
 	    %% The keys in S are not unique. To make sure
 	    %% that we pick the same key/value pairs as
 	    %% dict/orddict, first convert the list to an orddict.
-	    Orddict = orddict:from_list(S),
+	    Orddict = orddict:from_list(L),
 	    Mod:from_orddict(Orddict)
     end.
 
 %% Store new value into dictionary or update previous value in dictionary.
-enter(Key, Val, Dict) ->
+enter(Mod, Key, Val, Dict) ->
     case erlang:function_exported(Mod, store, 3) of
 	false ->
 	    Mod:enter(Key, Val, Dict);
 	true ->
 	    Mod:store(Key, Val, Dict)
     end.
-
-%% Delete an EXISTING key.
-delete(Key, Dict) ->
-    case erlang:function_exported(Mod, delete, 2) of
-	true -> Mod:delete(Key, Dict);
-	false -> Mod:erase(Key, Dict)
-    end.
-
-%% -> none | {value,Value}
-lookup(Key, Dict) ->
-    case erlang:function_exported(Mod, lookup, 2) of
-	false ->
-	    case Mod:find(Key, Dict) of
-		error -> none;
-		{ok,Value} -> {value,Value}
-	    end;
-	true ->
-	    Mod:lookup(Key, Dict)
-    end.