odbc: Remove legacy suite clauses from test suites

4 files changed, 0 insertions, 152 deletions

diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 5727c1ca50..942750e4b1 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -166,7 +166,6 @@ end_per_testcase_common(Config) ->
 %%-------------------------------------------------------------------------
 commit(doc)->
     ["Test the use of explicit commit"];
-commit(suite) -> [];
 commit(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), 
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -207,7 +206,6 @@ commit(Config)  ->
 
 rollback(doc)->
     ["Test the use of explicit rollback"];
-rollback(suite) -> [];
 rollback(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -247,7 +245,6 @@ rollback(Config)  ->
 %%-------------------------------------------------------------------------
 not_explicit_commit(doc) ->
     ["Test what happens if you try using commit on a auto_commit connection."];
-not_explicit_commit(suite) -> [];
 not_explicit_commit(_Config) ->
     {ok, Ref} = 
 	odbc:connect(?RDBMS:connection_string(), [{auto_commit, on}] ++
@@ -258,7 +255,6 @@ not_explicit_commit(_Config) ->
 %%-------------------------------------------------------------------------
 not_exist_db(doc) ->
     ["Tests valid data format but invalid data in the connection parameters."];
-not_exist_db(suite) -> [];
 not_exist_db(_Config)  ->
     {error, _} = odbc:connect("DSN=foo;UID=bar;PWD=foobar",
 			      odbc_test_lib:platform_options()),
@@ -268,7 +264,6 @@ not_exist_db(_Config)  ->
 %%-------------------------------------------------------------------------
 no_c_executable(doc) ->
     "Test what happens if the port-program can not be found";
-no_c_executable(suite) -> [];
 no_c_executable(_Config) ->
     process_flag(trap_exit, true),
     Dir = filename:nativename(filename:join(code:priv_dir(odbc), 
@@ -295,7 +290,6 @@ no_c_executable(_Config) ->
 
 port_dies(doc) ->
     "Tests what happens if the port program dies";
-port_dies(suite) -> [];
 port_dies(_Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     {status, _} = process_info(Ref, status),   
@@ -317,7 +311,6 @@ port_dies(_Config) ->
 %%-------------------------------------------------------------------------
 control_process_dies(doc) ->
     "Tests what happens if the Erlang control process dies";
-control_process_dies(suite) -> [];
 control_process_dies(_Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     process_flag(trap_exit, true),
@@ -336,7 +329,6 @@ control_process_dies(_Config) ->
 %%-------------------------------------------------------------------------
 client_dies_normal(doc) ->
     ["Client dies with reason normal."];
-client_dies_normal(suite) -> [];
 client_dies_normal(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_normal, [self()]),
 
@@ -368,7 +360,6 @@ client_normal(Pid) ->
 %%-------------------------------------------------------------------------
 client_dies_timeout(doc) ->
     ["Client dies with reason timeout."];
-client_dies_timeout(suite) -> [];
 client_dies_timeout(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_timeout, [self()]),
 
@@ -400,7 +391,6 @@ client_timeout(Pid) ->
 %%-------------------------------------------------------------------------
 client_dies_error(doc) ->
     ["Client dies with reason error."];
-client_dies_error(suite) -> [];
 client_dies_error(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_error, [self()]),
 
@@ -432,7 +422,6 @@ client_error(Pid) ->
 %%-------------------------------------------------------------------------
 connect_timeout(doc) ->
     ["Test the timeout for the connect function."];
-connect_timeout(suite) -> [];
 connect_timeout(Config) when is_list(Config) ->
     {'EXIT',timeout} = (catch odbc:connect(?RDBMS:connection_string(),
 					   [{timeout, 0}] ++
@@ -445,7 +434,6 @@ connect_timeout(Config) when is_list(Config) ->
 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(suite) -> [];
 connect_port_timeout(Config) when is_list(Config) ->
     %% Application environment var 'port_timeout' has been set to 0 by
     %% init_per_testcase/2.
@@ -456,7 +444,6 @@ connect_port_timeout(Config) when is_list(Config) ->
 timeout(doc) ->
     ["Test that timeouts don't cause unwanted behavior sush as receiving"
      " an anwser to a previously tiemed out query."];
-timeout(suite) -> [];
 timeout(Config)  when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
@@ -540,7 +527,6 @@ update_table_timeout(Table, TimeOut, Pid) ->
 many_timeouts(doc) ->
     ["Tests that many consecutive timeouts lead to that the connection "
      "is shutdown."];
-many_timeouts(suite) -> [];
 many_timeouts(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -600,7 +586,6 @@ loop_many_timouts(Ref, UpdateQuery, TimeOut) ->
 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(suite) -> [];
 timeout_reset(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
@@ -697,7 +682,6 @@ loop_timout_reset(Ref, UpdateQuery, TimeOut, NumTimeouts) ->
 
 disconnect_on_timeout(doc) ->
     ["Check that disconnect after a time out works properly"]; 
-disconnect_on_timeout(suite) -> [];
 disconnect_on_timeout(Config) when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
@@ -747,7 +731,6 @@ update_table_disconnect_on_timeout(Table, TimeOut, Pid) ->
 connection_closed(doc) ->
     ["Checks that you get an appropriate error message if you try to"
      " use a connection that has been closed"];
-connection_closed(suite) -> [];
 connection_closed(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
 
@@ -773,7 +756,6 @@ connection_closed(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 disable_scrollable_cursors(doc) ->
     ["Test disabling of scrollable cursors."];
-disable_scrollable_cursors(suite) -> [];
 disable_scrollable_cursors(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{scrollable_cursors, off}]),
@@ -812,7 +794,6 @@ disable_scrollable_cursors(Config) when is_list(Config) ->
 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(suite) -> [];
 return_rows_as_lists(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{tuple_row, off}] ++ odbc_test_lib:platform_options()),
@@ -856,7 +837,6 @@ 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(suite) -> [];
 api_missuse(Config) when is_list(Config)->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
@@ -890,7 +870,6 @@ 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(suite)  -> [];
 extended_errors(Config) when is_list(Config)->
     Table = ?config(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 c88c00725e..6dec8fa0a3 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -248,8 +248,6 @@ end_per_testcase(_TestCase, Config) ->
 
 char_fixed_lower_limit(doc) ->
     ["Tests fixed length char data type lower boundaries."];
-char_fixed_lower_limit(suite) ->
-    [];
 char_fixed_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -289,8 +287,6 @@ 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(suite) ->
-    [];
 char_fixed_upper_limit(Config) when is_list(Config) ->
 
     case ?RDBMS of
@@ -340,8 +336,6 @@ 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(suite) ->
-    [];
 char_fixed_padding(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -367,8 +361,6 @@ char_fixed_padding(Config) when is_list(Config) ->
 
 varchar_lower_limit(doc) ->
     ["Tests variable length char data type lower boundaries."];
-varchar_lower_limit(suite) ->
-    [];
 varchar_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -407,8 +399,6 @@ varchar_lower_limit(Config) when is_list(Config) ->
 
 varchar_upper_limit(doc) ->
     ["Tests variable length char data type upper boundaries."];
-varchar_upper_limit(suite) ->
-    [];
 varchar_upper_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -458,8 +448,6 @@ varchar_upper_limit(Config) when is_list(Config) ->
 varchar_no_padding(doc) ->
     ["Tests that data that is shorter than the given max size is not padded " 
      "with blanks."];
-varchar_no_padding(suite) ->
-    [];
 varchar_no_padding(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -483,8 +471,6 @@ varchar_no_padding(Config) when is_list(Config) ->
 
 text_lower_limit(doc) ->
     ["Tests 'long' char data type lower boundaries."];
-text_lower_limit(suite) ->
-    [];
 text_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -506,8 +492,6 @@ text_lower_limit(Config) when is_list(Config) ->
 
 text_upper_limit(doc) ->
     [];
-text_upper_limit(suite) ->
-    [];
 text_upper_limit(Config) when is_list(Config) ->
     
     {skip,"Consumes too much resources" }.
@@ -536,8 +520,6 @@ 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(suite) ->
-    [];
 binary_char_fixed_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -581,8 +563,6 @@ 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(suite) ->
-    [];
 binary_char_fixed_upper_limit(Config) when is_list(Config) ->
 
     case ?RDBMS of
@@ -633,8 +613,6 @@ 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(suite) ->
-    [];
 binary_char_fixed_padding(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -660,8 +638,6 @@ 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(suite) ->
-    [];
 binary_varchar_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -703,8 +679,6 @@ 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(suite) ->
-    [];
 binary_varchar_upper_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -753,8 +727,6 @@ binary_varchar_upper_limit(Config) when is_list(Config) ->
 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(suite) ->
-    [];
 binary_varchar_no_padding(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -778,8 +750,6 @@ 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(suite) ->
-    [];
 binary_text_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -801,8 +771,6 @@ binary_text_lower_limit(Config) when is_list(Config) ->
 
 binary_text_upper_limit(doc) ->
     [];
-binary_text_upper_limit(suite) ->
-    [];
 binary_text_upper_limit(Config) when is_list(Config) ->
     
     {skip,"Consumes too much resources" }.
@@ -832,8 +800,6 @@ binary_text_upper_limit(Config) when is_list(Config) ->
 
 tiny_int_lower_limit(doc) ->
     ["Tests integer of type tinyint."];
-tiny_int_lower_limit(suite) ->
-    [];
 tiny_int_lower_limit(Config) when is_list(Config) -> 
     case ?RDBMS of
 	postgres ->
@@ -866,8 +832,6 @@ tiny_int_lower_limit(Config) when is_list(Config) ->
 
 tiny_int_upper_limit(doc) ->
     ["Tests integer of type tinyint."];
-tiny_int_upper_limit(suite) ->
-    [];
 tiny_int_upper_limit(Config) when is_list(Config) ->
     case ?RDBMS of
 	postgres ->
@@ -900,8 +864,6 @@ tiny_int_upper_limit(Config) when is_list(Config) ->
 
 small_int_lower_limit(doc) ->
     ["Tests integer of type smallint."];
-small_int_lower_limit(suite) ->
-    [];
 small_int_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -929,8 +891,6 @@ small_int_lower_limit(Config) when is_list(Config) ->
 
 small_int_upper_limit(doc) ->
     ["Tests integer of type smallint."];
-small_int_upper_limit(suite) ->
-    [];
 small_int_upper_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -957,8 +917,6 @@ small_int_upper_limit(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 int_lower_limit(doc) ->
     ["Tests integer of type int."];
-int_lower_limit(suite) ->
-    [];
 int_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -985,8 +943,6 @@ int_lower_limit(Config) when is_list(Config) ->
 
 int_upper_limit(doc) ->
     ["Tests integer of type int."];
-int_upper_limit(suite) ->
-    [];
 int_upper_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1013,8 +969,6 @@ int_upper_limit(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 big_int_lower_limit(doc) ->
     ["Tests integer of type bigint"];
-big_int_lower_limit(suite) ->
-    [];
 big_int_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1042,8 +996,6 @@ big_int_lower_limit(Config) when is_list(Config) ->
 
 big_int_upper_limit(doc) ->
     ["Tests integer of type bigint."];
-big_int_upper_limit(suite) ->
-    [];
 big_int_upper_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1070,8 +1022,6 @@ big_int_upper_limit(Config) when is_list(Config) ->
 
 bit_false(doc) ->
     [""];
-bit_false(suite) ->
-    [];
 bit_false(Config) when is_list(Config) ->  
     case ?RDBMS of
 	oracle ->
@@ -1104,8 +1054,6 @@ bit_false(Config) when is_list(Config) ->
 
 bit_true(doc) ->
     [""];
-bit_true(suite) ->
-    [];
 bit_true(Config) when is_list(Config) ->
     case ?RDBMS of
 	oracle ->
@@ -1138,8 +1086,6 @@ bit_true(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 float_lower_limit(doc) ->
     [""];
-float_lower_limit(suite) ->
-    [];
 float_lower_limit(Config) when is_list(Config) ->   
 
     Ref = ?config(connection_ref, Config),   
@@ -1188,8 +1134,6 @@ float_lower_limit(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 float_upper_limit(doc) ->
     [""];
-float_upper_limit(suite) ->
-    [];
 float_upper_limit(Config) when is_list(Config) ->   
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1220,8 +1164,6 @@ float_upper_limit(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 float_zero(doc) ->
     ["Test the float value zero."];
-float_zero(suite) ->
-    [];
 float_zero(Config) when is_list(Config) ->   
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1239,8 +1181,6 @@ float_zero(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 real_zero(doc) ->
     ["Test the real value zero."];
-real_zero(suite) ->
-    [];
 real_zero(Config) when is_list(Config) ->   
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 5f719b7287..8a5c6bdd73 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -174,7 +174,6 @@ end_per_testcase(_Case, Config) ->
 %%-------------------------------------------------------------------------
 stored_proc(doc)->
     ["Test stored proc with OUT param"];
-stored_proc(suite) -> [];
 stored_proc(Config) when is_list(Config) ->
     case ?RDBMS of
         X when X == oracle; X == postgres->
@@ -194,7 +193,6 @@ stored_proc(Config) when is_list(Config) ->
 
 sql_query(doc)->
     ["Test the common cases"];
-sql_query(suite) -> [];
 sql_query(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),
     Table = ?config(tableName, Config),
@@ -259,7 +257,6 @@ select_count(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 first(doc) ->
     ["Tests first/[1,2]"];
-first(suite) -> [];
 first(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),
     Table = ?config(tableName, Config),
@@ -286,7 +283,6 @@ first(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 last(doc) ->
     ["Tests last/[1,2]"];
-last(suite) -> [];
 last(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),
     Table = ?config(tableName, Config),
@@ -313,7 +309,6 @@ last(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 next(doc) ->
     ["Tests next/[1,2]"];
-next(suite) -> [];
 next(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),
     Table = ?config(tableName, Config),
@@ -339,7 +334,6 @@ next(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 prev(doc) ->
     ["Tests prev/[1,2]"];
-prev(suite) -> [];
 prev(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),
     Table = ?config(tableName, Config),
@@ -484,7 +478,6 @@ select_absolute(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 create_table_twice(doc) ->
     ["Test what happens if you try to create the same table twice."];
-create_table_twice(suite) -> [];
 create_table_twice(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -503,7 +496,6 @@ create_table_twice(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 delete_table_twice(doc) ->
     ["Test what happens if you try to delete the same table twice."];
-delete_table_twice(suite) -> [];
 delete_table_twice(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -542,7 +534,6 @@ duplicate_key(Config) when is_list(Config) ->
 not_connection_owner(doc) ->
     ["Test what happens if a process that did not start the connection"
      " tries to acess it."];
-not_connection_owner(suite) -> [];
 not_connection_owner(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -567,7 +558,6 @@ not_owner(Pid, Ref, Table) ->
 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(suite) -> [];
 no_result_set(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
 
@@ -584,8 +574,6 @@ no_result_set(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 query_error(doc) ->
     ["Test what happens if there is an error in the query."];
-query_error(suite) ->
-    [];
 query_error(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -607,8 +595,6 @@ query_error(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 multiple_select_result_sets(doc) ->
     ["Test what happens if you have a batch of select queries."];
-multiple_select_result_sets(suite) ->
-    [];
 multiple_select_result_sets(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
@@ -643,8 +629,6 @@ multiple_select_result_sets(Config) when is_list(Config) ->
 multiple_mix_result_sets(doc) ->
     ["Test what happens if you have a batch of select and other type of"
      " queries."];
-multiple_mix_result_sets(suite) ->
-    [];
 multiple_mix_result_sets(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
@@ -676,8 +660,6 @@ multiple_mix_result_sets(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 multiple_result_sets_error(doc) ->
     ["Test what happens if one of the batched queries fails."];
-multiple_result_sets_error(suite) ->
-    [];
 multiple_result_sets_error(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
@@ -711,8 +693,6 @@ multiple_result_sets_error(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_tiny_int(doc)->
     ["Test insertion of tiny ints by parameterized queries."];
-param_insert_tiny_int(suite) ->
-    [];
 param_insert_tiny_int(Config) when is_list(Config) ->
     case ?RDBMS of 
 	sqlserver ->
@@ -748,8 +728,6 @@ param_insert_tiny_int(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_small_int(doc)->
     ["Test insertion of small ints by parameterized queries."];
-param_insert_small_int(suite) ->
-    [];
 param_insert_small_int(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -780,8 +758,6 @@ param_insert_small_int(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_int(doc)->
     ["Test insertion of ints by parameterized queries."];
-param_insert_int(suite) ->
-    [];
 param_insert_int(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -812,8 +788,6 @@ param_insert_int(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_integer(doc)->
     ["Test insertion of integers by parameterized queries."];
-param_insert_integer(suite) ->
-    [];
 param_insert_integer(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -844,8 +818,6 @@ param_insert_integer(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_decimal(doc)->
     ["Test insertion of decimal numbers by parameterized queries."];
-param_insert_decimal(suite) ->
-    [];
 param_insert_decimal(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -895,8 +867,6 @@ param_insert_decimal(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_numeric(doc)->
     ["Test insertion of numeric numbers by parameterized queries."];
-param_insert_numeric(suite) ->
-    [];
 param_insert_numeric(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -946,8 +916,6 @@ param_insert_numeric(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_char(doc)->
     ["Test insertion of fixed length string by parameterized queries."];
-param_insert_char(suite) ->
-    [];
 param_insert_char(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -982,8 +950,6 @@ param_insert_char(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_character(doc)->
     ["Test insertion of fixed length string by parameterized queries."];
-param_insert_character(suite) ->
-    [];
 param_insert_character(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1019,8 +985,6 @@ param_insert_character(Config) when is_list(Config) ->
 %%------------------------------------------------------------------------
 param_insert_char_varying(doc)->
     ["Test insertion of variable length strings by parameterized queries."];
-param_insert_char_varying(suite) ->
-    [];
 param_insert_char_varying(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1056,8 +1020,6 @@ param_insert_char_varying(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_character_varying(doc)->
     ["Test insertion of variable length strings by parameterized queries."];
-param_insert_character_varying(suite) ->
-    [];
 param_insert_character_varying(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1093,8 +1055,6 @@ param_insert_character_varying(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_float(doc)->
     ["Test insertion of floats by parameterized queries."];
-param_insert_float(suite) ->
-    [];
 param_insert_float(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1132,8 +1092,6 @@ param_insert_float(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_real(doc)->
     ["Test insertion of real numbers by parameterized queries."];
-param_insert_real(suite) ->
-    [];
 param_insert_real(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1173,8 +1131,6 @@ param_insert_real(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_double(doc)->
     ["Test insertion of doubles by parameterized queries."];
-param_insert_double(suite) ->
-    [];
 param_insert_double(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1212,8 +1168,6 @@ param_insert_double(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_insert_mix(doc)->
     ["Test insertion of a mixture of datatypes by parameterized queries."];
-param_insert_mix(suite) ->
-    [];
 param_insert_mix(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1239,8 +1193,6 @@ param_insert_mix(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_update(doc)->
     ["Test parameterized update query."];
-param_update(suite) ->
-    [];
 param_update(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1303,8 +1255,6 @@ delete_nonexisting_row(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_delete(doc) ->
     ["Test parameterized delete query."];
-param_delete(suite) ->
-    [];
 param_delete(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1338,8 +1288,6 @@ param_delete(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_select(doc) ->
     ["Test parameterized select query."];
-param_select(suite) ->
-    [];
 param_select(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1368,8 +1316,6 @@ param_select(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_select_empty_params(doc) ->
     ["Test parameterized select query with no parameters."];
-param_select_empty_params(suite) ->
-    [];
 param_select_empty_params(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1398,8 +1344,6 @@ param_select_empty_params(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 param_delete_empty_params(doc) ->
     ["Test parameterized delete query with no parameters."];
-param_delete_empty_params(suite) ->
-    [];
 param_delete_empty_params(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1432,8 +1376,6 @@ param_delete_empty_params(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 describe_integer(doc) ->
     ["Test describe_table/[2,3] for integer columns."];
-describe_integer(suite) ->
-    [];
 describe_integer(Config) when is_list(Config) ->    
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1451,8 +1393,6 @@ describe_integer(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 describe_string(doc) ->
     ["Test describe_table/[2,3] for string columns."];
-describe_string(suite) ->
-    [];
 describe_string(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1472,8 +1412,6 @@ describe_string(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 describe_floating(doc) ->
     ["Test describe_table/[2,3] for floting columns."];
-describe_floating(suite) ->
-    [];
 describe_floating(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
@@ -1492,8 +1430,6 @@ describe_floating(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 describe_dec_num(doc) ->
     ["Test describe_table/[2,3] for decimal and numerical columns"];
-describe_dec_num(suite) ->
-    [];
 describe_dec_num(Config) when is_list(Config) ->
 
     Ref = ?config(connection_ref, Config),   
@@ -1513,8 +1449,6 @@ describe_dec_num(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 describe_timestamp(doc) ->
     ["Test describe_table/[2,3] for tinmestap columns"];
-describe_timestamp(suite) ->
-    [];
 describe_timestamp(Config) when is_list(Config) ->
     
     Ref = ?config(connection_ref, Config),   
@@ -1532,8 +1466,6 @@ describe_timestamp(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 describe_no_such_table(doc) ->
     ["Test what happens if you try to describe a table that does not exist."];
-describe_no_such_table(suite) ->
-    [];
 describe_no_such_table(Config) when is_list(Config) ->
 
     Ref = ?config(connection_ref, Config),   
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index f055eeb60e..670e498142 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -137,8 +137,6 @@ appup(Config) when is_list(Config) ->
 
 start(doc) -> 
     ["Test start/stop of odbc"];
-start(suite) -> 
-    [];
 start(Config) when is_list(Config) -> 
     PlatformOptions = odbc_test_lib:platform_options(),
 	{error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(),
@@ -172,7 +170,6 @@ start_odbc(Type) ->
 
 long_connection_line(doc)->
     ["Test a connection line longer than 127 characters"];
-long_connection_line(suite) -> [];
 long_connection_line(_Config)  ->
     odbc:start(),
     String133 = "unknown_odbc_parameter=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",