@@ -21,17 +21,19 @@ suite() ->
2121
2222all () ->
2323 [
24- {group , rabbitmq },
25- {group , rabbitmq_strict },
26- {group , activemq },
27- {group , activemq_no_anon },
28- {group , mock }
24+ % {group, rabbitmq},
25+ % {group, rabbitmq_strict},
26+ % {group, activemq},
27+ {group , ibmmq }
28+ % {group, activemq_no_anon},
29+ % {group, mock}
2930 ].
3031
3132groups () ->
3233 [
3334 {rabbitmq , [], shared ()},
3435 {activemq , [], shared ()},
36+ {ibmmq , [], test ()},
3537 {rabbitmq_strict , [], [
3638 basic_roundtrip_tls ,
3739 roundtrip_tls_global_config ,
@@ -60,6 +62,13 @@ groups() ->
6062 ]}
6163 ].
6264
65+ test () ->
66+ [
67+ open_close_connection ,
68+ basic_roundtrip ,
69+ set_sender_capabilities
70+ ].
71+
6372shared () ->
6473 [
6574 open_close_connection ,
@@ -120,6 +129,12 @@ init_per_group(activemq, Config0) ->
120129 Config = rabbit_ct_helpers :set_config (Config0 , {sasl , anon }),
121130 rabbit_ct_helpers :run_steps (Config ,
122131 activemq_ct_helpers :setup_steps (" activemq.xml" ));
132+
133+ init_per_group (ibmmq , Config0 ) ->
134+ rabbit_ct_helpers :set_config (Config0 , [ {rmq_hostname , " localhost" },
135+ {tcp_hostname_amqp , " localhost" },
136+ {tcp_port_amqp , 5677 },
137+ {sasl , {plain , <<" app" >>, <<" passw0rd" >>}} ]);
123138init_per_group (activemq_no_anon , Config0 ) ->
124139 Config = rabbit_ct_helpers :set_config (
125140 Config0 , {sasl , {plain , <<" user" >>, <<" password" >>}}),
@@ -134,8 +149,8 @@ init_per_group(azure, Config) ->
134149 {sb_port , 5671 }
135150 ]);
136151init_per_group (mock , Config ) ->
137- rabbit_ct_helpers :set_config (Config , [{mock_port , 25000 },
138- {mock_host , " localhost" },
152+ rabbit_ct_helpers :set_config (Config , [{tcp_port_amqp , 25000 },
153+ {tcp_hostname_amqp , " localhost" },
139154 {sasl , none }
140155 ]).
141156end_per_group (rabbitmq , Config ) ->
@@ -171,7 +186,8 @@ end_per_testcase(_Test, Config) ->
171186
172187open_close_connection (Config ) ->
173188 Hostname = ? config (rmq_hostname , Config ),
174- Port = rabbit_ct_broker_helpers :get_node_config (Config , 0 , tcp_port_amqp ),
189+ Port = ? config (tcp_port_amqp , Config ),
190+ % % Port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp),
175191 % % an address list
176192 OpnConf = #{addresses => [Hostname ],
177193 port => Port ,
@@ -816,8 +832,11 @@ multi_transfer_without_delivery_id(Config) ->
816832 ok .
817833
818834set_receiver_capabilities (Config ) ->
819- Hostname = ? config (mock_host , Config ),
820- Port = ? config (mock_port , Config ),
835+ Hostname = ? config (tcp_hostname_amqp , Config ),
836+ Port = ? config (tcp_port_amqp , Config ),
837+
838+ % Hostname = ?config(mock_host, Config),
839+ % Port = ?config(mock_port, Config),
821840
822841 OpenStep = fun ({0 = Ch , # 'v1_0.open' {}, _Pay }) ->
823842 {Ch , [# 'v1_0.open' {container_id = {utf8 , <<" mock" >>}}]}
@@ -889,8 +908,8 @@ set_receiver_capabilities(Config) ->
889908 ok .
890909
891910set_sender_capabilities (Config ) ->
892- Hostname = ? config (mock_host , Config ),
893- Port = ? config (mock_port , Config ),
911+ Hostname = ? config (tcp_hostname_amqp , Config ),
912+ Port = ? config (tcp_port_amqp , Config ),
894913 OpenStep = fun ({0 = Ch , # 'v1_0.open' {}, _Pay }) ->
895914 {Ch , [# 'v1_0.open' {container_id = {utf8 , <<" mock" >>}}]}
896915 end ,
@@ -940,8 +959,9 @@ set_sender_capabilities(Config) ->
940959
941960
942961set_sender_sync_capabilities (Config ) ->
943- Hostname = ? config (mock_host , Config ),
944- Port = ? config (mock_port , Config ),
962+ Hostname = ? config (tcp_hostname_amqp , Config ),
963+ Port = ? config (tcp_port_amqp , Config ),
964+
945965 OpenStep = fun ({0 = Ch , # 'v1_0.open' {}, _Pay }) ->
946966 {Ch , [# 'v1_0.open' {container_id = {utf8 , <<" mock" >>}}]}
947967 end ,
0 commit comments