aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-06 12:19:46 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:18:44 +0100
commitaed82e4ccb6d22ec3ec99aa7f4497881fcbec5e3 (patch)
treebdcaf55b1cd348d0650acc4b93dd6061bb798482
parentd9ba1a5d1a1c79098593332d490d8ab8cba0cc80 (diff)
downloadotp-aed82e4ccb6d22ec3ec99aa7f4497881fcbec5e3.tar.gz
otp-aed82e4ccb6d22ec3ec99aa7f4497881fcbec5e3.tar.bz2
otp-aed82e4ccb6d22ec3ec99aa7f4497881fcbec5e3.zip
Update app_init to init_per_suite to conform with common_test standards.
-rw-r--r--lib/asn1/test/asn1_app_test.erl14
-rw-r--r--lib/asn1/test/asn1_appup_test.erl14
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_test.erl
index 23a7e691e7..8002f5b78f 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_test.erl
@@ -34,13 +34,13 @@ all(suite) ->
exportall,
app_depend
],
- {req, [], {conf, app_init, Cases, app_fin}}.
+ {req, [], {conf, init_per_suite, Cases, end_per_suite}}.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-app_init(suite) -> [];
-app_init(doc) -> [];
-app_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
case is_app(asn1) of
{ok, AppFile} ->
io:format("AppFile: ~n~p~n", [AppFile]),
@@ -60,9 +60,9 @@ is_app(App) ->
end.
-app_fin(suite) -> [];
-app_fin(doc) -> [];
-app_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
Config.
diff --git a/lib/asn1/test/asn1_appup_test.erl b/lib/asn1/test/asn1_appup_test.erl
index 4a60c814e8..43fd425b6e 100644
--- a/lib/asn1/test/asn1_appup_test.erl
+++ b/lib/asn1/test/asn1_appup_test.erl
@@ -31,13 +31,13 @@ all(suite) ->
[
appup
],
- {req, [], {conf, appup_init, Cases, appup_fin}}.
+ {req, [], {conf, init_per_suite, Cases, end_per_suite}}.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-appup_init(suite) -> [];
-appup_init(doc) -> [];
-appup_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
AppFile = file_name(asn1, ".app"),
AppupFile = file_name(asn1, ".appup"),
[{app_file, AppFile}, {appup_file, AppupFile}|Config].
@@ -48,9 +48,9 @@ file_name(App, Ext) ->
filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
-appup_fin(suite) -> [];
-appup_fin(doc) -> [];
-appup_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
Config.