← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/orber/test/naming_context_SUITE.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/orber/test/naming_context_SUITE.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
25
25
%%-----------------------------------------------------------------
26
26
-module(naming_context_SUITE).
27
27
 
28
 
-include("test_server.hrl").
 
28
-include_lib("test_server/include/test_server.hrl").
29
29
-include_lib("orber/COSS/CosNaming/CosNaming.hrl").
30
30
-include_lib("orber/src/orber_iiop.hrl").
31
31
-include_lib("orber/include/corba.hrl").
35
35
%%-----------------------------------------------------------------
36
36
%% External exports
37
37
%%-----------------------------------------------------------------
38
 
-export([all/1]).
 
38
-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
39
39
 
40
40
%%-----------------------------------------------------------------
41
41
%% Internal exports
43
43
 
44
44
-export([name_context/1, check_list/1, name_context_ext/1]).
45
45
 
46
 
-export([init_all/1, finish_all/1, init_per_testcase/2, fin_per_testcase/2]).
 
46
-export([init_per_suite/1, end_per_suite/1, init_per_testcase/2, 
 
47
         end_per_testcase/2]).
47
48
 
48
49
 
49
50
%%-----------------------------------------------------------------
75
76
%% Args: 
76
77
%% Returns: 
77
78
%%-----------------------------------------------------------------
78
 
all(doc) -> ["Description", "more description"];
79
 
all(suite) -> {req,
80
 
               [mnesia],
81
 
               {conf, init_all, cases(), finish_all}}.
82
 
 
83
 
cases() ->
 
79
suite() -> [{ct_hooks,[ts_install_cth]}].
 
80
 
 
81
all() -> 
 
82
    cases().
 
83
 
 
84
groups() -> 
 
85
    [].
 
86
 
 
87
init_per_group(_GroupName, Config) ->
 
88
    Config.
 
89
 
 
90
end_per_group(_GroupName, Config) ->
 
91
    Config.
 
92
 
 
93
 
 
94
cases() -> 
84
95
    [name_context, check_list, name_context_ext].
85
96
 
86
97
%%-----------------------------------------------------------------
95
106
    [{watchdog, Dog}|Config].
96
107
 
97
108
 
98
 
fin_per_testcase(_Case, Config) ->
 
109
end_per_testcase(_Case, Config) ->
99
110
    Path = code:which(?MODULE),
100
111
    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
101
112
    orber:jump_stop(),
103
114
    test_server:timetrap_cancel(Dog),
104
115
    ok.
105
116
 
106
 
init_all(Config) ->
 
117
init_per_suite(Config) ->
107
118
    Config.
108
119
 
109
 
finish_all(Config) ->
 
120
end_per_suite(Config) ->
110
121
    Config.
111
122
 
112
123
%%-----------------------------------------------------------------