Merge branch 'lars/test-case-conformance/OTP-13695'

* lars/test-case-conformance/OTP-13695:
  [cosTransactions] Update the test suites to follow the new style
  [cosTime] Update the test suites to follow the new style
  [cosProperty] Update the test suites to follow the new style
  [cosNotification]  Update the test suites to follow the new style
  [cosFileTransfer] Fix mispelled module name
  [cosEvent] Fix mispelled module name
  [cosEventDomain] Fix mispelled module name
  [cosFileTransfer] Update the test suites to follow the new style
  [cosEventDomain] Update the test suites to follow the new style
  [cosEvent] Update the test suites to follow the new style
  [orber] Update the test suites to follow the new style
  [erl_docgen] Update the test suites to follow the new style
  [ic] Correct memory deallocation error
  [ic] Update the test suites to follow the new style

1 files changed, 138 insertions, 208 deletions

diff --git a/lib/orber/test/tc_SUITE.erl b/lib/orber/test/tc_SUITE.erl
index 565d9f4645..4572057403 100644
--- a/lib/orber/test/tc_SUITE.erl
+++ b/lib/orber/test/tc_SUITE.erl
@@ -3,7 +3,7 @@
 %% 
 %% Copyright Ericsson AB 2004-2016. All Rights Reserved.
 %% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
+%% Licensed under the Apache Li2cense, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
 %% You may obtain a copy of the License at
 %%
