From 7c0a62d3d8083bf1aa8430aad35ad93c2a887de7 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 20 May 2016 08:02:38 +0200
Subject: [ic] Update the test suites to follow the new style

* Eliminate use of ?config(), ?t() and ?line() macros
* Remove the doc and suite clauses
---
 lib/ic/test/erl_client_c_server_SUITE.erl | 77 ++-----------------------------
 1 file changed, 4 insertions(+), 73 deletions(-)

(limited to 'lib/ic/test/erl_client_c_server_SUITE.erl')

diff --git a/lib/ic/test/erl_client_c_server_SUITE.erl b/lib/ic/test/erl_client_c_server_SUITE.erl
index cc0dbfda74..d592a611f7 100644
--- a/lib/ic/test/erl_client_c_server_SUITE.erl
+++ b/lib/ic/test/erl_client_c_server_SUITE.erl
@@ -47,7 +47,7 @@
 %% Add/remove code path and watchdog before/after each test case.
 %%
 init_per_testcase(_Case, Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     code:add_patha(DataDir),
 
     %% Since other test suites use the module m_i, we have
@@ -59,9 +59,9 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, WatchDog}| Config].
 
 end_per_testcase(_Case, Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     code:del_path(DataDir),
-    WatchDog = ?config(watchdog, Config),
+    WatchDog = proplists:get_value(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -93,174 +93,105 @@ end_per_group(_GroupName, Config) ->
 	Config.
 
 
-
-array1_test(doc) -> "";
-array1_test(suite) -> [];
 array1_test(Config) ->
     do_test(array1_test, Config). 
 
-array2_test(doc) -> "";
-array2_test(suite) -> [];
 array2_test(Config) ->
     do_test(array2_test, Config).
 
-bool_test(doc) -> "";
-bool_test(suite) -> [];
 bool_test(Config) ->
     do_test(bool_test, Config).
 
-char_test(doc) -> "";
-char_test(suite) -> [];
 char_test(Config) ->
     do_test(char_test, Config).
 
-double_test(doc) -> "";
-double_test(suite) -> [];
 double_test(Config) ->
     do_test(double_test, Config).
 
-enum_test(doc) -> "";
-enum_test(suite) -> [];
 enum_test(Config) ->
     do_test(enum_test, Config).
 
-inline_sequence_test(doc) -> "";
-inline_sequence_test(suite) -> [];
 inline_sequence_test(Config) ->
     do_test(inline_sequence_test, Config).
 
-longlong_test(doc) -> "";
-longlong_test(suite) -> [];
 longlong_test(Config) ->
     do_test(longlong_test, Config).
 
-long_test(doc) -> "";
-long_test(suite) -> [];
 long_test(Config) ->
     do_test(long_test, Config).
 
-octet_test(doc) -> "";
-octet_test(suite) -> [];
 octet_test(Config) ->
     do_test(octet_test, Config).
 
-pid_test(doc) -> "";
-pid_test(suite) -> [];
 pid_test(Config) ->
     do_test(pid_test, Config).
 
-port_test(doc) -> "";
-port_test(suite) -> [];
 port_test(Config) ->
     do_test(port_test, Config).
 
-ref_test(doc) -> "";
-ref_test(suite) -> [];
 ref_test(Config) ->
     do_test(ref_test, Config).
 
-seq1_test(doc) -> "";
-seq1_test(suite) -> [];
 seq1_test(Config) ->
     do_test(seq1_test, Config).
 
-seq2_test(doc) -> "";
-seq2_test(suite) -> [];
 seq2_test(Config) ->
     do_test(seq2_test, Config).
 
-seq3_test(doc) -> "";
-seq3_test(suite) -> [];
 seq3_test(Config) ->
     do_test(seq3_test, Config).
 
-seq4_test(doc) -> "";
-seq4_test(suite) -> [];
 seq4_test(Config) ->
     do_test(seq4_test, Config).
 
-seq5_test(doc) -> "";
-seq5_test(suite) -> [];
 seq5_test(Config) ->
     do_test(seq5_test, Config).
 
-string1_test(doc) -> "";
-string1_test(suite) -> [];
 string1_test(Config) ->
     do_test(string1_test, Config).
 
-string2_test(doc) -> "";
-string2_test(suite) -> [];
 string2_test(Config) ->
     do_test(string2_test, Config).
 
-string3_test(doc) -> "";
-string3_test(suite) -> [];
 string3_test(Config) ->
     do_test(string3_test, Config).
 
-string4_test(doc) -> "";
-string4_test(suite) -> [];
 string4_test(Config) ->
     do_test(string4_test, Config).
 
-struct2_test(doc) -> "";
-struct2_test(suite) -> [];
 struct2_test(Config) ->
     do_test(struct2_test, Config).
 
-struct_test(doc) -> "";
-struct_test(suite) -> [];
 struct_test(Config) ->
     do_test(struct_test, Config).
 
-term_sequence_test(doc) -> "";
-term_sequence_test(suite) -> [];
 term_sequence_test(Config) ->
     do_test(term_sequence_test, Config).
 
-term_struct_test(doc) -> "";
-term_struct_test(suite) -> [];
 term_struct_test(Config) ->
     do_test(term_struct_test, Config).
 
-term_test(doc) -> "";
-term_test(suite) -> [];
 term_test(Config) ->
     do_test(term_test, Config).
 
-typedef_test(doc) -> "";
-typedef_test(suite) -> [];
 typedef_test(Config) ->
     do_test(typedef_test, Config).
 
-ulonglong_test(doc) -> "";
-ulonglong_test(suite) -> [];
 ulonglong_test(Config) ->
     do_test(ulonglong_test, Config).
 
-ulong_test(doc) -> "";
-ulong_test(suite) -> [];
 ulong_test(Config) ->
     do_test(ulong_test, Config).
 
-ushort_test(doc) -> "";
-ushort_test(suite) -> [];
 ushort_test(Config) ->
     do_test(ushort_test, Config).
 
-void_test(doc) -> "";
-void_test(suite) -> [];
 void_test(Config) ->
     do_test(void_test, Config).
 
-wchar_test(doc) -> "";
-wchar_test(suite) -> [];
 wchar_test(Config) ->
     do_test(wchar_test, Config).
 
-wstring1_test(doc) -> "";
-wstring1_test(suite) -> [];
 wstring1_test(Config) ->
     do_test(wstring1_test, Config).
 
@@ -270,7 +201,7 @@ do_test(Case, Config) ->
     process_flag(trap_exit, true),
     Node = atom_to_list(node()),
     [_NodeName, HostName] = string:tokens(Node, "@"),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
     Cookie = atom_to_list(erlang:get_cookie()),
     ServerNodeName = atom_to_list(?C_SERVER_NODE_NAME), 
-- 
cgit v1.2.3