Add dict suite, remove session suite

4 files changed, 147 insertions, 114 deletions

diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index d77099785f..c2619df204 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -67,7 +67,7 @@ SOURCE = $(HRL_FILES) $(ERL_FILES)
 
 TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
 
-APP_CASES   = app appup
+APP_CASES   = app
 
 TRANSPORT_CASES = tcp
 
@@ -229,9 +229,6 @@ help:
 	@echo "    app"
 	@echo "      Run the $(APPLICATION) application sub-test-suite. "
 	@echo ""
-	@echo "    appup"
-	@echo "      Run the $(APPLICATION) application upgrade (appup) sub-test-suite. "
-	@echo ""
 	@echo "    compiler"
 	@echo "      Run the $(APPLICATION) compiler sub-test-suite(s). "
 	@echo ""
@@ -242,9 +239,6 @@ help:
 	@echo "    sync"
 	@echo "      Run the $(APPLICATION) sync sub-test-suite. "
 	@echo ""
-	@echo "    session"
-	@echo "      Run the $(APPLICATION) session sub-test-suite. "
-	@echo ""
 	@echo "    stats"
 	@echo "      Run the $(APPLICATION) stats sub-test-suite. "
 	@echo ""
@@ -309,14 +303,14 @@ log:
 
 # This assumes GNU sed to exit 1 if the output looks to indicate failure.
 # diameter_ct:run/1 itself can't tell (it seems).
-app codec: log make
+app codec dict: log make
 	$(MERL) $(ARGS) \
 	        -sname diameter_test_$@ \
 	        -s diameter_ct run $@ \
 	        -s init stop \
 	| sed '/ FAILED /h; p; $$!d; x; /./!d; Q 1'
 
-appup compiler conf sync session stats reg peer tcp: make
+compiler conf sync stats reg peer tcp: make
 	$(MERL) $(ARGS) -sname diameter_$@ $(ERL_PATH) \
             -s $(DIAMETER_TEST_SERVER) t diameter_$@_test \
             $(ESTOP)
diff --git a/lib/diameter/test/diameter_dict_SUITE.erl b/lib/diameter/test/diameter_dict_SUITE.erl
new file mode 100644
index 0000000000..3b61edba58
--- /dev/null
+++ b/lib/diameter/test/diameter_dict_SUITE.erl
@@ -0,0 +1,143 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the dict-like diameter_dict.
+%%
+
+-module(diameter_dict_SUITE).
+
+-export([suite/0,
+         all/0]).
+
+%% testcases
+-export([scramble/1,
+         append/1,
+         fetch/1,
+         fetch_keys/1,
+         filter/1,
+         find/1,
+         fold/1,
+         is_key/1,
+         map/1,
+         merge/1,
+         update/1,
+         update_counter/1]).
+
+-define(ERROR(T), erlang:error({T, ?MODULE, ?LINE})).
+
+-define(dict, diameter_dict).
+-define(util, diameter_util).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [scramble | tc()].
+
+tc() ->
+    [append,
+     fetch,
+     fetch_keys,
+     filter,
+     find,
+     fold,
+     is_key,
+     map,
+     merge,
+     update,
+     update_counter].
+
+%% ===========================================================================
+
+scramble(Config) ->
+    [] = ?util:run(?util:scramble([{?MODULE, [F, Config]} || F <- tc()])).
+
+-define(KV100, [{N,[N]} || N <- lists:seq(1,100)]).
+
+append(_) ->
+    D = ?dict:append(k, v, ?dict:new()),
+    [{k,[v,v]}] = ?dict:to_list(?dict:append(k, v, D)).
+
+fetch(_) ->
+    D = ?dict:from_list(?KV100),
+    [50] = ?dict:fetch(50, D),
+    Ref = make_ref(),
+    Ref = try ?dict:fetch(Ref, D) catch _:_ -> Ref end.
+
+fetch_keys(_) ->
+    L = ?KV100,
+    D = ?dict:from_list(L),
+    L = [{N,[N]} || N <- lists:sort(?dict:fetch_keys(D))].
+
+filter(_) ->
+    L = ?KV100,
+    F = fun(K,[_]) -> 0 == K rem 2 end,
+    D = ?dict:filter(F, ?dict:from_list(L)),
+    true = [T || {K,V} = T <- L, F(K,V)] == lists:sort(?dict:to_list(D)).
+
+find(_) ->
+    D = ?dict:from_list(?KV100),
+    {ok, [50]} = ?dict:find(50, D),
+    error = ?dict:find(make_ref(), D).
+
+fold(_) ->
+    L = ?KV100,
+    S = lists:sum([N || {N,_} <- L]),
+    S = ?dict:fold(fun(K,[_],A) -> K + A end, 0, ?dict:from_list(L)).
+
+is_key(_) ->
+    L = ?KV100,
+    D = ?dict:from_list(L),
+    true = lists:all(fun({N,_}) -> ?dict:is_key(N,D) end, L),
+    false = ?dict:is_key(make_ref(), D).
+
+map(_) ->
+    L = ?KV100,
+    F = fun(_,V) -> [N] = V, N*2 end,
+    D = ?dict:map(F, ?dict:from_list(L)),
+    M = [{K, F(K,V)} || {K,V} <- L],
+    M = lists:sort(?dict:to_list(D)).
+
+merge(_) ->
+    L = ?KV100,
+    F = fun(_,V1,V2) -> V1 ++ V2 end,
+    D = ?dict:merge(F, ?dict:from_list(L), ?dict:from_list(L)),
+    M = [{K, F(K,V,V)} || {K,V} <- L],
+    M = lists:sort(?dict:to_list(D)).
+
+update(_) ->
+    L = ?KV100,
+    F = fun([V]) -> 2*V end,
+    D = ?dict:update(50, F, ?dict:from_list(L)),
+    100 = ?dict:fetch(50, D),
+    Ref = make_ref(),
+    Ref = try ?dict:update(Ref, F, D) catch _:_ -> Ref end,
+    [Ref] = ?dict:fetch(Ref, ?dict:update(Ref,
+                                          fun(_,_) -> ?ERROR(i_think_not) end,
+                                          [Ref],
+                                          D)).
+
+update_counter(_) ->
+    L = [{N,2*N} || {N,_} <- ?KV100],
+    D = ?dict:update_counter(50, 20, ?dict:from_list(L)),
+    120 = ?dict:fetch(50,D),
+    2 = ?dict:fetch(1,D).
diff --git a/lib/diameter/test/diameter_session_test.erl b/lib/diameter/test/diameter_session_test.erl
deleted file mode 100644
index a32647d83d..0000000000
--- a/lib/diameter/test/diameter_session_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the session component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_session_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 65c5ea9333..06b2893246 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -28,12 +28,12 @@ MODULES = \
 	diameter_codec_SUITE \
 	diameter_codec_test \
 	diameter_app_SUITE \
+	diameter_dict_SUITE \
 	\
 	diameter_compiler_test \
 	diameter_config_test \
 	diameter_peer_test \
 	diameter_reg_test \
-	diameter_session_test \
 	diameter_stats_test \
 	diameter_sync_test \
 	diameter_tcp_test \