odbc: Convert doc clauses form test_server to ct

4 files changed, 215 insertions, 234 deletions

diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index d43a81f2cc..261dfc6f20 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -160,8 +160,8 @@ end_per_testcase_common(Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-commit(doc)->
-    ["Test the use of explicit commit"];
+commit()->
+    [{doc,"Test the use of explicit commit"}].
 commit(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), 
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -200,8 +200,8 @@ commit(Config)  ->
     ok = odbc:disconnect(Ref).
 %%-------------------------------------------------------------------------
 
-rollback(doc)->
-    ["Test the use of explicit rollback"];
+rollback()->
+    [{doc,"Test the use of explicit rollback"}].
 rollback(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -239,8 +239,8 @@ rollback(Config)  ->
     ok = odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
-not_explicit_commit(doc) ->
-    ["Test what happens if you try using commit on a auto_commit connection."];
+not_explicit_commit() ->
+    [{doc,"Test what happens if you try using commit on a auto_commit connection."}].
 not_explicit_commit(_Config) ->
     {ok, Ref} = 
 	odbc:connect(?RDBMS:connection_string(), [{auto_commit, on}] ++
@@ -249,8 +249,8 @@ not_explicit_commit(_Config) ->
     ok = odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
-not_exist_db(doc) ->
-    ["Tests valid data format but invalid data in the connection parameters."];
+not_exist_db() ->
+    [{doc,"Tests valid data format but invalid data in the connection parameters."}].
 not_exist_db(_Config)  ->
     {error, _} = odbc:connect("DSN=foo;UID=bar;PWD=foobar",
 			      odbc_test_lib:platform_options()),
@@ -258,8 +258,8 @@ not_exist_db(_Config)  ->
     ct:sleep(100).
 
 %%-------------------------------------------------------------------------
-no_c_executable(doc) ->
-    "Test what happens if the port-program can not be found";
+no_c_executable() ->
+    [{doc,"Test what happens if the port-program can not be found"}].
 no_c_executable(_Config) ->
     process_flag(trap_exit, true),
     Dir = filename:nativename(filename:join(code:priv_dir(odbc), 
@@ -284,8 +284,8 @@ no_c_executable(_Config) ->
     end.
 %%------------------------------------------------------------------------
 
-port_dies(doc) ->
-    "Tests what happens if the port program dies";
+port_dies() ->
+    [{doc,"Tests what happens if the port program dies"}].
 port_dies(_Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     {status, _} = process_info(Ref, status),   
@@ -305,8 +305,8 @@ port_dies(_Config) ->
 
 
 %%-------------------------------------------------------------------------
-control_process_dies(doc) ->
-    "Tests what happens if the Erlang control process dies";
+control_process_dies() ->
+    [{doc,"Tests what happens if the Erlang control process dies"}].
 control_process_dies(_Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     process_flag(trap_exit, true),
@@ -323,8 +323,8 @@ control_process_dies(_Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-client_dies_normal(doc) ->
-    ["Client dies with reason normal."];
+client_dies_normal() ->
+    [{doc,"Client dies with reason normal."}].
 client_dies_normal(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_normal, [self()]),
 
@@ -354,8 +354,8 @@ client_normal(Pid) ->
 
 
 %%-------------------------------------------------------------------------
-client_dies_timeout(doc) ->
-    ["Client dies with reason timeout."];
+client_dies_timeout() ->
+    [{doc,"Client dies with reason timeout."}].
 client_dies_timeout(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_timeout, [self()]),
 
@@ -385,8 +385,8 @@ client_timeout(Pid) ->
 
 
 %%-------------------------------------------------------------------------
-client_dies_error(doc) ->
-    ["Client dies with reason error."];
+client_dies_error() ->
+    [{doc,"Client dies with reason error."}].
 client_dies_error(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_error, [self()]),
 
@@ -416,8 +416,8 @@ client_error(Pid) ->
 
 
 %%-------------------------------------------------------------------------
-connect_timeout(doc) ->
-    ["Test the timeout for the connect function."];
+connect_timeout() ->
+    [{doc,"Test the timeout for the connect function."}].
 connect_timeout(Config) when is_list(Config) ->
     {'EXIT',timeout} = (catch odbc:connect(?RDBMS:connection_string(),
 					   [{timeout, 0}] ++
@@ -427,9 +427,9 @@ connect_timeout(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-connect_port_timeout(doc) ->
-    ["Test the timeout for the port program to connect back to the odbc "
-     "application within the connect function."];
+connect_port_timeout() ->
+    [{"Test the timeout for the port program to connect back to the odbc "
+     "application within the connect function."}].
 connect_port_timeout(Config) when is_list(Config) ->
     %% Application environment var 'port_timeout' has been set to 0 by
     %% init_per_testcase/2.
@@ -437,9 +437,9 @@ connect_port_timeout(Config) when is_list(Config) ->
                                    odbc_test_lib:platform_options()).
 
 %%-------------------------------------------------------------------------
-timeout(doc) ->
-    ["Test that timeouts don't cause unwanted behavior sush as receiving"
-     " an anwser to a previously tiemed out query."];
+timeout() ->
+    [{"Test that timeouts don't cause unwanted behavior sush as receiving"
+     " an anwser to a previously tiemed out query."}].
 timeout(Config)  when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
@@ -520,9 +520,9 @@ update_table_timeout(Table, TimeOut, Pid) ->
 
     ok = odbc:disconnect(Ref).
 %%-------------------------------------------------------------------------
-many_timeouts(doc) ->
-    ["Tests that many consecutive timeouts lead to that the connection "
-     "is shutdown."];
+many_timeouts() ->
+    [{doc, "Tests that many consecutive timeouts lead to that the connection "
+     "is shutdown."}].
 many_timeouts(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -579,9 +579,9 @@ loop_many_timouts(Ref, UpdateQuery, TimeOut) ->
 	    ok
     end.
 %%-------------------------------------------------------------------------
-timeout_reset(doc) ->
-    ["Check that the number of consecutive timouts is reset to 0 when "
-     "a successful call to the database is made."];
+timeout_reset() ->
+    [{doc, "Check that the number of consecutive timouts is reset to 0 when "
+      "a successful call to the database is made."}].
 timeout_reset(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -676,8 +676,8 @@ loop_timout_reset(Ref, UpdateQuery, TimeOut, NumTimeouts) ->
 
 %%-------------------------------------------------------------------------
 
-disconnect_on_timeout(doc) ->
-    ["Check that disconnect after a time out works properly"]; 
+disconnect_on_timeout() ->
+    [{doc,"Check that disconnect after a time out works properly"}].
 disconnect_on_timeout(Config) when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
@@ -724,9 +724,9 @@ update_table_disconnect_on_timeout(Table, TimeOut, Pid) ->
     end.
 
 %%-------------------------------------------------------------------------
-connection_closed(doc) ->
-    ["Checks that you get an appropriate error message if you try to"
-     " use a connection that has been closed"];
+connection_closed() ->
+    [{doc, "Checks that you get an appropriate error message if you try to"
+     " use a connection that has been closed"}].
 connection_closed(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
 
@@ -750,8 +750,8 @@ connection_closed(Config) when is_list(Config) ->
     {error, connection_closed} = odbc:commit(Ref, commit).
 
 %%-------------------------------------------------------------------------
-disable_scrollable_cursors(doc) ->
-    ["Test disabling of scrollable cursors."];
+disable_scrollable_cursors() ->
+    [{doc,"Test disabling of scrollable cursors."}].
 disable_scrollable_cursors(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{scrollable_cursors, off}]),
@@ -787,9 +787,9 @@ disable_scrollable_cursors(Config) when is_list(Config) ->
     {selected, _ColNames,[]} = odbc:select(Ref, next, 1).
 
 %%-------------------------------------------------------------------------
-return_rows_as_lists(doc)->
-    ["Test the option that a row may be returned as a list instead " 
-     "of a tuple. Too be somewhat backward compatible."];
+return_rows_as_lists()->
+    [{doc,"Test the option that a row may be returned as a list instead " 
+     "of a tuple. Too be somewhat backward compatible."}].
 return_rows_as_lists(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{tuple_row, off}] ++ odbc_test_lib:platform_options()),
@@ -831,8 +831,8 @@ return_rows_as_lists(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-api_missuse(doc)->
-    ["Test that behaviour of the control process if the api is abused"];
+api_missuse()->
+    [{doc,"Test that behaviour of the control process if the api is abused"}].
 api_missuse(Config) when is_list(Config)->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
@@ -862,10 +862,11 @@ transaction_support_str(_) ->
 
 
 %%-------------------------------------------------------------------------
-extended_errors(doc)->
-    ["Test the extended errors connection option: When off; the old behaviour of just an error "
-     "string is returned on error. When on, the error string is replaced by a 3 element tuple "
-     "that also exposes underlying ODBC provider error codes."];
+extended_errors()->
+    [{doc, 
+      "Test the extended errors connection option: When off; the old behaviour of just an error "
+      "string is returned on error. When on, the error string is replaced by a 3 element tuple "
+      "that also exposes underlying ODBC provider error codes."}].
 extended_errors(Config) when is_list(Config)->
     Table = proplists:get_value(tableName, Config),
     {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 830e05e4f2..a3a4bc78eb 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -243,8 +243,8 @@ end_per_testcase(_TestCase, Config) ->
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 
-char_fixed_lower_limit(doc) ->
-    ["Tests fixed length char data type lower boundaries."];
+char_fixed_lower_limit() ->
+    [{doc,"Tests fixed length char data type lower boundaries."}].
 char_fixed_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -282,8 +282,8 @@ char_fixed_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-char_fixed_upper_limit(doc) ->
-    ["Tests fixed length char data type upper boundaries."];
+char_fixed_upper_limit() ->
+    [{doc,"Tests fixed length char data type upper boundaries."}].
 char_fixed_upper_limit(Config) when is_list(Config) ->
 
     case ?RDBMS of
@@ -330,9 +330,9 @@ char_fixed_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-char_fixed_padding(doc) ->
-    ["Tests that data that is shorter than the given size is padded " 
-     "with blanks."];
+char_fixed_padding() ->
+    [{doc, "Tests that data that is shorter than the given size is padded " 
+     "with blanks."}].
 char_fixed_padding(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -356,8 +356,8 @@ char_fixed_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-varchar_lower_limit(doc) ->
-    ["Tests variable length char data type lower boundaries."];
+varchar_lower_limit() ->
+    [{doc,"Tests variable length char data type lower boundaries."}].
 varchar_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -394,8 +394,8 @@ varchar_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-varchar_upper_limit(doc) ->
-    ["Tests variable length char data type upper boundaries."];
+varchar_upper_limit() ->
+    [{doc,"Tests variable length char data type upper boundaries."}].
 varchar_upper_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -442,9 +442,9 @@ varchar_upper_limit(Config) when is_list(Config) ->
     end.
 %%-------------------------------------------------------------------------
 
-varchar_no_padding(doc) ->
-    ["Tests that data that is shorter than the given max size is not padded " 
-     "with blanks."];
+varchar_no_padding() ->
+    [{doc, "Tests that data that is shorter than the given max size is not padded " 
+     "with blanks."}].
 varchar_no_padding(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -466,8 +466,8 @@ varchar_no_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-text_lower_limit(doc) ->
-    ["Tests 'long' char data type lower boundaries."];
+text_lower_limit() ->
+    [{doc,"Tests 'long' char data type lower boundaries."}].
 text_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -487,8 +487,8 @@ text_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-text_upper_limit(doc) ->
-    [];
+text_upper_limit() ->
+    [{doc,"Tests 'text' char data type upper boundaries."}].
 text_upper_limit(Config) when is_list(Config) ->
     
     {skip,"Consumes too much resources" }.
@@ -515,8 +515,8 @@ text_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_char_fixed_lower_limit(doc) ->
-    ["Tests fixed length char data type lower boundaries."];
+binary_char_fixed_lower_limit() ->
+    [{doc,"Tests fixed length char data type lower boundaries."}].
 binary_char_fixed_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -558,8 +558,8 @@ binary_char_fixed_lower_limit(Config) when is_list(Config) ->
 		       ++ "')").
 %%-------------------------------------------------------------------------
 
-binary_char_fixed_upper_limit(doc) ->
-    ["Tests fixed length char data type upper boundaries."];
+binary_char_fixed_upper_limit() ->
+    [{doc,"Tests fixed length char data type upper boundaries."}].
 binary_char_fixed_upper_limit(Config) when is_list(Config) ->
 
     case ?RDBMS of
@@ -607,9 +607,9 @@ binary_char_fixed_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_char_fixed_padding(doc) ->
-    ["Tests that data that is shorter than the given size is padded " 
-     "with blanks."];
+binary_char_fixed_padding() ->
+    [{doc, "Tests that data that is shorter than the given size is padded " 
+     "with blanks."}].
 binary_char_fixed_padding(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -633,8 +633,8 @@ binary_char_fixed_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_varchar_lower_limit(doc) ->
-    ["Tests variable length char data type lower boundaries."];
+binary_varchar_lower_limit() ->
+    [{doc,"Tests variable length char data type lower boundaries."}].
 binary_varchar_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -674,8 +674,8 @@ binary_varchar_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_varchar_upper_limit(doc) ->
-    ["Tests variable length char data type upper boundaries."];
+binary_varchar_upper_limit() ->
+    [{doc,"Tests variable length char data type upper boundaries."}].
 binary_varchar_upper_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -721,9 +721,9 @@ binary_varchar_upper_limit(Config) when is_list(Config) ->
     end.
 %%-------------------------------------------------------------------------
 
-binary_varchar_no_padding(doc) ->
-    ["Tests that data that is shorter than the given max size is not padded " 
-     "with blanks."];
+binary_varchar_no_padding() ->
+    [{doc,"Tests that data that is shorter than the given max size is not padded " 
+     "with blanks."}].
 binary_varchar_no_padding(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -745,8 +745,8 @@ binary_varchar_no_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_text_lower_limit(doc) ->
-    ["Tests 'long' char data type lower boundaries."];
+binary_text_lower_limit() ->
+    [{doc,"Tests 'long' char data type lower boundaries."}].
 binary_text_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -766,8 +766,8 @@ binary_text_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_text_upper_limit(doc) ->
-    [];
+binary_text_upper_limit() ->
+    [{doc,"Tests text char data type upper boundaries."}].
 binary_text_upper_limit(Config) when is_list(Config) ->
     
     {skip,"Consumes too much resources" }.
@@ -795,8 +795,8 @@ binary_text_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-tiny_int_lower_limit(doc) ->
-    ["Tests integer of type tinyint."];
+tiny_int_lower_limit() ->
+    [{doc,"Tests integer of type tinyint."}].
 tiny_int_lower_limit(Config) when is_list(Config) -> 
     case ?RDBMS of
 	postgres ->
@@ -827,8 +827,8 @@ tiny_int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-tiny_int_upper_limit(doc) ->
-    ["Tests integer of type tinyint."];
+tiny_int_upper_limit() ->
+    [{doc,"Tests integer of type tinyint."}].
 tiny_int_upper_limit(Config) when is_list(Config) ->
     case ?RDBMS of
 	postgres ->
@@ -859,8 +859,8 @@ tiny_int_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-small_int_lower_limit(doc) ->
-    ["Tests integer of type smallint."];
+small_int_lower_limit() ->
+    [{doc,"Tests integer of type smallint."}].
 small_int_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -886,8 +886,8 @@ small_int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-small_int_upper_limit(doc) ->
-    ["Tests integer of type smallint."];
+small_int_upper_limit() ->
+    [{doc,"Tests integer of type smallint."}].
 small_int_upper_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -912,8 +912,8 @@ small_int_upper_limit(Config) when is_list(Config) ->
 		       ++ "')").
 
 %%-------------------------------------------------------------------------
-int_lower_limit(doc) ->
-    ["Tests integer of type int."];
+int_lower_limit() ->
+    [{doc,"Tests integer of type int."}].
 int_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -938,8 +938,8 @@ int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-int_upper_limit(doc) ->
-    ["Tests integer of type int."];
+int_upper_limit() ->
+    [{doc,"Tests integer of type int."}].
 int_upper_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -964,8 +964,8 @@ int_upper_limit(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-big_int_lower_limit(doc) ->
-    ["Tests integer of type bigint"];
+big_int_lower_limit() ->
+    [{doc,"Tests integer of type bigint"}].
 big_int_lower_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -991,8 +991,8 @@ big_int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-big_int_upper_limit(doc) ->
-    ["Tests integer of type bigint."];
+big_int_upper_limit() ->
+    [{doc,"Tests integer of type bigint."}].
 big_int_upper_limit(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1017,8 +1017,6 @@ big_int_upper_limit(Config) when is_list(Config) ->
 		       ++ "')").
 %%-------------------------------------------------------------------------
 
-bit_false(doc) ->
-    [""];
 bit_false(Config) when is_list(Config) ->  
     case ?RDBMS of
 	oracle ->
@@ -1049,8 +1047,6 @@ bit_false(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-bit_true(doc) ->
-    [""];
 bit_true(Config) when is_list(Config) ->
     case ?RDBMS of
 	oracle ->
@@ -1081,8 +1077,7 @@ bit_true(Config) when is_list(Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-float_lower_limit(doc) ->
-    [""];
+
 float_lower_limit(Config) when is_list(Config) ->   
 
     Ref = proplists:get_value(connection_ref, Config),   
@@ -1129,8 +1124,7 @@ float_lower_limit(Config) when is_list(Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-float_upper_limit(doc) ->
-    [""];
+
 float_upper_limit(Config) when is_list(Config) ->   
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1159,8 +1153,8 @@ float_upper_limit(Config) when is_list(Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-float_zero(doc) ->
-    ["Test the float value zero."];
+float_zero() ->
+    [{doc,"Test the float value zero."}].
 float_zero(Config) when is_list(Config) ->   
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1176,8 +1170,8 @@ float_zero(Config) when is_list(Config) ->
     SelectResult =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table).
 %%-------------------------------------------------------------------------
-real_zero(doc) ->
-    ["Test the real value zero."];
+real_zero() ->
+    [{doc,"Test the real value zero."}].
 real_zero(Config) when is_list(Config) ->   
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1199,8 +1193,6 @@ real_zero(Config) when is_list(Config) ->
 		odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table)
     end.
 %%------------------------------------------------------------------------
-dec_long(doc) ->
-    [""];
 dec_long(suit) ->
     [];
 dec_long(Config) when is_list(Config) ->
@@ -1218,8 +1210,6 @@ dec_long(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     ["FIELD"] = odbc_test_lib:to_upper(Fields).
 %%------------------------------------------------------------------------
-dec_double(doc) ->
-    [""];
 dec_double(suit) ->
     [];
 dec_double(Config) when is_list(Config) ->
@@ -1266,8 +1256,6 @@ dec_double(Config) when is_list(Config) ->
     ["FIELD"] = odbc_test_lib:to_upper(Fields2).
 
 %%------------------------------------------------------------------------
-dec_bignum(doc) ->
-    [""];
 dec_bignum(suit) ->
     [];
 dec_bignum(Config) when is_list(Config) ->
@@ -1298,8 +1286,6 @@ dec_bignum(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     ["FIELD"] = odbc_test_lib:to_upper(Fields1).
 %%------------------------------------------------------------------------
-num_long(doc) ->
-    [""];
 num_long(suit) ->
     [];
 num_long(Config) when is_list(Config) ->
@@ -1317,8 +1303,6 @@ num_long(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     ["FIELD"] = odbc_test_lib:to_upper(Fields).
 %%------------------------------------------------------------------------
-num_double(doc) ->
-    [""];
 num_double(suit) ->
     [];
 num_double(Config) when is_list(Config) ->
@@ -1363,8 +1347,6 @@ num_double(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
      ["FIELD"] = odbc_test_lib:to_upper(Fields2).
 %%------------------------------------------------------------------------
-num_bignum(doc) ->
-    [""];
 num_bignum(suit) ->
     [];
 num_bignum(Config) when is_list(Config) ->
@@ -1396,8 +1378,8 @@ num_bignum(Config) when is_list(Config) ->
     ["FIELD"] = odbc_test_lib:to_upper(Fields1).
 
 %%------------------------------------------------------------------------
-utf8(doc) ->
-    ["Test unicode support"];
+utf8() ->
+    [{doc,"Test unicode support"}].
 utf8(suit) ->
     [];
 utf8(Config) when is_list(Config) ->
@@ -1441,8 +1423,8 @@ utf8(Config) when is_list(Config) ->
     Latin1Data = Result.
 %%------------------------------------------------------------------------
 
-nchar(doc) ->
-    ["Test unicode nchar support in sqlserver"];
+nchar() ->
+    [{doc,"Test unicode nchar support in sqlserver"}].
 nchar(suit) ->
     [];
 nchar(Config) when is_list(Config) ->
@@ -1457,8 +1439,8 @@ nchar(Config) when is_list(Config) ->
 
 %%------------------------------------------------------------------------
 
-nvarchar(doc) ->
-    ["Test 'unicode' nvarchar support"];
+nvarchar() ->
+    [{doc,"Test 'unicode' nvarchar support"}].
 nvarchar(suit) ->
     [];
 nvarchar(Config) when is_list(Config) ->
@@ -1472,8 +1454,6 @@ nvarchar(Config) when is_list(Config) ->
     w_char_support(Ref, Table, sql_wlongvarchar, 50).
 
 %%------------------------------------------------------------------------
-timestamp(doc) ->
-    [""];
 timestamp(suit) ->
     [];
 timestamp(Config) when is_list(Config) ->
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index a49cd74a43..c283872965 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -170,8 +170,8 @@ end_per_testcase(_Case, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-stored_proc(doc)->
-    ["Test stored proc with OUT param"];
+stored_proc()->
+    [{doc, "Test stored proc with OUT param"}].
 stored_proc(Config) when is_list(Config) ->
     case ?RDBMS of
         X when X == oracle; X == postgres->
@@ -189,8 +189,8 @@ stored_proc(Config) when is_list(Config) ->
 	    {skip, "stored proc not yet supported"}
     end.
 
-sql_query(doc)->
-    ["Test the common cases"];
+sql_query()->
+    [{doc, "Test the common cases"}].
 sql_query(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
     Table = proplists:get_value(tableName, Config),
@@ -231,10 +231,10 @@ sql_query(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-select_count(doc) -> 
-    ["Tests select_count/[2,3]'s timeout, "
-     " select_count's functionality will be better tested by other tests "
-     " such as first."];
+select_count() -> 
+    [{doc, "Tests select_count/[2,3]'s timeout, "
+	   " select_count's functionality will be better tested by other tests "
+      " such as first."}].
 select_count(sute) -> [];
 select_count(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
@@ -253,8 +253,8 @@ select_count(Config) when is_list(Config) ->
 	(catch odbc:select_count(Ref, "SELECT * FROM ", -1)),
     ok.
 %%-------------------------------------------------------------------------
-first(doc) ->
-    ["Tests first/[1,2]"];
+first() ->
+    [doc, {"Tests first/[1,2]"}].
 first(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
     Table = proplists:get_value(tableName, Config),
@@ -279,8 +279,8 @@ first(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-last(doc) ->
-    ["Tests last/[1,2]"];
+last() ->
+    [{doc, "Tests last/[1,2]"}].
 last(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
     Table = proplists:get_value(tableName, Config),
@@ -305,8 +305,8 @@ last(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-next(doc) ->
-    ["Tests next/[1,2]"];
+next() ->
+    [{doc, "Tests next/[1,2]"}].
 next(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
     Table = proplists:get_value(tableName, Config),
@@ -330,8 +330,8 @@ next(Config) when is_list(Config) ->
     {'EXIT', {function_clause, _}} = (catch odbc:next(Ref, -1)),
     ok.
 %%-------------------------------------------------------------------------
-prev(doc) ->
-    ["Tests prev/[1,2]"];
+prev() ->
+    [{doc, "Tests prev/[1,2]"}].
 prev(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
     Table = proplists:get_value(tableName, Config),
@@ -358,8 +358,8 @@ prev(Config) when is_list(Config) ->
     {'EXIT', {function_clause, _}} = (catch odbc:prev(Ref, -1)),
     ok.
 %%-------------------------------------------------------------------------
-select_next(doc) ->
-    ["Tests select/[4,5] with CursorRelation = next "];
+select_next() ->
+    [{doc, "Tests select/[4,5] with CursorRelation = next "}].
 select_next(suit) -> [];
 select_next(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
@@ -399,8 +399,8 @@ select_next(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-select_relative(doc) ->
-    ["Tests select/[4,5] with CursorRelation = relative "];
+select_relative() ->
+    [{doc, "Tests select/[4,5] with CursorRelation = relative "}].
 select_relative(suit) -> [];
 select_relative(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
@@ -440,8 +440,8 @@ select_relative(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-select_absolute(doc) ->
-    ["Tests select/[4,5] with CursorRelation = absolute "];
+select_absolute() ->
+    [{doc, "Tests select/[4,5] with CursorRelation = absolute "}].
 select_absolute(suit) -> [];
 select_absolute(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),
@@ -474,8 +474,8 @@ select_absolute(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-create_table_twice(doc) ->
-    ["Test what happens if you try to create the same table twice."];
+create_table_twice() ->
+    [{doc, "Test what happens if you try to create the same table twice."}].
 create_table_twice(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -492,8 +492,8 @@ create_table_twice(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-delete_table_twice(doc) ->
-    ["Test what happens if you try to delete the same table twice."];
+delete_table_twice() ->
+    [{doc, "Test what happens if you try to delete the same table twice."}].
 delete_table_twice(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -508,8 +508,8 @@ delete_table_twice(Config) when is_list(Config) ->
     ok.
 
 %-------------------------------------------------------------------------
-duplicate_key(doc) ->
-    ["Test what happens if you try to use the same key twice"];
+duplicate_key() ->
+    [{doc, "Test what happens if you try to use the same key twice"}].
 duplicate_key(suit) -> [];
 duplicate_key(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
@@ -529,9 +529,9 @@ duplicate_key(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-not_connection_owner(doc) ->
-    ["Test what happens if a process that did not start the connection"
-     " tries to acess it."];
+not_connection_owner() ->
+    [{doc, "Test what happens if a process that did not start the connection"
+	   " tries to acess it."}].
 not_connection_owner(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -553,9 +553,9 @@ not_owner(Pid, Ref, Table) ->
     Pid ! continue.
 
 %%-------------------------------------------------------------------------
-no_result_set(doc) ->
-    ["Tests what happens if you try to use a function that needs an "
-     "associated result set when there is none."];
+no_result_set() ->
+    [{doc, "Tests what happens if you try to use a function that needs an "
+      "associated result set when there is none."}].
 no_result_set(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
 
@@ -570,8 +570,8 @@ no_result_set(Config) when is_list(Config) ->
 	odbc:select(Ref, {relative, 2}, 1),
     ok.
 %%-------------------------------------------------------------------------
-query_error(doc) ->
-    ["Test what happens if there is an error in the query."];
+query_error() ->
+    [{doc, "Test what happens if there is an error in the query."}].
 query_error(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -591,8 +591,8 @@ query_error(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-multiple_select_result_sets(doc) ->
-    ["Test what happens if you have a batch of select queries."];
+multiple_select_result_sets() ->
+    [{doc, "Test what happens if you have a batch of select queries."}].
 multiple_select_result_sets(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
@@ -624,9 +624,9 @@ multiple_select_result_sets(Config) when is_list(Config) ->
     end.
 	    
 %%-------------------------------------------------------------------------
-multiple_mix_result_sets(doc) ->
-    ["Test what happens if you have a batch of select and other type of"
-     " queries."];
+multiple_mix_result_sets() ->
+    [{doc, "Test what happens if you have a batch of select and other type of"
+      " queries."}].
 multiple_mix_result_sets(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
@@ -656,8 +656,8 @@ multiple_mix_result_sets(Config) when is_list(Config) ->
 	    {skip, "multiple result_set not supported"}
     end.
 %%-------------------------------------------------------------------------
-multiple_result_sets_error(doc) ->
-    ["Test what happens if one of the batched queries fails."];
+multiple_result_sets_error() ->
+    [{doc, "Test what happens if one of the batched queries fails."}].
 multiple_result_sets_error(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
@@ -689,8 +689,8 @@ multiple_result_sets_error(Config) when is_list(Config) ->
     end.   
 
 %%-------------------------------------------------------------------------
-param_insert_tiny_int(doc)->
-    ["Test insertion of tiny ints by parameterized queries."];
+param_insert_tiny_int()->
+    [{doc,"Test insertion of tiny ints by parameterized queries."}].
 param_insert_tiny_int(Config) when is_list(Config) ->
     case ?RDBMS of 
 	sqlserver ->
@@ -724,8 +724,8 @@ param_insert_tiny_int(Config) when is_list(Config) ->
 	    {skip, "Type tiniyint not supported"}
     end.
 %%-------------------------------------------------------------------------
-param_insert_small_int(doc)->
-    ["Test insertion of small ints by parameterized queries."];
+param_insert_small_int()->
+    [{doc,"Test insertion of small ints by parameterized queries."}].
 param_insert_small_int(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -754,8 +754,8 @@ param_insert_small_int(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_int(doc)->
-    ["Test insertion of ints by parameterized queries."];
+param_insert_int()->
+    [{doc,"Test insertion of ints by parameterized queries."}].
 param_insert_int(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -784,8 +784,8 @@ param_insert_int(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_integer(doc)->
-    ["Test insertion of integers by parameterized queries."];
+param_insert_integer()->
+    [{doc,"Test insertion of integers by parameterized queries."}].
 param_insert_integer(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -814,8 +814,8 @@ param_insert_integer(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_decimal(doc)->
-    ["Test insertion of decimal numbers by parameterized queries."];
+param_insert_decimal()->
+    [{doc,"Test insertion of decimal numbers by parameterized queries."}].
 param_insert_decimal(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -863,8 +863,8 @@ param_insert_decimal(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_numeric(doc)->
-    ["Test insertion of numeric numbers by parameterized queries."];
+param_insert_numeric()->
+    [{doc,"Test insertion of numeric numbers by parameterized queries."}].
 param_insert_numeric(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -912,8 +912,8 @@ param_insert_numeric(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_char(doc)->
-    ["Test insertion of fixed length string by parameterized queries."];
+param_insert_char()->
+    [{doc,"Test insertion of fixed length string by parameterized queries."}].
 param_insert_char(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -946,8 +946,8 @@ param_insert_char(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_character(doc)->
-    ["Test insertion of fixed length string by parameterized queries."];
+param_insert_character()->
+    [{doc,"Test insertion of fixed length string by parameterized queries."}].
 param_insert_character(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -981,8 +981,8 @@ param_insert_character(Config) when is_list(Config) ->
     ok.
 
 %%------------------------------------------------------------------------
-param_insert_char_varying(doc)->
-    ["Test insertion of variable length strings by parameterized queries."];
+param_insert_char_varying()->
+    [{doc,"Test insertion of variable length strings by parameterized queries."}].
 param_insert_char_varying(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1016,8 +1016,8 @@ param_insert_char_varying(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_character_varying(doc)->
-    ["Test insertion of variable length strings by parameterized queries."];
+param_insert_character_varying()->
+    [{doc,"Test insertion of variable length strings by parameterized queries."}].
 param_insert_character_varying(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1051,8 +1051,8 @@ param_insert_character_varying(Config) when is_list(Config) ->
 				[{{sql_varchar, 10}, ["1", 2]}])), 
     ok.
 %%-------------------------------------------------------------------------
-param_insert_float(doc)->
-    ["Test insertion of floats by parameterized queries."];
+param_insert_float()->
+    [{doc,"Test insertion of floats by parameterized queries."}].
 param_insert_float(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1088,8 +1088,8 @@ param_insert_float(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_real(doc)->
-    ["Test insertion of real numbers by parameterized queries."];
+param_insert_real()->
+    [{doc,"Test insertion of real numbers by parameterized queries."}].
 param_insert_real(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1127,8 +1127,8 @@ param_insert_real(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_double(doc)->
-    ["Test insertion of doubles by parameterized queries."];
+param_insert_double()->
+    [{doc,"Test insertion of doubles by parameterized queries."}].
 param_insert_double(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1164,8 +1164,8 @@ param_insert_double(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_mix(doc)->
-    ["Test insertion of a mixture of datatypes by parameterized queries."];
+param_insert_mix()->
+    [{doc,"Test insertion of a mixture of datatypes by parameterized queries."}].
 param_insert_mix(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1189,8 +1189,8 @@ param_insert_mix(Config) when is_list(Config) ->
 	odbc:sql_query(Ref, "SELECT * FROM " ++ Table),
     ok.
 %%-------------------------------------------------------------------------
-param_update(doc)->
-    ["Test parameterized update query."];
+param_update()->
+    [{doc,"Test parameterized update query."}].
 param_update(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1222,9 +1222,9 @@ param_update(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-delete_nonexisting_row(doc) ->		% OTP-5759
-    ["Make a delete...where with false conditions (0 rows deleted). ",
-     "This used to give an error message (see ticket OTP-5759)."];
+delete_nonexisting_row() ->		% OTP-5759
+    [{doc, "Make a delete...where with false conditions (0 rows deleted). ",
+     "This used to give an error message (see ticket OTP-5759)."}].
 delete_nonexisting_row(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1251,8 +1251,8 @@ delete_nonexisting_row(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_delete(doc) ->
-    ["Test parameterized delete query."];
+param_delete() ->
+    [{doc,"Test parameterized delete query."}].
 param_delete(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1284,8 +1284,8 @@ param_delete(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-param_select(doc) ->
-    ["Test parameterized select query."];
+param_select() ->
+    [{doc,"Test parameterized select query."}].
 param_select(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1312,8 +1312,8 @@ param_select(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_select_empty_params(doc) ->
-    ["Test parameterized select query with no parameters."];
+param_select_empty_params() ->
+    [{doc,"Test parameterized select query with no parameters."}].
 param_select_empty_params(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1340,8 +1340,8 @@ param_select_empty_params(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_delete_empty_params(doc) ->
-    ["Test parameterized delete query with no parameters."];
+param_delete_empty_params() ->
+    [{doc,"Test parameterized delete query with no parameters."}].
 param_delete_empty_params(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1372,8 +1372,8 @@ param_delete_empty_params(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_integer(doc) ->
-    ["Test describe_table/[2,3] for integer columns."];
+describe_integer() ->
+    [{doc,"Test describe_table/[2,3] for integer columns."}].
 describe_integer(Config) when is_list(Config) ->    
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1389,8 +1389,8 @@ describe_integer(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_string(doc) ->
-    ["Test describe_table/[2,3] for string columns."];
+describe_string() ->
+    [{doc,"Test describe_table/[2,3] for string columns."}].
 describe_string(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1408,8 +1408,8 @@ describe_string(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_floating(doc) ->
-    ["Test describe_table/[2,3] for floting columns."];
+describe_floating() ->
+    [{doc,"Test describe_table/[2,3] for floting columns."}].
 describe_floating(Config) when is_list(Config) ->
     Ref = proplists:get_value(connection_ref, Config),   
     Table = proplists:get_value(tableName, Config),
@@ -1426,8 +1426,8 @@ describe_floating(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_dec_num(doc) ->
-    ["Test describe_table/[2,3] for decimal and numerical columns"];
+describe_dec_num() ->
+    [{doc,"Test describe_table/[2,3] for decimal and numerical columns"}].
 describe_dec_num(Config) when is_list(Config) ->
 
     Ref = proplists:get_value(connection_ref, Config),   
@@ -1445,8 +1445,8 @@ describe_dec_num(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-describe_timestamp(doc) ->
-    ["Test describe_table/[2,3] for tinmestap columns"];
+describe_timestamp() ->
+    [{doc,"Test describe_table/[2,3] for tinmestap columns"}].
 describe_timestamp(Config) when is_list(Config) ->
     
     Ref = proplists:get_value(connection_ref, Config),   
@@ -1462,8 +1462,8 @@ describe_timestamp(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_no_such_table(doc) ->
-    ["Test what happens if you try to describe a table that does not exist."];
+describe_no_such_table() ->
+    [{doc,"Test what happens if you try to describe a table that does not exist."}].
 describe_no_such_table(Config) when is_list(Config) ->
 
     Ref = proplists:get_value(connection_ref, Config),   
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 3e74a343a6..310b92ca29 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -127,8 +127,8 @@ app(Config) when is_list(Config) ->
 appup(Config) when is_list(Config) ->
     ok = ?t:appup_test(odbc).
 
-start(doc) -> 
-    ["Test start/stop of odbc"];
+start() -> 
+    [{doc,"Test start/stop of odbc"}].
 start(Config) when is_list(Config) -> 
     PlatformOptions = odbc_test_lib:platform_options(),
 	{error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(),
@@ -160,8 +160,8 @@ start_odbc(Type) ->
     end.
 
 
-long_connection_line(doc)->
-    ["Test a connection line longer than 127 characters"];
+long_connection_line()->
+    [{doc,"Test a connection line longer than 127 characters"}].
 long_connection_line(_Config)  ->
     odbc:start(),
     String133 = "unknown_odbc_parameter=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",