diff options
| -rw-r--r-- | lib/cosNotification/test/eventDB_SUITE.erl | 85 | ||||
| -rw-r--r-- | lib/cosNotification/test/generated_SUITE.erl | 185 | ||||
| -rw-r--r-- | lib/cosNotification/test/grammar_SUITE.erl | 25 | ||||
| -rw-r--r-- | lib/cosNotification/test/notification_SUITE.erl | 47 |
4 files changed, 51 insertions, 291 deletions
diff --git a/lib/cosNotification/test/eventDB_SUITE.erl b/lib/cosNotification/test/eventDB_SUITE.erl index 337c7effed..a0c47ad4c7 100644 --- a/lib/cosNotification/test/eventDB_SUITE.erl +++ b/lib/cosNotification/test/eventDB_SUITE.erl @@ -45,7 +45,7 @@ -include_lib("common_test/include/ct.hrl"). %%--------------- DEFINES ------------------------------------ --define(default_timeout, ?t:minutes(20)). +-define(default_timeout, test_server:minutes(20)). -define(match(ExpectedRes, Expr), fun() -> AcTuAlReS = (catch (Expr)), @@ -57,7 +57,7 @@ _ -> io:format("###### ERROR ERROR ######~n~p~n", [AcTuAlReS]), - ?line exit(AcTuAlReS) + exit(AcTuAlReS) end end()). @@ -297,14 +297,13 @@ cases() -> %%----------------------------------------------------------------- %% Init and cleanup functions. %%----------------------------------------------------------------- - 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. @@ -333,12 +332,10 @@ end_per_suite(Config) -> %%----------------------------------------------------------------- %% cosNotification_eventDB lookup API tests %%----------------------------------------------------------------- -mapping_filter_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. This case is supposed to test", - "that the events are delivered in the correct order", - "if a MappingFilter have benn associated.", - ""]; -mapping_filter_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. This case is supposed to test +%% that the events are delivered in the correct order +%% if a MappingFilter have benn associated. mapping_filter_api(_Config) -> InitQoS = ?not_CreateInitQoS(), InitQoS2 = ?not_SetMaxEventsPerConsumer(InitQoS,100), @@ -405,12 +402,10 @@ do_lookup(QoS, Events, Return, Txt, DLFilter, PrioFilter, Timeout) -> %%----------------------------------------------------------------- %% cosNotification_eventDB discard API tests %%----------------------------------------------------------------- -discard_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. If MaxEvents limit is reached there", - "different ways we can discard the. This case will test", - "all permutations of order and discard policies.", - ""]; -discard_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. If MaxEvents limit is reached there +%% different ways we can discard the. This case will test +%% all permutations of order and discard policies. discard_api(_Config) -> InitQoS1 = ?not_CreateInitQoS(), InitQoS2 = ?not_SetPriority(InitQoS1, 10), @@ -523,11 +518,9 @@ do_discard(Events, QoS, Reply, Txt) -> %%----------------------------------------------------------------- %% cosNotification_eventDB lookup API tests %%----------------------------------------------------------------- -lookup_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. This case is supposed to test", - "that the events are delivered in the correct order.", - ""]; -lookup_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. This case is supposed to test +%% that the events are delivered in the correct order. lookup_api(_Config) -> InitQoS = ?not_CreateInitQoS(), InitQoS2 = ?not_SetMaxEventsPerConsumer(InitQoS,100), @@ -562,11 +555,9 @@ do_lookup(QoS, Events, Return, Txt) -> %%----------------------------------------------------------------- %% cosNotification_eventDB max events API tests %%----------------------------------------------------------------- -max_events_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. If the MaxEvents QoS is updated we must be", - "able to reduce the amount of stored events.", - ""]; -max_events_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. If the MaxEvents QoS is updated we must be +%% able to reduce the amount of stored events. max_events_api(_Config) -> QoS1 = ?not_CreateInitQoS(), @@ -602,10 +593,8 @@ max_events_api(_Config) -> %%----------------------------------------------------------------- %% cosNotification_eventDB persisten events API tests %%----------------------------------------------------------------- -persisten_event_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once.", - ""]; -persisten_event_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. persisten_event_api(_Config) -> QoS1 = ?not_CreateInitQoS(), @@ -639,11 +628,9 @@ persisten_event_api(_Config) -> %%----------------------------------------------------------------- %% cosNotification_eventDB gc API tests %%----------------------------------------------------------------- -gc_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. If Deadline defined the events that", - "are older must be discarded.", - ""]; -gc_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. If Deadline defined the events that +%% are older must be discarded. gc_api(_Config) -> QoS1 = ?not_CreateInitQoS(), @@ -680,11 +667,9 @@ gc_api(_Config) -> %%----------------------------------------------------------------- %% cosNotification_eventDB gc API tests %%----------------------------------------------------------------- -auto_gc_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. If Deadline defined the events that", - "are older must be discarded.", - ""]; -auto_gc_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. If Deadline defined the events that +%% are older must be discarded. auto_gc_api(_Config) -> QoS1 = ?not_CreateInitQoS(), @@ -717,11 +702,9 @@ auto_gc_api(_Config) -> %%----------------------------------------------------------------- %% cosNotification_eventDB start- and stop-time API tests %%----------------------------------------------------------------- -start_stop_time_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. If Deadline defined the events that", - "are older must be discarded.", - ""]; -start_stop_time_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. If Deadline defined the events that +%% are older must be discarded. start_stop_time_api(_Config) -> QoS1 = ?not_CreateInitQoS(), @@ -823,12 +806,10 @@ start_stop_time_api(_Config) -> %%----------------------------------------------------------------- %% cosNotification_eventDB order API tests %%----------------------------------------------------------------- -reorder_api(doc) -> ["The event DB is used to store events which cannot be", - "delivered at once. If the QoS is updated we must be", - "able to change the ordering of events as the discard", - "and order policies tells us.", - ""]; -reorder_api(suite) -> []; +%% The event DB is used to store events which cannot be +%% delivered at once. If the QoS is updated we must be +%% able to change the ordering of events as the discard +%% and order policies tells us. reorder_api(_Config) -> %% We need to test switching between: %% * Priority -> Fifo diff --git a/lib/cosNotification/test/generated_SUITE.erl b/lib/cosNotification/test/generated_SUITE.erl index 810a007672..8e3ccbd90e 100644 --- a/lib/cosNotification/test/generated_SUITE.erl +++ b/lib/cosNotification/test/generated_SUITE.erl @@ -29,7 +29,7 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("orber/include/corba.hrl"). --define(default_timeout, ?t:minutes(3)). +-define(default_timeout, test_server:minutes(3)). -define(match(ExpectedRes, Expr), fun() -> @@ -40,7 +40,7 @@ _ -> io:format("###### ERROR ERROR ######~n~p~n", [AcTuAlReS]), - ?line exit(AcTuAlReS) + exit(AcTuAlReS) end end()). @@ -51,7 +51,7 @@ Not -> io:format("###### ERROR ERROR ######~n~p~n", [AcTuAlReS]), - ?line exit(AcTuAlReS); + exit(AcTuAlReS); _ -> AcTuAlReS end @@ -63,7 +63,7 @@ case orber_tc:check_tc(TC) of false -> io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]), - ?line exit(TC); + exit(TC); true -> true end @@ -193,12 +193,12 @@ end_per_group(_GroupName, Config) -> %% Init and cleanup functions. %%----------------------------------------------------------------- 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. @@ -206,8 +206,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification' %% Description: %%----------------------------------------------------------------- -'CosNotification'(doc) -> ["CosNotification"]; -'CosNotification'(suite) -> []; 'CosNotification'(_) -> ?match("EventReliability", 'CosNotification':'EventReliability'()), ?match(0, 'CosNotification':'BestEffort'()), @@ -242,8 +240,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_EventHeader' %% Description: %%----------------------------------------------------------------- -'CosNotification_EventHeader'(doc) -> ["CosNotification_EventHeader"]; -'CosNotification_EventHeader'(suite) -> []; 'CosNotification_EventHeader'(_) -> ?match(true, orber_tc:check_tc('CosNotification_EventHeader':tc())), ?match("IDL:omg.org/CosNotification/EventHeader:1.0", @@ -257,8 +253,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_EventType' %% Description: %%----------------------------------------------------------------- -'CosNotification_EventType'(doc) -> ["CosNotification_EventType"]; -'CosNotification_EventType'(suite) -> []; 'CosNotification_EventType'(_) -> ?match(true, orber_tc:check_tc('CosNotification_EventType':tc())), ?match("IDL:omg.org/CosNotification/EventType:1.0", @@ -272,8 +266,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_FixedEventHeader' %% Description: %%----------------------------------------------------------------- -'CosNotification_FixedEventHeader'(doc) -> ["CosNotification_FixedEventHeader"]; -'CosNotification_FixedEventHeader'(suite) -> []; 'CosNotification_FixedEventHeader'(_) -> ?match(true, orber_tc:check_tc('CosNotification_FixedEventHeader':tc())), ?match("IDL:omg.org/CosNotification/FixedEventHeader:1.0", @@ -287,8 +279,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_NamedPropertyRange' %% Description: %%----------------------------------------------------------------- -'CosNotification_NamedPropertyRange'(doc) -> ["CosNotification_NamedPropertyRange"]; -'CosNotification_NamedPropertyRange'(suite) -> []; 'CosNotification_NamedPropertyRange'(_) -> ?match(true, orber_tc:check_tc('CosNotification_NamedPropertyRange':tc())), ?match("IDL:omg.org/CosNotification/NamedPropertyRange:1.0", @@ -302,8 +292,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_Property' %% Description: %%----------------------------------------------------------------- -'CosNotification_Property'(doc) -> ["CosNotification_Property"]; -'CosNotification_Property'(suite) -> []; 'CosNotification_Property'(_) -> ?match(true, orber_tc:check_tc('CosNotification_Property':tc())), ?match("IDL:omg.org/CosNotification/Property:1.0", @@ -317,8 +305,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_PropertyError' %% Description: %%----------------------------------------------------------------- -'CosNotification_PropertyError'(doc) -> ["CosNotification_PropertyError"]; -'CosNotification_PropertyError'(suite) -> []; 'CosNotification_PropertyError'(_) -> ?match(true, orber_tc:check_tc('CosNotification_PropertyError':tc())), ?match("IDL:omg.org/CosNotification/PropertyError:1.0", @@ -332,8 +318,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_PropertyRange' %% Description: %%----------------------------------------------------------------- -'CosNotification_PropertyRange'(doc) -> [""]; -'CosNotification_PropertyRange'(suite) -> []; 'CosNotification_PropertyRange'(_) -> ?match(true, orber_tc:check_tc('CosNotification_PropertyRange':tc())), ?match("IDL:omg.org/CosNotification/PropertyRange:1.0", @@ -347,8 +331,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_StructuredEvent' %% Description: %%----------------------------------------------------------------- -'CosNotification_StructuredEvent'(doc) -> ["CosNotification_StructuredEvent"]; -'CosNotification_StructuredEvent'(suite) -> []; 'CosNotification_StructuredEvent'(_) -> ?match(true, orber_tc:check_tc('CosNotification_StructuredEvent':tc())), ?match("IDL:omg.org/CosNotification/StructuredEvent:1.0", @@ -362,8 +344,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_UnsupportedAdmin' %% Description: %%----------------------------------------------------------------- -'CosNotification_UnsupportedAdmin'(doc) -> ["CosNotification_UnsupportedAdmin"]; -'CosNotification_UnsupportedAdmin'(suite) -> []; 'CosNotification_UnsupportedAdmin'(_) -> ?match(true, orber_tc:check_tc('CosNotification_UnsupportedAdmin':tc())), ?match("IDL:omg.org/CosNotification/UnsupportedAdmin:1.0", @@ -377,8 +357,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_UnsupportedQoS' %% Description: %%----------------------------------------------------------------- -'CosNotification_UnsupportedQoS'(doc) -> ["CosNotification_UnsupportedQoS"]; -'CosNotification_UnsupportedQoS'(suite) -> []; 'CosNotification_UnsupportedQoS'(_) -> ?match(true, orber_tc:check_tc('CosNotification_UnsupportedQoS':tc())), ?match("IDL:omg.org/CosNotification/UnsupportedQoS:1.0", @@ -392,8 +370,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_EventBatch' %% Description: %%----------------------------------------------------------------- -'CosNotification_EventBatch'(doc) -> ["CosNotification_EventBatch"]; -'CosNotification_EventBatch'(suite) -> []; 'CosNotification_EventBatch'(_) -> ?match(true, orber_tc:check_tc('CosNotification_EventBatch':tc())), ?match("IDL:omg.org/CosNotification/EventBatch:1.0", @@ -407,8 +383,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_EventTypeSeq' %% Description: %%----------------------------------------------------------------- -'CosNotification_EventTypeSeq'(doc) -> ["CosNotification_EventTypeSeq"]; -'CosNotification_EventTypeSeq'(suite) -> []; 'CosNotification_EventTypeSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotification_EventTypeSeq':tc())), ?match("IDL:omg.org/CosNotification/EventTypeSeq:1.0", @@ -422,8 +396,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_NamedPropertyRangeSeq' %% Description: %%----------------------------------------------------------------- -'CosNotification_NamedPropertyRangeSeq'(doc) -> ["CosNotification_NamedPropertyRangeSeq"]; -'CosNotification_NamedPropertyRangeSeq'(suite) -> []; 'CosNotification_NamedPropertyRangeSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotification_NamedPropertyRangeSeq':tc())), ?match("IDL:omg.org/CosNotification/NamedPropertyRangeSeq:1.0", @@ -437,8 +409,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_PropertyErrorSeq' %% Description: %%----------------------------------------------------------------- -'CosNotification_PropertyErrorSeq'(doc) -> ["CosNotification_PropertyErrorSeq"]; -'CosNotification_PropertyErrorSeq'(suite) -> []; 'CosNotification_PropertyErrorSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotification_PropertyErrorSeq':tc())), ?match("IDL:omg.org/CosNotification/PropertyErrorSeq:1.0", @@ -452,8 +422,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_PropertySeq' %% Description: %%----------------------------------------------------------------- -'CosNotification_PropertySeq'(doc) -> ["CosNotification_PropertySeq"]; -'CosNotification_PropertySeq'(suite) -> []; 'CosNotification_PropertySeq'(_) -> ?match(true, orber_tc:check_tc('CosNotification_PropertySeq':tc())), ?match("IDL:omg.org/CosNotification/PropertySeq:1.0", @@ -467,8 +435,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_AdminLimit' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_AdminLimit'(doc) -> ["CosNotifyChannelAdmin_AdminLimit"]; -'CosNotifyChannelAdmin_AdminLimit'(suite) -> []; 'CosNotifyChannelAdmin_AdminLimit'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminLimit':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminLimit:1.0", @@ -482,8 +448,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_AdminLimitExceeded' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_AdminLimitExceeded'(doc) -> ["CosNotifyChannelAdmin_AdminLimitExceeded"]; -'CosNotifyChannelAdmin_AdminLimitExceeded'(suite) -> []; 'CosNotifyChannelAdmin_AdminLimitExceeded'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminLimitExceeded':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminLimitExceeded:1.0", @@ -497,8 +461,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_AdminNotFound' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_AdminNotFound'(doc) -> ["CosNotifyChannelAdmin_AdminNotFound"]; -'CosNotifyChannelAdmin_AdminNotFound'(suite) -> []; 'CosNotifyChannelAdmin_AdminNotFound'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminNotFound':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminNotFound:1.0", @@ -512,8 +474,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ChannelNotFound' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ChannelNotFound'(doc) -> ["CosNotifyChannelAdmin_ChannelNotFound"]; -'CosNotifyChannelAdmin_ChannelNotFound'(suite) -> []; 'CosNotifyChannelAdmin_ChannelNotFound'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ChannelNotFound':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/ChannelNotFound:1.0", @@ -527,8 +487,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ConnectionAlreadyActive' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ConnectionAlreadyActive'(doc) -> ["CosNotifyChannelAdmin_ConnectionAlreadyActive"]; -'CosNotifyChannelAdmin_ConnectionAlreadyActive'(suite) -> []; 'CosNotifyChannelAdmin_ConnectionAlreadyActive'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ConnectionAlreadyActive':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/ConnectionAlreadyActive:1.0", @@ -537,13 +495,10 @@ end_per_testcase(_Case, Config) -> 'CosNotifyChannelAdmin_ConnectionAlreadyActive':name()), ok. - %%----------------------------------------------------------------- %% Test Case: 'CosNotifyChannelAdmin_ConnectionAlreadyInactive' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ConnectionAlreadyInactive'(doc) -> ["CosNotifyChannelAdmin_ConnectionAlreadyInactive"]; -'CosNotifyChannelAdmin_ConnectionAlreadyInactive'(suite) -> []; 'CosNotifyChannelAdmin_ConnectionAlreadyInactive'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ConnectionAlreadyInactive':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/ConnectionAlreadyInactive:1.0", @@ -556,8 +511,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_NotConnected' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_NotConnected'(doc) -> ["CosNotifyChannelAdmin_NotConnected"]; -'CosNotifyChannelAdmin_NotConnected'(suite) -> []; 'CosNotifyChannelAdmin_NotConnected'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_NotConnected':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/NotConnected:1.0", @@ -570,8 +523,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_AdminIDSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_AdminIDSeq'(doc) -> ["CosNotifyChannelAdmin_AdminIDSeq"]; -'CosNotifyChannelAdmin_AdminIDSeq'(suite) -> []; 'CosNotifyChannelAdmin_AdminIDSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminIDSeq':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminIDSeq:1.0", @@ -584,8 +535,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ChannelIDSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ChannelIDSeq'(doc) -> ["CosNotifyChannelAdmin_ChannelIDSeq"]; -'CosNotifyChannelAdmin_ChannelIDSeq'(suite) -> []; 'CosNotifyChannelAdmin_ChannelIDSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ChannelIDSeq':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/ChannelIDSeq:1.0", @@ -598,8 +547,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyIDSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyIDSeq'(doc) -> ["CosNotifyChannelAdmin_ProxyIDSeq"]; -'CosNotifyChannelAdmin_ProxyIDSeq'(suite) -> []; 'CosNotifyChannelAdmin_ProxyIDSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ProxyIDSeq':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyIDSeq:1.0", @@ -612,8 +559,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_CallbackNotFound' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_CallbackNotFound'(doc) -> ["CosNotifyFilter_CallbackNotFound"]; -'CosNotifyFilter_CallbackNotFound'(suite) -> []; 'CosNotifyFilter_CallbackNotFound'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_CallbackNotFound':tc())), ?match("IDL:omg.org/CosNotifyFilter/CallbackNotFound:1.0", @@ -626,8 +571,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_ConstraintExp' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_ConstraintExp'(doc) -> ["CosNotifyFilter_ConstraintExp"]; -'CosNotifyFilter_ConstraintExp'(suite) -> []; 'CosNotifyFilter_ConstraintExp'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintExp':tc())), ?match("IDL:omg.org/CosNotifyFilter/ConstraintExp:1.0", @@ -640,8 +583,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_ConstraintInfo' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_ConstraintInfo'(doc) -> ["CosNotifyFilter_ConstraintInfo"]; -'CosNotifyFilter_ConstraintInfo'(suite) -> []; 'CosNotifyFilter_ConstraintInfo'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintInfo':tc())), ?match("IDL:omg.org/CosNotifyFilter/ConstraintInfo:1.0", @@ -654,8 +595,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_ConstraintNotFound' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_ConstraintNotFound'(doc) -> ["CosNotifyFilter_ConstraintNotFound"]; -'CosNotifyFilter_ConstraintNotFound'(suite) -> []; 'CosNotifyFilter_ConstraintNotFound'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintNotFound':tc())), ?match("IDL:omg.org/CosNotifyFilter/ConstraintNotFound:1.0", @@ -668,8 +607,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_DuplicateConstraintID' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_DuplicateConstraintID'(doc) -> ["CosNotifyFilter_DuplicateConstraintID"]; -'CosNotifyFilter_DuplicateConstraintID'(suite) -> []; 'CosNotifyFilter_DuplicateConstraintID'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_DuplicateConstraintID':tc())), ?match("IDL:omg.org/CosNotifyFilter/DuplicateConstraintID:1.0", @@ -682,8 +619,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_FilterNotFound' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_FilterNotFound'(doc) -> ["CosNotifyFilter_FilterNotFound"]; -'CosNotifyFilter_FilterNotFound'(suite) -> []; 'CosNotifyFilter_FilterNotFound'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_FilterNotFound':tc())), ?match("IDL:omg.org/CosNotifyFilter/FilterNotFound:1.0", @@ -696,8 +631,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_InvalidConstraint' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_InvalidConstraint'(doc) -> ["CosNotifyFilter_InvalidConstraint"]; -'CosNotifyFilter_InvalidConstraint'(suite) -> []; 'CosNotifyFilter_InvalidConstraint'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_InvalidConstraint':tc())), ?match("IDL:omg.org/CosNotifyFilter/InvalidConstraint:1.0", @@ -710,8 +643,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_InvalidGrammar' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_InvalidGrammar'(doc) -> ["CosNotifyFilter_InvalidGrammar"]; -'CosNotifyFilter_InvalidGrammar'(suite) -> []; 'CosNotifyFilter_InvalidGrammar'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_InvalidGrammar':tc())), ?match("IDL:omg.org/CosNotifyFilter/InvalidGrammar:1.0", @@ -724,8 +655,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_InvalidValue' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_InvalidValue'(doc) -> ["CosNotifyFilter_InvalidValue"]; -'CosNotifyFilter_InvalidValue'(suite) -> []; 'CosNotifyFilter_InvalidValue'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_InvalidValue':tc())), ?match("IDL:omg.org/CosNotifyFilter/InvalidValue:1.0", @@ -738,8 +667,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_MappingConstraintInfo' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_MappingConstraintInfo'(doc) -> ["CosNotifyFilter_MappingConstraintInfo"]; -'CosNotifyFilter_MappingConstraintInfo'(suite) -> []; 'CosNotifyFilter_MappingConstraintInfo'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintInfo':tc())), ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintInfo:1.0", @@ -752,8 +679,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_MappingConstraintPair' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_MappingConstraintPair'(doc) -> ["CosNotifyFilter_MappingConstraintPair"]; -'CosNotifyFilter_MappingConstraintPair'(suite) -> []; 'CosNotifyFilter_MappingConstraintPair'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintPair':tc())), ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintPair:1.0", @@ -766,8 +691,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_UnsupportedFilterableData' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_UnsupportedFilterableData'(doc) -> ["CosNotifyFilter_UnsupportedFilterableData"]; -'CosNotifyFilter_UnsupportedFilterableData'(suite) -> []; 'CosNotifyFilter_UnsupportedFilterableData'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_UnsupportedFilterableData':tc())), ?match("IDL:omg.org/CosNotifyFilter/UnsupportedFilterableData:1.0", @@ -780,8 +703,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_CallbackIDSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_CallbackIDSeq'(doc) -> ["CosNotifyFilter_CallbackIDSeq"]; -'CosNotifyFilter_CallbackIDSeq'(suite) -> []; 'CosNotifyFilter_CallbackIDSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_CallbackIDSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/CallbackIDSeq:1.0", @@ -795,8 +716,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_ConstraintExpSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_ConstraintExpSeq'(doc) -> ["CosNotifyFilter_ConstraintExpSeq"]; -'CosNotifyFilter_ConstraintExpSeq'(suite) -> []; 'CosNotifyFilter_ConstraintExpSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintExpSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/ConstraintExpSeq:1.0", @@ -810,8 +729,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_ConstraintIDSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_ConstraintIDSeq'(doc) -> ["CosNotifyFilter_ConstraintIDSeq"]; -'CosNotifyFilter_ConstraintIDSeq'(suite) -> []; 'CosNotifyFilter_ConstraintIDSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintIDSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/ConstraintIDSeq:1.0", @@ -825,8 +742,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_ConstraintInfoSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_ConstraintInfoSeq'(doc) -> ["CosNotifyFilter_ConstraintInfoSeq"]; -'CosNotifyFilter_ConstraintInfoSeq'(suite) -> []; 'CosNotifyFilter_ConstraintInfoSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintInfoSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/ConstraintInfoSeq:1.0", @@ -840,8 +755,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_FilterIDSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_FilterIDSeq'(doc) -> ["CosNotifyFilter_FilterIDSeq"]; -'CosNotifyFilter_FilterIDSeq'(suite) -> []; 'CosNotifyFilter_FilterIDSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_FilterIDSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/FilterIDSeq:1.0", @@ -855,8 +768,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_MappingConstraintInfoSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_MappingConstraintInfoSeq'(doc) -> ["CosNotifyFilter_MappingConstraintInfoSeq"]; -'CosNotifyFilter_MappingConstraintInfoSeq'(suite) -> []; 'CosNotifyFilter_MappingConstraintInfoSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintInfoSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintInfoSeq:1.0", @@ -870,8 +781,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_MappingConstraintPairSeq' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_MappingConstraintPairSeq'(doc) -> ["CosNotifyFilter_MappingConstraintPairSeq"]; -'CosNotifyFilter_MappingConstraintPairSeq'(suite) -> []; 'CosNotifyFilter_MappingConstraintPairSeq'(_) -> ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintPairSeq':tc())), ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintPairSeq:1.0", @@ -885,8 +794,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_InvalidEventType' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_InvalidEventType'(doc) -> ["CosNotifyComm_InvalidEventType"]; -'CosNotifyComm_InvalidEventType'(suite) -> []; 'CosNotifyComm_InvalidEventType'(_) -> ?match(true, orber_tc:check_tc('CosNotifyComm_InvalidEventType':tc())), ?match("IDL:omg.org/CosNotifyComm/InvalidEventType:1.0", @@ -900,8 +807,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyNotFound' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyNotFound'(doc) -> ["CosNotifyChannelAdmin_ProxyNotFound"]; -'CosNotifyChannelAdmin_ProxyNotFound'(suite) -> []; 'CosNotifyChannelAdmin_ProxyNotFound'(_) -> ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ProxyNotFound':tc())), ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyNotFound:1.0", @@ -915,8 +820,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_AdminPropertiesAdmin' %% Description: %%----------------------------------------------------------------- -'CosNotification_AdminPropertiesAdmin'(doc) -> ["CosNotification_AdminPropertiesAdmin"]; -'CosNotification_AdminPropertiesAdmin'(suite) -> []; 'CosNotification_AdminPropertiesAdmin'(_) -> ?nomatch(undefined, 'CosNotification_AdminPropertiesAdmin':oe_tc(get_admin)), ?nomatch(undefined, 'CosNotification_AdminPropertiesAdmin':oe_tc(set_admin)), @@ -933,8 +836,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotification_QoSAdmin' %% Description: %%----------------------------------------------------------------- -'CosNotification_QoSAdmin'(doc) -> ["CosNotification_QoSAdmin"]; -'CosNotification_QoSAdmin'(suite) -> []; 'CosNotification_QoSAdmin'(_) -> ?nomatch(undefined, 'CosNotification_QoSAdmin':oe_tc(get_qos)), ?nomatch(undefined, 'CosNotification_QoSAdmin':oe_tc(set_qos)), @@ -952,8 +853,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ConsumerAdmin' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ConsumerAdmin'(doc) -> ["CosNotifyChannelAdmin_ConsumerAdmin"]; -'CosNotifyChannelAdmin_ConsumerAdmin'(suite) -> []; 'CosNotifyChannelAdmin_ConsumerAdmin'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_MyID')), ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_MyChannel')), @@ -999,8 +898,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_EventChannel' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_EventChannel'(doc) -> ["CosNotifyChannelAdmin_EventChannel"]; -'CosNotifyChannelAdmin_EventChannel'(suite) -> []; 'CosNotifyChannelAdmin_EventChannel'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc('_get_MyFactory')), ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc('_get_default_consumer_admin')), @@ -1039,8 +936,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_EventChannelFactory' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_EventChannelFactory'(doc) -> ["CosNotifyChannelAdmin_EventChannelFactory"]; -'CosNotifyChannelAdmin_EventChannelFactory'(suite) -> []; 'CosNotifyChannelAdmin_EventChannelFactory'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannelFactory':oe_tc(create_channel)), ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannelFactory':oe_tc(get_all_channels)), @@ -1058,8 +953,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyConsumer'(doc) -> ["CosNotifyChannelAdmin_ProxyConsumer"]; -'CosNotifyChannelAdmin_ProxyConsumer'(suite) -> []; 'CosNotifyChannelAdmin_ProxyConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc('_get_MyType')), ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc('_get_MyAdmin')), @@ -1088,8 +981,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyPullConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyPullConsumer'(doc) -> ["CosNotifyChannelAdmin_ProxyPullConsumer"]; -'CosNotifyChannelAdmin_ProxyPullConsumer'(suite) -> []; 'CosNotifyChannelAdmin_ProxyPullConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(connect_any_pull_supplier)), ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(suspend_connection)), @@ -1129,8 +1020,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyPullSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyPullSupplier'(doc) -> ["CosNotifyChannelAdmin_ProxyPullSupplier"]; -'CosNotifyChannelAdmin_ProxyPullSupplier'(suite) -> []; 'CosNotifyChannelAdmin_ProxyPullSupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_get_MyType')), ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_get_MyAdmin')), @@ -1176,8 +1065,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyPushConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyPushConsumer'(doc) -> ["CosNotifyChannelAdmin_ProxyPushConsumer"]; -'CosNotifyChannelAdmin_ProxyPushConsumer'(suite) -> []; 'CosNotifyChannelAdmin_ProxyPushConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(connect_any_push_supplier)), ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc('_get_MyType')), @@ -1216,8 +1103,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxyPushSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxyPushSupplier'(doc) -> ["CosNotifyChannelAdmin_ProxyPushSupplier"]; -'CosNotifyChannelAdmin_ProxyPushSupplier'(suite) -> []; 'CosNotifyChannelAdmin_ProxyPushSupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(connect_any_push_consumer)), ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(suspend_connection)), @@ -1264,8 +1149,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_ProxySupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_ProxySupplier'(doc) -> ["CosNotifyChannelAdmin_ProxySupplier"]; -'CosNotifyChannelAdmin_ProxySupplier'(suite) -> []; 'CosNotifyChannelAdmin_ProxySupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_get_MyType')), ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_get_MyAdmin')), @@ -1299,8 +1182,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPullConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_SequenceProxyPullConsumer'(doc) -> ["CosNotifyChannelAdmin_SequenceProxyPullConsumer"]; -'CosNotifyChannelAdmin_SequenceProxyPullConsumer'(suite) -> []; 'CosNotifyChannelAdmin_SequenceProxyPullConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(connect_sequence_pull_supplier)), ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(suspend_connection)), @@ -1338,8 +1219,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPullSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_SequenceProxyPullSupplier'(doc) -> ["CosNotifyChannelAdmin_SequenceProxyPullSupplier"]; -'CosNotifyChannelAdmin_SequenceProxyPullSupplier'(suite) -> []; 'CosNotifyChannelAdmin_SequenceProxyPullSupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(connect_sequence_pull_consumer)), ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_get_MyType')), @@ -1384,8 +1263,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPushConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_SequenceProxyPushConsumer'(doc) -> ["CosNotifyChannelAdmin_SequenceProxyPushConsumer"]; -'CosNotifyChannelAdmin_SequenceProxyPushConsumer'(suite) -> []; 'CosNotifyChannelAdmin_SequenceProxyPushConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(connect_sequence_push_supplier)), ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc('_get_MyType')), @@ -1422,8 +1299,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPushSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_SequenceProxyPushSupplier'(doc) -> ["CosNotifyChannelAdmin_SequenceProxyPushSupplier"]; -'CosNotifyChannelAdmin_SequenceProxyPushSupplier'(suite) -> []; 'CosNotifyChannelAdmin_SequenceProxyPushSupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(connect_sequence_push_consumer)), ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(suspend_connection)), @@ -1468,8 +1343,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPullConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_StructuredProxyPullConsumer'(doc) -> ["CosNotifyChannelAdmin_StructuredProxyPullConsumer"]; -'CosNotifyChannelAdmin_StructuredProxyPullConsumer'(suite) -> []; 'CosNotifyChannelAdmin_StructuredProxyPullConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(connect_structured_pull_supplier)), ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(suspend_connection)), @@ -1507,8 +1380,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPullSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_StructuredProxyPullSupplier'(doc) -> ["CosNotifyChannelAdmin_StructuredProxyPullSupplier"]; -'CosNotifyChannelAdmin_StructuredProxyPullSupplier'(suite) -> []; 'CosNotifyChannelAdmin_StructuredProxyPullSupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(connect_structured_pull_consumer)), ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_get_MyType')), @@ -1553,8 +1424,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPushConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_StructuredProxyPushConsumer'(doc) -> ["CosNotifyChannelAdmin_StructuredProxyPushConsumer"]; -'CosNotifyChannelAdmin_StructuredProxyPushConsumer'(suite) -> []; 'CosNotifyChannelAdmin_StructuredProxyPushConsumer'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(connect_structured_push_supplier)), ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc('_get_MyType')), @@ -1591,8 +1460,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPushSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_StructuredProxyPushSupplier'(doc) -> ["CosNotifyChannelAdmin_StructuredProxyPushSupplier"]; -'CosNotifyChannelAdmin_StructuredProxyPushSupplier'(suite) -> []; 'CosNotifyChannelAdmin_StructuredProxyPushSupplier'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(connect_structured_push_consumer)), ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(suspend_connection)), @@ -1637,8 +1504,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyChannelAdmin_SupplierAdmin' %% Description: %%----------------------------------------------------------------- -'CosNotifyChannelAdmin_SupplierAdmin'(doc) -> ["CosNotifyChannelAdmin_SupplierAdmin"]; -'CosNotifyChannelAdmin_SupplierAdmin'(suite) -> []; 'CosNotifyChannelAdmin_SupplierAdmin'(_) -> ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_MyID')), ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_MyChannel')), @@ -1681,8 +1546,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_Filter' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_Filter'(doc) -> ["CosNotifyFilter_Filter"]; -'CosNotifyFilter_Filter'(suite) -> []; 'CosNotifyFilter_Filter'(_) -> ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc('_get_constraint_grammar')), ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(add_constraints)), @@ -1711,8 +1574,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_FilterAdmin' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_FilterAdmin'(doc) -> ["CosNotifyFilter_FilterAdmin"]; -'CosNotifyFilter_FilterAdmin'(suite) -> []; 'CosNotifyFilter_FilterAdmin'(_) -> ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(add_filter)), ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(remove_filter)), @@ -1733,8 +1594,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_FilterFactory' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_FilterFactory'(doc) -> ["CosNotifyFilter_FilterFactory"]; -'CosNotifyFilter_FilterFactory'(suite) -> []; 'CosNotifyFilter_FilterFactory'(_) -> ?nomatch(undefined, 'CosNotifyFilter_FilterFactory':oe_tc(create_filter)), ?nomatch(undefined, 'CosNotifyFilter_FilterFactory':oe_tc(create_mapping_filter)), @@ -1752,8 +1611,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyFilter_MappingFilter' %% Description: %%----------------------------------------------------------------- -'CosNotifyFilter_MappingFilter'(doc) -> ["CosNotifyFilter_MappingFilter"]; -'CosNotifyFilter_MappingFilter'(suite) -> []; 'CosNotifyFilter_MappingFilter'(_) -> ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc('_get_constraint_grammar')), ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc('_get_value_type')), @@ -1781,8 +1638,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_NotifyPublish' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_NotifyPublish'(doc) -> ["CosNotifyComm_NotifyPublish"]; -'CosNotifyComm_NotifyPublish'(suite) -> []; 'CosNotifyComm_NotifyPublish'(_) -> ?nomatch(undefined, 'CosNotifyComm_NotifyPublish':oe_tc(offer_change)), ?match(undefined, 'CosNotifyComm_NotifyPublish':oe_tc(undefined)), @@ -1799,8 +1654,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_NotifySubscribe' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_NotifySubscribe'(doc) -> ["CosNotifyComm_NotifySubscribe"]; -'CosNotifyComm_NotifySubscribe'(suite) -> []; 'CosNotifyComm_NotifySubscribe'(_) -> ?nomatch(undefined, 'CosNotifyComm_NotifySubscribe':oe_tc(subscription_change)), ?match(undefined, 'CosNotifyComm_NotifySubscribe':oe_tc(undefined)), @@ -1817,8 +1670,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_PullConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_PullConsumer'(doc) -> ["CosNotifyComm_PullConsumer"]; -'CosNotifyComm_PullConsumer'(suite) -> []; 'CosNotifyComm_PullConsumer'(_) -> ?nomatch(undefined, 'CosNotifyComm_PullConsumer':oe_tc(offer_change)), ?nomatch(undefined, 'CosNotifyComm_PullConsumer':oe_tc(disconnect_pull_consumer)), @@ -1838,8 +1689,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_PullSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_PullSupplier'(doc) -> ["CosNotifyComm_PullSupplier"]; -'CosNotifyComm_PullSupplier'(suite) -> []; 'CosNotifyComm_PullSupplier'(_) -> ?nomatch(undefined, 'CosNotifyComm_PullSupplier':oe_tc(subscription_change)), ?nomatch(undefined, 'CosNotifyComm_PullSupplier':oe_tc(pull)), @@ -1861,8 +1710,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_PushConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_PushConsumer'(doc) -> ["CosNotifyComm_PushConsumer"]; -'CosNotifyComm_PushConsumer'(suite) -> []; 'CosNotifyComm_PushConsumer'(_) -> ?nomatch(undefined, 'CosNotifyComm_PushConsumer':oe_tc(offer_change)), ?nomatch(undefined, 'CosNotifyComm_PushConsumer':oe_tc(push)), @@ -1883,8 +1730,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_PushSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_PushSupplier'(doc) -> ["CosNotifyComm_PushSupplier"]; -'CosNotifyComm_PushSupplier'(suite) -> []; 'CosNotifyComm_PushSupplier'(_) -> ?nomatch(undefined, 'CosNotifyComm_PushSupplier':oe_tc(subscription_change)), ?nomatch(undefined, 'CosNotifyComm_PushSupplier':oe_tc(disconnect_push_supplier)), @@ -1904,8 +1749,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_SequencePullConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_SequencePullConsumer'(doc) -> ["CosNotifyComm_SequencePullConsumer"]; -'CosNotifyComm_SequencePullConsumer'(suite) -> []; 'CosNotifyComm_SequencePullConsumer'(_) -> ?nomatch(undefined, 'CosNotifyComm_SequencePullConsumer':oe_tc(disconnect_sequence_pull_consumer)), ?nomatch(undefined, 'CosNotifyComm_SequencePullConsumer':oe_tc(offer_change)), @@ -1924,8 +1767,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_SequencePullSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_SequencePullSupplier'(doc) -> ["CosNotifyComm_SequencePullSupplier"]; -'CosNotifyComm_SequencePullSupplier'(suite) -> []; 'CosNotifyComm_SequencePullSupplier'(_) -> ?nomatch(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(pull_structured_events)), ?nomatch(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(try_pull_structured_events)), @@ -1946,8 +1787,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_SequencePushConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_SequencePushConsumer'(doc) -> ["CosNotifyComm_SequencePushConsumer"]; -'CosNotifyComm_SequencePushConsumer'(suite) -> []; 'CosNotifyComm_SequencePushConsumer'(_) -> ?nomatch(undefined, 'CosNotifyComm_SequencePushConsumer':oe_tc(push_structured_events)), ?nomatch(undefined, 'CosNotifyComm_SequencePushConsumer':oe_tc(disconnect_sequence_push_consumer)), @@ -1967,8 +1806,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_SequencePushSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_SequencePushSupplier'(doc) -> ["CosNotifyComm_SequencePushSupplier"]; -'CosNotifyComm_SequencePushSupplier'(suite) -> []; 'CosNotifyComm_SequencePushSupplier'(_) -> ?nomatch(undefined, 'CosNotifyComm_SequencePushSupplier':oe_tc(disconnect_sequence_push_supplier)), ?nomatch(undefined, 'CosNotifyComm_SequencePushSupplier':oe_tc(subscription_change)), @@ -1987,8 +1824,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_StructuredPullConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_StructuredPullConsumer'(doc) -> ["CosNotifyComm_StructuredPullConsumer"]; -'CosNotifyComm_StructuredPullConsumer'(suite) -> []; 'CosNotifyComm_StructuredPullConsumer'(_) -> ?nomatch(undefined, 'CosNotifyComm_StructuredPullConsumer':oe_tc(disconnect_structured_pull_consumer)), ?nomatch(undefined, 'CosNotifyComm_StructuredPullConsumer':oe_tc(offer_change)), @@ -2007,8 +1842,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_StructuredPullSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_StructuredPullSupplier'(doc) -> ["CosNotifyComm_StructuredPullSupplier"]; -'CosNotifyComm_StructuredPullSupplier'(suite) -> []; 'CosNotifyComm_StructuredPullSupplier'(_) -> ?nomatch(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(pull_structured_event)), ?nomatch(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(try_pull_structured_event)), @@ -2029,8 +1862,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_StructuredPushConsumer' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_StructuredPushConsumer'(doc) -> ["CosNotifyComm_StructuredPushConsumer"]; -'CosNotifyComm_StructuredPushConsumer'(suite) -> []; 'CosNotifyComm_StructuredPushConsumer'(_) -> ?nomatch(undefined, 'CosNotifyComm_StructuredPushConsumer':oe_tc(push_structured_event)), ?nomatch(undefined, 'CosNotifyComm_StructuredPushConsumer':oe_tc(disconnect_structured_push_consumer)), @@ -2050,8 +1881,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'CosNotifyComm_StructuredPushSupplier' %% Description: %%----------------------------------------------------------------- -'CosNotifyComm_StructuredPushSupplier'(doc) -> ["CosNotifyComm_StructuredPushSupplier"]; -'CosNotifyComm_StructuredPushSupplier'(suite) -> []; 'CosNotifyComm_StructuredPushSupplier'(_) -> ?nomatch(undefined, 'CosNotifyComm_StructuredPushSupplier':oe_tc(disconnect_structured_push_supplier)), ?nomatch(undefined, 'CosNotifyComm_StructuredPushSupplier':oe_tc(subscription_change)), @@ -2070,8 +1899,6 @@ end_per_testcase(_Case, Config) -> %% Test Case: 'oe_CosNotificationComm_Event' %% Description: %%----------------------------------------------------------------- -'oe_CosNotificationComm_Event'(doc) -> ["oe_CosNotificationComm_Event"]; -'oe_CosNotificationComm_Event'(suite) -> []; 'oe_CosNotificationComm_Event'(_) -> ?nomatch(undefined, 'oe_CosNotificationComm_Event':oe_tc(callSeq)), ?nomatch(undefined, 'oe_CosNotificationComm_Event':oe_tc(callAny)), diff --git a/lib/cosNotification/test/grammar_SUITE.erl b/lib/cosNotification/test/grammar_SUITE.erl index 34b832327d..536292fdee 100644 --- a/lib/cosNotification/test/grammar_SUITE.erl +++ b/lib/cosNotification/test/grammar_SUITE.erl @@ -26,8 +26,6 @@ -module(grammar_SUITE). - - %%--------------- INCLUDES ----------------------------------- -include_lib("orber/include/corba.hrl"). -include_lib("orber/include/ifr_types.hrl"). @@ -46,7 +44,7 @@ -include_lib("common_test/include/ct.hrl"). %%--------------- DEFINES ------------------------------------ --define(default_timeout, ?t:minutes(20)). +-define(default_timeout, test_server:minutes(20)). -define(match(ExpectedRes, Expr), fun() -> AcTuAlReS = (catch (Expr)), @@ -58,7 +56,7 @@ _ -> io:format("###### ERROR ERROR ######~n~p~n", [AcTuAlReS]), - ?line exit(AcTuAlReS) + exit(AcTuAlReS) end end()). @@ -100,18 +98,17 @@ cases() -> %%----------------------------------------------------------------- %% Init and cleanup functions. %%----------------------------------------------------------------- - init_per_testcase(_Case, Config) -> Path = code:which(?MODULE), code:add_pathz(filename:join(filename:dirname(Path), "idl_output")), - ?line Dog=test_server:timetrap(?default_timeout), + Dog=test_server:timetrap(?default_timeout), [{watchdog, Dog}|Config]. end_per_testcase(_Case, Config) -> Path = code:which(?MODULE), code:del_path(filename:join(filename:dirname(Path), "idl_output")), - Dog = ?config(watchdog, Config), + Dog = proplists:get_value(watchdog, Config), test_server:timetrap_cancel(Dog), ok. @@ -134,8 +131,6 @@ end_per_suite(Config) -> %%----------------------------------------------------------------- %% simple types grammar tests %%----------------------------------------------------------------- -simple_types_api(doc) -> ["CosNotification simple types grammar tests", ""]; -simple_types_api(suite) -> []; simple_types_api(_Config) -> %% Will always be true, no matter what kind of event we receive. {ok,T1} = ?match({ok, _}, create_filter("2==2 and 3<4")), @@ -208,8 +203,6 @@ simple_types_api(_Config) -> %%----------------------------------------------------------------- %% enum grammar tests %%----------------------------------------------------------------- -enum_api(doc) -> ["CosNotification enum grammar tests", ""]; -enum_api(suite) -> []; enum_api(_Config) -> %% Accept events whose 'in' enum is set to the value 'HOUSE' or 'CAR'. {ok,T1} = ?match({ok, _}, create_filter("$.\\in == HOUSE or $.\\in == CAR")), @@ -221,13 +214,11 @@ enum_api(_Config) -> any:create({tk_enum, "IFRId", "in", ["HOUSE", "CAR"]}, 'GARAGE')))), ok. - + %%----------------------------------------------------------------- %% Union grammar tests %%----------------------------------------------------------------- -union_api(doc) -> ["CosNotification union grammar tests", ""]; -union_api(suite) -> []; union_api(_Config) -> {ok,T1} = ?match({ok, _}, create_filter("exist $.uni1._d and $.uni1._d == 1 and $.uni1.(1) == 10")), {ok,T2} = ?match({ok, _}, create_filter("default $.uni1._d and $.uni1.() == 10")), @@ -541,8 +532,6 @@ union_api(_Config) -> %%----------------------------------------------------------------- %% Variables grammar tests %%----------------------------------------------------------------- -variable_api(doc) -> ["CosNotification variables grammar tests", ""]; -variable_api(suite) -> []; variable_api(_Config) -> %% Accept all "CommunicationsAlarm" events {ok,T0} = ?match({ok, _}, create_filter("$type_name == 'CommunicationsAlarm'")), @@ -873,8 +862,6 @@ variable_api(_Config) -> %%----------------------------------------------------------------- %% Misc grammar tests %%----------------------------------------------------------------- -positional_api(doc) -> ["CosNotification positional notation grammar tests", ""]; -positional_api(suite) -> []; positional_api(_Config) -> {ok,T1} = ?match({ok, _}, create_filter("$.3 < 80 or $.1(midterm) > $.1(final) or $.2[3] < 10")), @@ -929,8 +916,6 @@ positional_api(_Config) -> %%----------------------------------------------------------------- %% Components grammar tests %%----------------------------------------------------------------- -components_api(doc) -> ["CosNotification components grammar tests", ""]; -components_api(suite) -> []; components_api(_Config) -> {ok,T1} = ?match({ok, _}, create_filter("$ == 2")), ?match(true, eval(T1, ?not_CreateSE("DomainName","TypeName","EventName", diff --git a/lib/cosNotification/test/notification_SUITE.erl b/lib/cosNotification/test/notification_SUITE.erl index f23dacce4f..624a76c64a 100644 --- a/lib/cosNotification/test/notification_SUITE.erl +++ b/lib/cosNotification/test/notification_SUITE.erl @@ -44,7 +44,7 @@ -include_lib("common_test/include/ct.hrl"). %%--------------- DEFINES ------------------------------------ --define(default_timeout, ?t:minutes(20)). +-define(default_timeout, test_server:minutes(20)). -define(match(ExpectedRes, Expr), fun() -> AcTuAlReS = (catch (Expr)), @@ -56,7 +56,7 @@ _ -> io:format("###### ERROR ERROR ######~n~p~n", [AcTuAlReS]), - ?line exit(AcTuAlReS) + exit(AcTuAlReS) end end()). @@ -164,18 +164,16 @@ cases() -> %%----------------------------------------------------------------- %% Init and cleanup functions. %%----------------------------------------------------------------- - init_per_testcase(_Case, Config) -> Path = code:which(?MODULE), code:add_pathz(filename:join(filename:dirname(Path), "idl_output")), - ?line Dog=test_server:timetrap(?default_timeout), + Dog=test_server:timetrap(?default_timeout), [{watchdog, Dog}|Config]. - end_per_testcase(_Case, Config) -> Path = code:which(?MODULE), code:del_path(filename:join(filename:dirname(Path), "idl_output")), - Dog = ?config(watchdog, Config), + Dog = proplists:get_value(watchdog, Config), test_server:timetrap_cancel(Dog), ok. @@ -209,8 +207,6 @@ end_per_suite(Config) -> %%----------------------------------------------------------------- %% Tests app file %%----------------------------------------------------------------- -app_test(doc) -> []; -app_test(suite) -> []; app_test(_Config) -> ok=test_server:app_test(cosNotification), ok. @@ -219,9 +215,6 @@ app_test(_Config) -> %%----------------------------------------------------------------- %% Persistent events max limit %%----------------------------------------------------------------- -persistent_max_events_api(doc) -> ["CosNotification QoS EventReliability Persistent", - ""]; -persistent_max_events_api(suite) -> []; persistent_max_events_api(_Config) -> QoSPersistent = [#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), @@ -309,10 +302,6 @@ terminated(Items) -> %%----------------------------------------------------------------- %% Persistent events timeout %%----------------------------------------------------------------- -persistent_timeout_events_api(doc) -> - ["CosNotification QoS EventReliability Persistent", - ""]; -persistent_timeout_events_api(suite) -> []; persistent_timeout_events_api(_Config) -> QoSPersistent = [#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), @@ -394,10 +383,6 @@ persistent_timeout_events_api(_Config) -> %%----------------------------------------------------------------- %% Persistent events max limit %%----------------------------------------------------------------- -persistent_recover_events_api(doc) -> - ["CosNotification QoS EventReliability Persistent", - ""]; -persistent_recover_events_api(suite) -> []; persistent_recover_events_api(_Config) -> QoSPersistent = [#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), @@ -484,8 +469,6 @@ persistent_recover_events_api(_Config) -> %%----------------------------------------------------------------- %% CosNotifyFilter::Filter API tests %%----------------------------------------------------------------- -mapping_filter_api(doc) -> ["CosNotifyFilter::MappingFilter API tests.", ""]; -mapping_filter_api(suite) -> []; mapping_filter_api(_Config) -> FiFac = 'CosNotifyFilter_FilterFactory':oe_create(), ?match({_,key,_,_,_,_}, FiFac), @@ -514,7 +497,7 @@ mapping_filter_api(_Config) -> constraint_expr = "2==2 and 3<"}, result_to_set = any:create(orber_tc:short(), 10)}])), %% Try adding two correct constraint_expr - ?line[{_,_,CID1,_},{_,_,CID2,_}]= + [{_,_,CID1,_},{_,_,CID2,_}]= ?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}, {'CosNotifyFilter_MappingConstraintInfo',_,_,_}], 'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, [#'CosNotifyFilter_MappingConstraintPair' @@ -685,8 +668,6 @@ mapping_filter_api(_Config) -> %%----------------------------------------------------------------- %% CosNotifyFilter::Filter API tests %%----------------------------------------------------------------- -filter_api(doc) -> ["CosNotifyFilter::Filter API tests.", ""]; -filter_api(suite) -> []; filter_api(_Config) -> Fac = cosNotificationApp:start_global_factory(?FAC_OPT), ?match({_,key,_,_,_,_}, Fac), @@ -730,7 +711,7 @@ filter_api(_Config) -> type_name = "type"}], constraint_expr = "2==2 and 3<"}])), %% Try adding two correct constraint_expr - ?line[{_,_,CID1},{_,_,CID2}]= + [{_,_,CID1},{_,_,CID2}]= ?match([{'CosNotifyFilter_ConstraintInfo',_,_}, {'CosNotifyFilter_ConstraintInfo',_,_}], 'CosNotifyFilter_Filter':add_constraints(Filter, [#'CosNotifyFilter_ConstraintExp'{event_types = @@ -870,8 +851,6 @@ filter_api(_Config) -> %%----------------------------------------------------------------- %% Subscription handling API tests %%----------------------------------------------------------------- -subscription_api(doc) -> ["CosNotification subscription handling", ""]; -subscription_api(suite) -> []; subscription_api(_Config) -> %% Initialize the application. Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), @@ -1090,8 +1069,6 @@ subscription_api(_Config) -> %%----------------------------------------------------------------- %% Filter admin API tests %%----------------------------------------------------------------- -filter_adm_api(doc) -> ["CosNotification filter admin tests", ""]; -filter_adm_api(suite) -> []; filter_adm_api(_Config) -> Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), ?match({_,key,_,_,_,_}, Fac), @@ -1166,8 +1143,6 @@ filter_tests(Mod, Obj, Filter, Ch) -> %%----------------------------------------------------------------- %% Creating different event pushing and pulling API tests %%----------------------------------------------------------------- -events_api(doc) -> ["CosNotification event pushing and pulling tests", ""]; -events_api(suite) -> []; events_api(_Config) -> %% Initialize the application. Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), @@ -1550,7 +1525,7 @@ events_api_helper(Fac, Ch, _Id1) -> FiFac = 'CosNotifyFilter_FilterFactory':oe_create(), Filter = 'CosNotifyFilter_FilterFactory':create_filter(FiFac,"EXTENDED_TCL"), %% Add constraints to the Filter - ?line[{_,_,CID1},{_,_,CID2}]= + [{_,_,CID1},{_,_,CID2}]= ?match([{'CosNotifyFilter_ConstraintInfo',_,_}, {'CosNotifyFilter_ConstraintInfo',_,_}], 'CosNotifyFilter_Filter':add_constraints(Filter, [#'CosNotifyFilter_ConstraintExp'{event_types = @@ -1728,8 +1703,6 @@ event_filtering(_FiFac, _Filter, _AdminConsumer, StructuredProxyPushConsumer, Pu %%----------------------------------------------------------------- %% Creating different cosEvent API tests %%----------------------------------------------------------------- -cosevent_api(doc) -> ["CosNotification Objects tested with CosEvent API", ""]; -cosevent_api(suite) -> []; cosevent_api(_Config) -> Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), ?match({_,key,_,_,_,_}, Fac), @@ -1844,8 +1817,6 @@ cosevent_api(_Config) -> %%----------------------------------------------------------------- %% AdminPropertiesAdmin API tests %%----------------------------------------------------------------- -adm_api(doc) -> ["CosNotification AdminPropertiesAdmin tests", ""]; -adm_api(suite) -> []; adm_api(_Config) -> Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), ?match({_,key,_,_,_,_}, Fac), @@ -1892,8 +1863,6 @@ adm_api(_Config) -> %%----------------------------------------------------------------- %% QoSAdm API tests %%----------------------------------------------------------------- -qos_api(doc) -> ["CosNotification QoSAdmin tests", ""]; -qos_api(suite) -> []; qos_api(_Config) -> Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), ?match({_,key,_,_,_,_}, Fac), @@ -2060,8 +2029,6 @@ qos_api(_Config) -> %%----------------------------------------------------------------- %% QoSAdm API tests %%----------------------------------------------------------------- -event_qos_api(doc) -> ["CosNotification QoSAdmin tests", ""]; -event_qos_api(suite) -> []; event_qos_api(_Config) -> Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)), ?match({_,key,_,_,_,_}, Fac), |