@@ -29,7 +29,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
--define(default_timeout, ?t:minutes(3)).
+-define(default_timeout, test_server:minutes(3)).
 
 -define(match(Expr),
         fun() ->
@@ -173,12 +173,12 @@ end_per_group(_GroupName, Config) ->
 %%-----------------------------------------------------------------
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
+    Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
 
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
+    Dog = proplists:get_value(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
@@ -186,66 +186,54 @@ end_per_testcase(_Case, Config) ->
 %% Test Case: null test
 %% Description: 
 %%-----------------------------------------------------------------
-null(doc) -> [];
-null(suite) -> [];
 null(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:null()),
-    ?line code(orber_tc:null()),
+    true = orber_tc:check_tc(orber_tc:null()),
+    code(orber_tc:null()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: void test
 %% Description: 
 %%-----------------------------------------------------------------
-void(doc) -> [];
-void(suite) -> [];
 void(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:void()),
-    ?line code(orber_tc:void()),
+    true = orber_tc:check_tc(orber_tc:void()),
+    code(orber_tc:void()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: short integer test
 %% Description: 
 %%-----------------------------------------------------------------
-short(doc) -> [];
-short(suite) -> [];
 short(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:short()),
-    ?line code(orber_tc:short()),
+    true = orber_tc:check_tc(orber_tc:short()),
+    code(orber_tc:short()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: unsigned short integer test
 %% Description: 
 %%-----------------------------------------------------------------
-ushort(doc) -> [];
-ushort(suite) -> [];
 ushort(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:unsigned_short()),
-    ?line code(orber_tc:unsigned_short()),
+    true = orber_tc:check_tc(orber_tc:unsigned_short()),
+    code(orber_tc:unsigned_short()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: long integer test
 %% Description: 
 %%-----------------------------------------------------------------
-long(doc) -> [];
-long(suite) -> [];
 long(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:long()),
-    ?line code(orber_tc:long()),
+    true = orber_tc:check_tc(orber_tc:long()),
+    code(orber_tc:long()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: unsigned long integer test
 %% Description: 
 %%-----------------------------------------------------------------
-ulong(doc) -> [];
-ulong(suite) -> [];
 ulong(_) -> 
-    ?line true = orber_tc:check_tc(orber_tc:unsigned_long()),
-    ?line code(orber_tc:unsigned_long()),
+    true = orber_tc:check_tc(orber_tc:unsigned_long()),
+    code(orber_tc:unsigned_long()),
     ok.
     
 
@@ -253,22 +241,18 @@ ulong(_) ->
 %% Test Case: long integer test
 %% Description: 
 %%-----------------------------------------------------------------
-longlong(doc) -> [];
-longlong(suite) -> [];
 longlong(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:long_long()),
-    ?line code(orber_tc:long_long()),
+    true = orber_tc:check_tc(orber_tc:long_long()),
+    code(orber_tc:long_long()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: unsigned long integer test
 %% Description: 
 %%-----------------------------------------------------------------
-ulonglong(doc) -> [];
-ulonglong(suite) -> [];
 ulonglong(_) -> 
-    ?line true = orber_tc:check_tc(orber_tc:unsigned_long_long()),
-    ?line code(orber_tc:unsigned_long_long()),
+    true = orber_tc:check_tc(orber_tc:unsigned_long_long()),
+    code(orber_tc:unsigned_long_long()),
     ok.
 
 
@@ -276,110 +260,90 @@ ulonglong(_) ->
 %% Test Case: float test
 %% Description: 
 %%-----------------------------------------------------------------
-float(doc) -> [];
-float(suite) -> [];
 float(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:'float'()),
-    ?line code(orber_tc:'float'()),
+    true = orber_tc:check_tc(orber_tc:'float'()),
+    code(orber_tc:'float'()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: double test
 %% Description: 
 %%-----------------------------------------------------------------
-double(doc) -> [];
-double(suite) -> [];
 double(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:double()),
-    ?line code(orber_tc:double()),
+    true = orber_tc:check_tc(orber_tc:double()),
+    code(orber_tc:double()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: longdouble test
 %% Description: 
 %%-----------------------------------------------------------------
-longdouble(doc) -> [];
-longdouble(suite) -> [];
 longdouble(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:longdouble()),
-    ?line code(orber_tc:longdouble()),
+    true = orber_tc:check_tc(orber_tc:longdouble()),
+    code(orber_tc:longdouble()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: boolean test
 %% Description: 
 %%-----------------------------------------------------------------
-boolean(doc) -> [];
-boolean(suite) -> [];
 boolean(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:boolean()),
-    ?line code(orber_tc:boolean()),
+    true = orber_tc:check_tc(orber_tc:boolean()),
+    code(orber_tc:boolean()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: character test
 %% Description: 
 %%-----------------------------------------------------------------
-char(doc) -> [];
-char(suite) -> [];
 char(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:char()),
-    ?line code(orber_tc:char()),
+    true = orber_tc:check_tc(orber_tc:char()),
+    code(orber_tc:char()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: character test
 %% Description: 
 %%-----------------------------------------------------------------
-wchar(doc) -> [];
-wchar(suite) -> [];
 wchar(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:wchar()),
-    ?line code(orber_tc:wchar()),
+    true = orber_tc:check_tc(orber_tc:wchar()),
+    code(orber_tc:wchar()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: octet test
 %% Description: 
 %%-----------------------------------------------------------------
-octet(doc) -> [];
-octet(suite) -> [];
 octet(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:octet()),
-    ?line code(orber_tc:octet()),
+    true = orber_tc:check_tc(orber_tc:octet()),
+    code(orber_tc:octet()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: any test
 %% Description: 
 %%-----------------------------------------------------------------
-any(doc) -> [];
-any(suite) -> [];
 any(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:any()),
-    ?line code(orber_tc:any()),
+    true = orber_tc:check_tc(orber_tc:any()),
+    code(orber_tc:any()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: typecode test
 %% Description: 
 %%-----------------------------------------------------------------
-typecode(doc) -> [];
-typecode(suite) -> [];
 typecode(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:typecode()),
-    ?line code(orber_tc:typecode()),
+    true = orber_tc:check_tc(orber_tc:typecode()),
+    code(orber_tc:typecode()),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: principal test
 %% Description: 
 %%-----------------------------------------------------------------
-principal(doc) -> [];
-principal(suite) -> [];
 principal(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:principal()),
-    ?line code(orber_tc:principal()),
+    true = orber_tc:check_tc(orber_tc:principal()),
+    code(orber_tc:principal()),
     ok.
 
 
@@ -387,62 +351,56 @@ principal(_) ->
 %% Test Case: object_reference test
 %% Description: 
 %%-----------------------------------------------------------------
-object_reference(doc) -> [];
-object_reference(suite) -> [];
 object_reference(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:object_reference("Id", "Name")),
-    ?line false = orber_tc:check_tc(orber_tc:object_reference(42, "Name")),
-    ?line false = orber_tc:check_tc(orber_tc:object_reference("Id", 42)),
-    ?line code(orber_tc:object_reference("Id", "Name")),
-    ?line ?match(code(orber_tc:object_reference(42, "Name"))),
-    ?line ?match(code(orber_tc:object_reference("Id", 42))),
+    true = orber_tc:check_tc(orber_tc:object_reference("Id", "Name")),
+    false = orber_tc:check_tc(orber_tc:object_reference(42, "Name")),
+    false = orber_tc:check_tc(orber_tc:object_reference("Id", 42)),
+    code(orber_tc:object_reference("Id", "Name")),
+    ?match(code(orber_tc:object_reference(42, "Name"))),
+    ?match(code(orber_tc:object_reference("Id", 42))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: struct
 %% Description: 
 %%-----------------------------------------------------------------
-struct(doc) -> [];
-struct(suite) -> [];
 struct(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:struct("Id", "Name", ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:struct(42, "Name", ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:struct("Id", false, ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:struct("Id", "Name", ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:struct("Id", "Name", "wrong")),
-    ?line code(orber_tc:struct("Id", "Name", ?ELIST)),
-    ?line ?match(code(orber_tc:struct(42, "Name", ?ELIST))),
-    ?line ?match(code(orber_tc:struct("Id", false, ?ELIST))),
-    ?line ?match(code(orber_tc:struct("Id", "Name", ?VELIST))),
-    ?line ?match(code(orber_tc:struct("Id", "Name", "wrong"))),
+    true = orber_tc:check_tc(orber_tc:struct("Id", "Name", ?ELIST)),
+    false = orber_tc:check_tc(orber_tc:struct(42, "Name", ?ELIST)),
+    false = orber_tc:check_tc(orber_tc:struct("Id", false, ?ELIST)),
+    false = orber_tc:check_tc(orber_tc:struct("Id", "Name", ?VELIST)),
+    false = orber_tc:check_tc(orber_tc:struct("Id", "Name", "wrong")),
+    code(orber_tc:struct("Id", "Name", ?ELIST)),
+    ?match(code(orber_tc:struct(42, "Name", ?ELIST))),
+    ?match(code(orber_tc:struct("Id", false, ?ELIST))),
+    ?match(code(orber_tc:struct("Id", "Name", ?VELIST))),
+    ?match(code(orber_tc:struct("Id", "Name", "wrong"))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: union
 %% Description: 
 %%-----------------------------------------------------------------
-union(doc) -> [];
-union(suite) -> [];
 union(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
+    true = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
 						  -1, [{1, "long", orber_tc:long()},
 						       {2, "longlong", orber_tc:long()}])),
-    ?line false = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
+    false = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
 						   -1, ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:union(42, "Name", orber_tc:long(), 
+    false = orber_tc:check_tc(orber_tc:union(42, "Name", orber_tc:long(), 
 						   -1, [{1, "long", orber_tc:long()},
 							{2, "longlong", orber_tc:long()}])),
-    ?line false = orber_tc:check_tc(orber_tc:union("Id", false, orber_tc:long(), 
+    false = orber_tc:check_tc(orber_tc:union("Id", false, orber_tc:long(), 
 						   -1, [{1, "long", orber_tc:long()},
 							{2, "longlong", orber_tc:long()}])),
-    ?line false = orber_tc:check_tc(orber_tc:union("Id", "Name", bad_tc, 
+    false = orber_tc:check_tc(orber_tc:union("Id", "Name", bad_tc, 
 						   -1, [{1, "long", orber_tc:long()},
 							{2, "longlong", orber_tc:long()}])),
-    ?line false = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
+    false = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
 						   "wrong", [{1, "long", orber_tc:long()},
 							     {2, "longlong", orber_tc:long()}])),
 
-    ?line code(orber_tc:union("Id", "Name", orber_tc:long(), 
+    code(orber_tc:union("Id", "Name", orber_tc:long(), 
 			      -1, [{1, "long", orber_tc:long()},
 				   {2, "longlong", orber_tc:long()}])),
     ok.
@@ -452,109 +410,95 @@ union(_) ->
 %% Test Case: enum test
 %% Description: 
 %%-----------------------------------------------------------------
-enum(doc) -> [];
-enum(suite) -> [];
 enum(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:enum("Id", "Name", 
+    true = orber_tc:check_tc(orber_tc:enum("Id", "Name", 
 						 ["E1", "E2", "E3"])),
-    ?line false = orber_tc:check_tc(orber_tc:enum(42, "Name", 
+    false = orber_tc:check_tc(orber_tc:enum(42, "Name", 
 						  ["E1", "E2", "E3"])),
-    ?line false = orber_tc:check_tc(orber_tc:enum("Id", false, 
+    false = orber_tc:check_tc(orber_tc:enum("Id", false, 
 						  ["E1", "E2", "E3"])),
-    ?line false = orber_tc:check_tc(orber_tc:enum("Id", "Name", 
+    false = orber_tc:check_tc(orber_tc:enum("Id", "Name", 
 						  ["E1", false, "E3"])),
-    ?line code(orber_tc:enum("Id", "Name", ["E1", "E2", "E3"])),
-    ?line ?match(code(orber_tc:enum(false, "Name", ["E1", "E2", "E3"]))),
-    ?line ?match(code(orber_tc:enum("Id", 42, ["E1", "E2", "E3"]))),
-    ?line ?match(code(orber_tc:enum("Id", "Name", ["E1", false, "E3"]))),
+    code(orber_tc:enum("Id", "Name", ["E1", "E2", "E3"])),
+    ?match(code(orber_tc:enum(false, "Name", ["E1", "E2", "E3"]))),
+    ?match(code(orber_tc:enum("Id", 42, ["E1", "E2", "E3"]))),
+    ?match(code(orber_tc:enum("Id", "Name", ["E1", false, "E3"]))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: string
 %% Description: 
 %%-----------------------------------------------------------------
-string(doc) -> [];
-string(suite) -> [];
 string(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:string(0)),
-    ?line true = orber_tc:check_tc(orber_tc:string(1)),
-    ?line false = orber_tc:check_tc(orber_tc:string("wrong")),
-    ?line code(orber_tc:string(0)),
-    ?line code(orber_tc:string(1)),
-    ?line ?match(code(orber_tc:string(-1))),
-    ?line ?match(code(orber_tc:string(?ULONGMAX+1))),
-    ?line ?match(code(orber_tc:string("wrong"))),
+    true = orber_tc:check_tc(orber_tc:string(0)),
+    true = orber_tc:check_tc(orber_tc:string(1)),
+    false = orber_tc:check_tc(orber_tc:string("wrong")),
+    code(orber_tc:string(0)),
+    code(orber_tc:string(1)),
+    ?match(code(orber_tc:string(-1))),
+    ?match(code(orber_tc:string(?ULONGMAX+1))),
+    ?match(code(orber_tc:string("wrong"))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: wstring
 %% Description: 
 %%-----------------------------------------------------------------
-wstring(doc) -> [];
-wstring(suite) -> [];
 wstring(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:wstring(0)),
-    ?line true = orber_tc:check_tc(orber_tc:wstring(1)),
-    ?line false = orber_tc:check_tc(orber_tc:wstring("wrong")),
-    ?line code(orber_tc:wstring(0)),
-    ?line code(orber_tc:wstring(1)),
-    ?line ?match(code(orber_tc:wstring(-1))),
-    ?line ?match(code(orber_tc:wstring(?ULONGMAX+1))),
-    ?line ?match(code(orber_tc:wstring(false))),
+    true = orber_tc:check_tc(orber_tc:wstring(0)),
+    true = orber_tc:check_tc(orber_tc:wstring(1)),
+    false = orber_tc:check_tc(orber_tc:wstring("wrong")),
+    code(orber_tc:wstring(0)),
+    code(orber_tc:wstring(1)),
+    ?match(code(orber_tc:wstring(-1))),
+    ?match(code(orber_tc:wstring(?ULONGMAX+1))),
+    ?match(code(orber_tc:wstring(false))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: sequence
 %% Description: 
 %%-----------------------------------------------------------------
-sequence(doc) -> [];
-sequence(suite) -> [];
 sequence(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:sequence(orber_tc:struct("Id", "Name", ?ELIST), 0)),
-    ?line code(orber_tc:sequence(orber_tc:struct("Id", "Name", ?ELIST), 0)),
+    true = orber_tc:check_tc(orber_tc:sequence(orber_tc:struct("Id", "Name", ?ELIST), 0)),
+    code(orber_tc:sequence(orber_tc:struct("Id", "Name", ?ELIST), 0)),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: array
 %% Description: 
 %%-----------------------------------------------------------------
-array(doc) -> [];
-array(suite) -> [];
 array(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:array(orber_tc:struct("Id", "Name", ?ELIST), 1)),
-    ?line code(orber_tc:array(orber_tc:struct("Id", "Name", ?ELIST), 1)),
+    true = orber_tc:check_tc(orber_tc:array(orber_tc:struct("Id", "Name", ?ELIST), 1)),
+    code(orber_tc:array(orber_tc:struct("Id", "Name", ?ELIST), 1)),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: alias
 %% Description: 
 %%-----------------------------------------------------------------
-alias(doc) -> [];
-alias(suite) -> [];
 alias(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?ELIST))),
-    ?line false = orber_tc:check_tc(orber_tc:alias(false, "Name", orber_tc:struct("Id", "Name", ?ELIST))),
-    ?line false = orber_tc:check_tc(orber_tc:alias("Id", 42, orber_tc:struct("Id", "Name", ?ELIST))),
-    ?line false = orber_tc:check_tc(orber_tc:alias("Id", "Name", "wrong")),
-    ?line code(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?ELIST))),
-    ?line ?match(code(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?VELIST)))),
+    true = orber_tc:check_tc(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?ELIST))),
+    false = orber_tc:check_tc(orber_tc:alias(false, "Name", orber_tc:struct("Id", "Name", ?ELIST))),
+    false = orber_tc:check_tc(orber_tc:alias("Id", 42, orber_tc:struct("Id", "Name", ?ELIST))),
+    false = orber_tc:check_tc(orber_tc:alias("Id", "Name", "wrong")),
+    code(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?ELIST))),
+    ?match(code(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?VELIST)))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: exception
 %% Description: 
 %%-----------------------------------------------------------------
-exception(doc) -> [];
-exception(suite) -> [];
 exception(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:exception("Id", "Name", ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:exception(42, "Name", ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:exception("Id", false, ?ELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:exception("Id", "Name", "wrong")),
-    ?line code(orber_tc:exception("Id", "Name", ?ELIST)),
-    ?line ?match(code(orber_tc:exception(42, "Name", ?ELIST))),
-    ?line ?match(code(orber_tc:exception("Id", false, ?ELIST))),
-    ?line ?match(code(orber_tc:exception("Id", "Name", "wrong"))),
+    true = orber_tc:check_tc(orber_tc:exception("Id", "Name", ?ELIST)),
+    false = orber_tc:check_tc(orber_tc:exception(42, "Name", ?ELIST)),
+    false = orber_tc:check_tc(orber_tc:exception("Id", false, ?ELIST)),
+    false = orber_tc:check_tc(orber_tc:exception("Id", "Name", "wrong")),
+    code(orber_tc:exception("Id", "Name", ?ELIST)),
+    ?match(code(orber_tc:exception(42, "Name", ?ELIST))),
+    ?match(code(orber_tc:exception("Id", false, ?ELIST))),
+    ?match(code(orber_tc:exception("Id", "Name", "wrong"))),
 
     ok.
 
@@ -562,86 +506,76 @@ exception(_) ->
 %% Test Case: fixed
 %% Description: 
 %%-----------------------------------------------------------------
-fixed(doc) -> [];
-fixed(suite) -> [];
 fixed(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:fixed(25, 2)),
-    ?line code(orber_tc:fixed(25, 2)),
+    true = orber_tc:check_tc(orber_tc:fixed(25, 2)),
+    code(orber_tc:fixed(25, 2)),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: value
 %% Description: 
 %%-----------------------------------------------------------------
-value(doc) -> [];
-value(suite) -> [];
 value(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:value("Id", "Name", 42,
+    true = orber_tc:check_tc(orber_tc:value("Id", "Name", 42,
 						  orber_tc:fixed(25, 2), ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:value(42, "Name", 42,
+    false = orber_tc:check_tc(orber_tc:value(42, "Name", 42,
 						   orber_tc:fixed(25, 2), ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:value("Id", 42, 42,
+    false = orber_tc:check_tc(orber_tc:value("Id", 42, 42,
 						   orber_tc:fixed(25, 2), ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:value("Id", "Name", "wrong",
+    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "wrong",
 						   orber_tc:fixed(25, 2), ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
+    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
 						   orber_tc:fixed(25, 2), ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
+    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
 						   ?VELIST, ?VELIST)),
-    ?line false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
+    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
 						   orber_tc:fixed(25, 2), false)),
 
-    ?line code(orber_tc:value("Id", "Name", 42, orber_tc:long(), ?VELIST)),
+    code(orber_tc:value("Id", "Name", 42, orber_tc:long(), ?VELIST)),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: value_box
 %% Description: 
 %%-----------------------------------------------------------------
-value_box(doc) -> [];
-value_box(suite) -> [];
 value_box(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:value_box("Id", "Name", 
+    true = orber_tc:check_tc(orber_tc:value_box("Id", "Name", 
 						      orber_tc:fixed(25, 2))),
-    ?line false = orber_tc:check_tc(orber_tc:value_box(42, "Name", 
+    false = orber_tc:check_tc(orber_tc:value_box(42, "Name", 
 						       orber_tc:fixed(25, 2))),
-    ?line false = orber_tc:check_tc(orber_tc:value_box("Id", 42, 
+    false = orber_tc:check_tc(orber_tc:value_box("Id", 42, 
 						       orber_tc:fixed(25, 2))),
-    ?line false = orber_tc:check_tc(orber_tc:value_box("Id", "Name", "wrong")),
-    ?line code(orber_tc:value_box("Id", "Name", orber_tc:long())),
-    ?line ?match(code(orber_tc:value_box(42, "Name", orber_tc:short()))),
-    ?line ?match(code(orber_tc:value_box("Id", 42, orber_tc:char()))),
-    ?line ?match(code(orber_tc:value_box("Id", "Name", false))),
+    false = orber_tc:check_tc(orber_tc:value_box("Id", "Name", "wrong")),
+    code(orber_tc:value_box("Id", "Name", orber_tc:long())),
+    ?match(code(orber_tc:value_box(42, "Name", orber_tc:short()))),
+    ?match(code(orber_tc:value_box("Id", 42, orber_tc:char()))),
+    ?match(code(orber_tc:value_box("Id", "Name", false))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: native
 %% Description: 
 %%-----------------------------------------------------------------
-native(doc) -> [];
-native(suite) -> [];
 native(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:native("Id", "Name")),
-    ?line false = orber_tc:check_tc(orber_tc:native(42, "Name")),
-    ?line false = orber_tc:check_tc(orber_tc:native("Id", 42)),
-    ?line code(orber_tc:native("Id", "Name")),
-    ?line ?match(code(orber_tc:native(42, "Name"))),
-    ?line ?match(code(orber_tc:native("Id", 42))),
+    true = orber_tc:check_tc(orber_tc:native("Id", "Name")),
+    false = orber_tc:check_tc(orber_tc:native(42, "Name")),
+    false = orber_tc:check_tc(orber_tc:native("Id", 42)),
+    code(orber_tc:native("Id", "Name")),
+    ?match(code(orber_tc:native(42, "Name"))),
+    ?match(code(orber_tc:native("Id", 42))),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: abstract_interface
 %% Description: 
 %%-----------------------------------------------------------------
-abstract_interface(doc) -> [];
-abstract_interface(suite) -> [];
 abstract_interface(_) ->
-    ?line true = orber_tc:check_tc(orber_tc:abstract_interface("RepId", "Name")),
-    ?line false = orber_tc:check_tc(orber_tc:abstract_interface(false, "Name")),
-    ?line false = orber_tc:check_tc(orber_tc:abstract_interface("RepId", 42)),
-    ?line code(orber_tc:abstract_interface("RepId", "Name")),
-    ?line ?match(code(orber_tc:abstract_interface(42, "Name"))),
-    ?line ?match(code(orber_tc:abstract_interface("Id", 42))),
+    true = orber_tc:check_tc(orber_tc:abstract_interface("RepId", "Name")),
+    false = orber_tc:check_tc(orber_tc:abstract_interface(false, "Name")),
+    false = orber_tc:check_tc(orber_tc:abstract_interface("RepId", 42)),
+    code(orber_tc:abstract_interface("RepId", "Name")),
+    ?match(code(orber_tc:abstract_interface(42, "Name"))),
+    ?match(code(orber_tc:abstract_interface("Id", 42))),
     ok.
 
 
@@ -650,22 +584,18 @@ abstract_interface(_) ->
 %% Test Case: indirection
 %% Description: 
 %%-----------------------------------------------------------------
-indirection(doc) -> [];
-indirection(suite) -> [];
 indirection(_) ->
-    ?line true = orber_tc:check_tc({'none', 42}),
+    true = orber_tc:check_tc({'none', 42}),
     ok.
 
 %%-----------------------------------------------------------------
 %% Test Case: get_tc
 %% Description: 
 %%-----------------------------------------------------------------
-get_tc(doc) -> [];
-get_tc(suite) -> [];
 get_tc(_) ->
     TC = 'CosNaming_Binding':tc(),
-    ?line TC = orber_tc:get_tc({'CosNaming_Binding', 42}),
-    ?line ?match(orber_tc:get_tc({'none', 42})),
+    TC = orber_tc:get_tc({'CosNaming_Binding', 42}),
+    ?match(orber_tc:get_tc({'none', 42})),
     ok.
 
 %%-----------------------------------------------------------------