ssl: CTify test cases

1 files changed, 88 insertions, 188 deletions

diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl
index c97f97e70b..77ad546420 100644
--- a/lib/ssl/test/ssl_payload_SUITE.erl
+++ b/lib/ssl/test/ssl_payload_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -26,79 +26,8 @@
 
 -define(TIMEOUT, 600000).
 
-%% Test server callback functions
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    catch crypto:stop(),
-    try crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    ssl:start(),
-	    make_certs:all(?config(data_dir, Config), ?config(priv_dir, Config)),
-	    ssl_test_lib:cert_options(Config)
-    catch _:_  ->
-	    {skip, "Crypto did not start"}
-    end.
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
-end_per_suite(_Config) ->
-    ssl:stop(),
-    application:stop(crypto).
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initialization before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Description: Initialization before each test case
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of 
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case] 
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -138,6 +67,21 @@ payload_tests() ->
      client_echos_active_once_huge,
      client_echos_active_huge].
 
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+	    make_certs:all(?config(data_dir, Config), ?config(priv_dir, Config)),
+	    ssl_test_lib:cert_options(Config)
+    catch _:_  ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
 
 init_per_group(GroupName, Config) ->
      case ssl_test_lib:is_tls_version(GroupName) of
@@ -157,15 +101,20 @@ init_per_group(GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+    [{watchdog, Dog} | Config].
 
-%% Test cases starts here.
+end_per_testcase(_TestCase, Config) ->
+    Config.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-server_echos_passive_small(doc) -> 
-    ["Client sends 1000 bytes in passive mode to server, that receives them, "
-     "sends them back, and closes."];
 
-server_echos_passive_small(suite) -> 
-    [];
+server_echos_passive_small() ->
+    [{doc, "Client sends 1000 bytes in passive mode to server, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_passive_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -179,12 +128,9 @@ server_echos_passive_small(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_once_small(doc) -> 
-    ["Client sends 1000 bytes in active once mode to server, that receives "
-     " them, sends them back, and closes."];
-
-server_echos_active_once_small(suite) -> 
-    [];
+server_echos_active_once_small() ->
+    [{doc, "Client sends 1000 bytes in active once mode to server, that receives "
+     " them, sends them back, and closes."}].
 
 server_echos_active_once_small(Config) when is_list(Config) -> 
         ClientOpts = ?config(client_opts, Config),
@@ -198,12 +144,9 @@ server_echos_active_once_small(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_small(doc) -> 
-    ["Client sends 1000 bytes in active mode to server, that receives them, "
-     "sends them back, and closes."];
-
-server_echos_active_small(suite) -> 
-    [];
+server_echos_active_small() ->
+    [{doc, "Client sends 1000 bytes in active mode to server, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_active_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -216,12 +159,9 @@ server_echos_active_small(Config) when is_list(Config) ->
 			ClientNode, ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_passive_small(doc) -> 
-    ["Server sends 1000 bytes in passive mode to client, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_passive_small(suite) -> 
-    [];
+client_echos_passive_small() ->
+    [{doc, "Server sends 1000 bytes in passive mode to client, that receives them, "
+      "sends them back, and closes."}].
 
 client_echos_passive_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -234,12 +174,9 @@ client_echos_passive_small(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_active_once_small(doc) -> 
+client_echos_active_once_small() ->
     ["Server sends 1000 bytes in active once mode to client, that receives "
-     "them, sends them back, and closes."];
-
-client_echos_active_once_small(suite) -> 
-    [];
+     "them, sends them back, and closes."].
 
 client_echos_active_once_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -252,15 +189,12 @@ client_echos_active_once_small(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
    
 %%--------------------------------------------------------------------
-client_echos_active_small(doc) -> 
-    ["Server sends 1000 bytes in active mode to client, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_active_small(suite) -> 
-    [];
+client_echos_active_small() ->
+    [{doc, "Server sends 1000 bytes in active mode to client, that receives them, "
+      "sends them back, and closes."}].
 
 client_echos_active_small(Config) when is_list(Config) -> 
-     ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -271,12 +205,9 @@ client_echos_active_small(Config) when is_list(Config) ->
 
 
 %%--------------------------------------------------------------------
-server_echos_passive_big(doc) -> 
-    ["Client sends 50000 bytes to server in passive mode, that receives them, "
-     "sends them back, and closes."];
-
-server_echos_passive_big(suite) -> 
-    [];
+server_echos_passive_big() ->
+    [{doc, "Client sends 50000 bytes to server in passive mode, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_passive_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -290,15 +221,12 @@ server_echos_passive_big(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_once_big(doc) -> 
-    ["Client sends 50000 bytes to server in active once mode, that receives "
-     "them, sends them back, and closes."];
-
-server_echos_active_once_big(suite) -> 
-    [];
+server_echos_active_once_big() ->
+    [{doc,"Client sends 50000 bytes to server in active once mode, that receives "
+      "them, sends them back, and closes."}].
 
 server_echos_active_once_big(Config) when is_list(Config) -> 
-        ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -309,12 +237,9 @@ server_echos_active_once_big(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_big(doc) -> 
-    ["Client sends 50000 bytes to server in active once mode, that receives "
-     " them, sends them back, and closes."];
-
-server_echos_active_big(suite) -> 
-    [];
+server_echos_active_big() ->
+    [{doc, "Client sends 50000 bytes to server in active once mode, that receives "
+      " them, sends them back, and closes."}].
 
 server_echos_active_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -327,12 +252,9 @@ server_echos_active_big(Config) when is_list(Config) ->
 			ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_passive_big(doc) -> 
-    ["Server sends 50000 bytes to client in passive mode, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_passive_big(suite) -> 
-    [];
+client_echos_passive_big() ->
+    [{doc, "Server sends 50000 bytes to client in passive mode, that receives them, "
+     "sends them back, and closes."}].
 
 client_echos_passive_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -345,12 +267,9 @@ client_echos_passive_big(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_active_once_big(doc) -> 
-    ["Server sends 50000 bytes to client in active once mode, that receives"
-     " them, sends them back, and closes."];
-
-client_echos_active_once_big(suite) -> 
-    [];
+client_echos_active_once_big() ->
+    [{doc, "Server sends 50000 bytes to client in active once mode, that receives"
+      " them, sends them back, and closes."}].
 
 client_echos_active_once_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -363,12 +282,9 @@ client_echos_active_once_big(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
    
 %%--------------------------------------------------------------------
-client_echos_active_big(doc) -> 
-    ["Server sends 50000 bytes to client in active mode, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_active_big(suite) -> 
-    [];
+client_echos_active_big() ->
+    [{doc, "Server sends 50000 bytes to client in active mode, that receives them, "
+      "sends them back, and closes."}].
 
 client_echos_active_big(Config) when is_list(Config) -> 
      ClientOpts = ?config(client_opts, Config),
@@ -381,12 +297,9 @@ client_echos_active_big(Config) when is_list(Config) ->
 			ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-server_echos_passive_huge(doc) -> 
-    ["Client sends 500000 bytes to server in passive mode, that receives "
-     " them, sends them back, and closes."];
-
-server_echos_passive_huge(suite) -> 
-    [];
+server_echos_passive_huge() ->
+    [{doc, "Client sends 500000 bytes to server in passive mode, that receives "
+      " them, sends them back, and closes."}].
 
 server_echos_passive_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -399,12 +312,9 @@ server_echos_passive_huge(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-server_echos_active_once_huge(doc) -> 
-    ["Client sends 500000 bytes to server in active once mode, that receives "
-     "them, sends them back, and closes."];
-
-server_echos_active_once_huge(suite) -> 
-    [];
+server_echos_active_once_huge() ->
+    [{doc, "Client sends 500000 bytes to server in active once mode, that receives "
+      "them, sends them back, and closes."}].
 
 server_echos_active_once_huge(Config) when is_list(Config) -> 
         ClientOpts = ?config(client_opts, Config),
@@ -417,12 +327,9 @@ server_echos_active_once_huge(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-server_echos_active_huge(doc) -> 
-    ["Client sends 500000 bytes to server in active mode, that receives them, "
-     "sends them back, and closes."];
-
-server_echos_active_huge(suite) -> 
-    [];
+server_echos_active_huge() ->
+    [{doc, "Client sends 500000 bytes to server in active mode, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_active_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -435,12 +342,9 @@ server_echos_active_huge(Config) when is_list(Config) ->
 			ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_passive_huge(doc) -> 
-    ["Server sends 500000 bytes to client in passive mode, that receives "
-     "them, sends them back, and closes."];
-
-client_echos_passive_huge(suite) -> 
-    [];
+client_echos_passive_huge() ->
+    [{doc, "Server sends 500000 bytes to client in passive mode, that receives "
+     "them, sends them back, and closes."}].
 
 client_echos_passive_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -452,12 +356,9 @@ client_echos_passive_huge(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_active_once_huge(doc) -> 
-    ["Server sends 500000 bytes to client in active once mode, that receives "
-     "them, sends them back, and closes."];
-
-client_echos_active_once_huge(suite) -> 
-    [];
+client_echos_active_once_huge() ->
+    [{doc, "Server sends 500000 bytes to client in active once mode, that receives "
+      "them, sends them back, and closes."}].
 
 client_echos_active_once_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -469,12 +370,9 @@ client_echos_active_once_huge(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
    
 %%--------------------------------------------------------------------
-client_echos_active_huge(doc) -> 
-    ["Server sends 500000 bytes to client in active mode, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_active_huge(suite) -> 
-    [];
+client_echos_active_huge() ->
+    [{doc, "Server sends 500000 bytes to client in active mode, that receives them, "
+     "sends them back, and closes."}].
 
 client_echos_active_huge(Config) when is_list(Config) -> 
      ClientOpts = ?config(client_opts, Config),
@@ -486,6 +384,8 @@ client_echos_active_huge(Config) when is_list(Config) ->
 			ServerNode, Hostname).
  
 %%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
 
 server_echos_passive(Data, Length, ClientOpts, ServerOpts, 
 		     ClientNode, ServerNode, Hostname) ->
@@ -656,33 +556,33 @@ send(Socket, Data, Size, Repeate,F) ->
  
 sender(Socket, Data, Size) ->
     ok = send(Socket, Data, Size, 100, fun() -> do_recv(Socket, Data, Size, <<>>, false) end),
-    test_server:format("Sender recv: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Sender recv: ~p~n", [ssl:getopts(Socket, [active])]),
     ok.
 
 sender_once(Socket, Data, Size) ->
     send(Socket, Data, Size, 100, 
 	 fun() -> do_active_once(Socket, Data, Size, <<>>, false) end),
-    test_server:format("Sender active once: ~p~n", 
+    ct:print("Sender active once: ~p~n",
 		       [ssl:getopts(Socket, [active])]),
     ok.
 
 sender_active(Socket, Data, Size) ->
     F = fun() -> do_active(Socket, Data, Size, <<>>, false) end,
     send(Socket, Data, Size, 100, F),
-    test_server:format("Sender active: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Sender active: ~p~n", [ssl:getopts(Socket, [active])]),
     ok.
 
 echoer(Socket, Data, Size) ->
-    test_server:format("Echoer recv: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Echoer recv: ~p~n", [ssl:getopts(Socket, [active])]),
     echo(fun() -> do_recv(Socket, Data, Size, <<>>, true) end, 100).
 
 echoer_once(Socket, Data, Size) ->
-    test_server:format("Echoer active once: ~p ~n",
+    ct:print("Echoer active once: ~p ~n",
 		       [ssl:getopts(Socket, [active])]),
     echo(fun() -> do_active_once(Socket, Data, Size, <<>>, true) end, 100).
 
 echoer_active(Socket, Data, Size) ->
-    test_server:format("Echoer active: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Echoer active: ~p~n", [ssl:getopts(Socket, [active])]),
     echo(fun() -> do_active(Socket, Data, Size, <<>>, true) end, 100).
 
 echo(_Fun, 0) -> ok;