aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-11-18 14:17:27 +0100
committerLukas Larsson <[email protected]>2010-12-08 18:07:48 +0100
commit3bacd0466501e872c69fbb89c7e6600395d7854c (patch)
tree952f4272794caefbdcc4687b0a55074afc5b67fb
parent6c4801696d6a22d61d2e7b145506f2548ea80547 (diff)
downloadotp-3bacd0466501e872c69fbb89c7e6600395d7854c.tar.gz
otp-3bacd0466501e872c69fbb89c7e6600395d7854c.tar.bz2
otp-3bacd0466501e872c69fbb89c7e6600395d7854c.zip
Rename all callback functions to be more inline with the suite callback functions
-rw-r--r--lib/common_test/src/ct_suite_callback.erl20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/common_test/src/ct_suite_callback.erl b/lib/common_test/src/ct_suite_callback.erl
index 124397b222..702d9a354c 100644
--- a/lib/common_test/src/ct_suite_callback.erl
+++ b/lib/common_test/src/ct_suite_callback.erl
@@ -62,15 +62,15 @@ terminate(_Config, _State) ->
init_tc(ct_framework, _Func, Args) ->
Args;
init_tc(Mod, init_per_suite, Config) ->
- call(fun call_generic/3, Config, {pre_init_suite, Mod});
+ call(fun call_generic/3, Config, {pre_init_per_suite, Mod});
init_tc(Mod, end_per_suite, Config) ->
- call(fun call_generic/3, Config, {pre_end_suite, Mod});
+ call(fun call_generic/3, Config, {pre_end_per_suite, Mod});
init_tc(_Mod, {init_per_group, GroupName, _}, Config) ->
- call(fun call_generic/3, Config, {pre_init_group, GroupName});
+ call(fun call_generic/3, Config, {pre_init_per_group, GroupName});
init_tc(_Mod, {end_per_group, GroupName, _}, Config) ->
- call(fun call_generic/3, Config, {pre_end_group, GroupName});
+ call(fun call_generic/3, Config, {pre_end_per_group, GroupName});
init_tc(_Mod, TC, Config) ->
- call(fun call_generic/3, Config, {pre_init_group, TC}).
+ call(fun call_generic/3, Config, {pre_init_per_testcase, TC}).
%% @doc Called as each test case is completed. This includes all configuration
%% tests.
@@ -86,15 +86,15 @@ init_tc(_Mod, TC, Config) ->
end_tc(ct_framework, _Func, _Args, Result) ->
Result;
end_tc(Mod, init_per_suite, _Config, Result) ->
- call(fun call_generic/3, Result, {post_init_suite, Mod});
+ call(fun call_generic/3, Result, {post_init_per_suite, Mod});
end_tc(Mod, end_per_suite, _Config, Result) ->
- call(fun call_generic/3, Result, {post_end_suite, Mod});
+ call(fun call_generic/3, Result, {post_end_per_suite, Mod});
end_tc(_Mod, {init_per_group, GroupName, _}, _Config, Result) ->
- call(fun call_generic/3, Result, {post_init_group, GroupName});
+ call(fun call_generic/3, Result, {post_init_per_group, GroupName});
end_tc(_Mod, {end_per_group, GroupName, _}, _Config, Result) ->
- call(fun call_generic/3, Result, {post_end_group, GroupName});
+ call(fun call_generic/3, Result, {post_end_per_group, GroupName});
end_tc(_Mod, TC, _Config, Result) ->
- call(fun call_generic/3, Result, {post_end_tc, TC}).
+ call(fun call_generic/3, Result, {post_end_per_testcase, TC}).
%% -------------------------------------------------------------------------
%% Internal Functions