Fix consumer assertion

Author: acogoluegnes

deps/rabbit/test/rabbit_stream_sac_coordinator_SUITE.erl

@@ -86,7 +86,7 @@ simple_sac_test(_) ->
      State1,
      {ok, Active1}, Effects1} = ?MOD:apply(Command0, State0),
     ?assert(Active1),
-    ?assertEqual([csr(ConnectionPid, 0, active)], Consumers1),
+    assertCsrsEqual([csr(ConnectionPid, 0, active)], Consumers1),
     assertSendMessageActivateEffect(ConnectionPid, 0, Stream, ConsumerName, true, Effects1),
 
     Command1 =
@@ -95,9 +95,9 @@ simple_sac_test(_) ->
      State2,
      {ok, Active2}, Effects2} = ?MOD:apply(Command1, State1),
     ?assertNot(Active2),
-    ?assertEqual([csr(ConnectionPid, 0, active),
-                  csr(ConnectionPid, 1, waiting)],
-                 Consumers2),
+    assertCsrsEqual([csr(ConnectionPid, 0, active),
+                     csr(ConnectionPid, 1, waiting)],
+                    Consumers2),
     assertEmpty(Effects2),
 
     Command2 =
@@ -106,28 +106,28 @@ simple_sac_test(_) ->
      State3,
      {ok, Active3}, Effects3} = ?MOD:apply(Command2, State2),
     ?assertNot(Active3),
-    ?assertEqual([csr(ConnectionPid, 0, active),
-                  csr(ConnectionPid, 1, waiting),
-                  csr(ConnectionPid, 2, waiting)],
-                 Consumers3),
+    assertCsrsEqual([csr(ConnectionPid, 0, active),
+                     csr(ConnectionPid, 1, waiting),
+                     csr(ConnectionPid, 2, waiting)],
+                    Consumers3),
     assertEmpty(Effects3),
 
     Command3 =
         unregister_consumer_command(Stream, ConsumerName, ConnectionPid, 0),
     {#?STATE{groups = #{GroupId := #group{consumers = Consumers4}}} =
      State4,
      ok, Effects4} = ?MOD:apply(Command3, State3),
-    ?assertEqual([csr(ConnectionPid, 1, active),
-                  csr(ConnectionPid, 2, waiting)],
-                 Consumers4),
+    assertCsrsEqual([csr(ConnectionPid, 1, active),
+                     csr(ConnectionPid, 2, waiting)],
+                    Consumers4),
     assertSendMessageActivateEffect(ConnectionPid, 1, Stream, ConsumerName, true, Effects4),
 
     Command4 =
         unregister_consumer_command(Stream, ConsumerName, ConnectionPid, 1),
     {#?STATE{groups = #{GroupId := #group{consumers = Consumers5}}} =
      State5,
      ok, Effects5} = ?MOD:apply(Command4, State4),
-    ?assertEqual([csr(ConnectionPid, 2, active)], Consumers5),
+    assertCsrsEqual([csr(ConnectionPid, 2, active)], Consumers5),
     assertSendMessageActivateEffect(ConnectionPid, 2, Stream, ConsumerName, true, Effects5),
 
     Command5 =
@@ -150,7 +150,7 @@ super_stream_partition_sac_test(_) ->
      State1,
      {ok, Active1}, Effects1} = ?MOD:apply(Command0, State0),
     ?assert(Active1),
-    ?assertEqual([csr(ConnectionPid, 0, active)], Consumers1),
+    assertCsrsEqual([csr(ConnectionPid, 0, active)], Consumers1),
     assertSendMessageActivateEffect(ConnectionPid, 0, Stream, ConsumerName, true, Effects1),
 
     Command1 =
@@ -161,9 +161,9 @@ super_stream_partition_sac_test(_) ->
     %% never active on registration
     ?assertNot(Active2),
     %% all consumers inactive, until the former active one steps down and activates the new consumer
-    ?assertEqual([csr(ConnectionPid, 0, deactivating),
-                  csr(ConnectionPid, 1, waiting)],
-                 Consumers2),
+    assertCsrsEqual([csr(ConnectionPid, 0, deactivating),
+                     csr(ConnectionPid, 1, waiting)],
+                    Consumers2),
     assertSendMessageSteppingDownEffect(ConnectionPid, 0, Stream, ConsumerName, Effects2),
 
     Command2 = activate_consumer_command(Stream, ConsumerName),
@@ -172,9 +172,9 @@ super_stream_partition_sac_test(_) ->
      ok, Effects3} = ?MOD:apply(Command2, State2),
 
     %% 1 (partition index) % 2 (consumer count) = 1 (active consumer index)
-    ?assertEqual([csr(ConnectionPid, 0, waiting),
-                  csr(ConnectionPid, 1, active)],
-                 Consumers3),
+    assertCsrsEqual([csr(ConnectionPid, 0, waiting),
+                     csr(ConnectionPid, 1, active)],
+                    Consumers3),
     assertSendMessageActivateEffect(ConnectionPid, 1, Stream, ConsumerName, true, Effects3),
 
     Command3 =
@@ -186,10 +186,10 @@ super_stream_partition_sac_test(_) ->
     ?assertNot(Active4),
     %% 1 (partition index) % 3 (consumer count) = 1 (active consumer index)
     %% the active consumer stays the same
-    ?assertEqual([csr(ConnectionPid, 0, waiting),
-                  csr(ConnectionPid, 1, active),
-                  csr(ConnectionPid, 2, waiting)],
-                 Consumers4),
+    assertCsrsEqual([csr(ConnectionPid, 0, waiting),
+                     csr(ConnectionPid, 1, active),
+                     csr(ConnectionPid, 2, waiting)],
+                    Consumers4),
     assertEmpty(Effects4),
 
     Command4 =
@@ -199,9 +199,9 @@ super_stream_partition_sac_test(_) ->
      ok, Effects5} = ?MOD:apply(Command4, State4),
     %% 1 (partition index) % 2 (consumer count) = 1 (active consumer index)
     %% the active consumer will move from sub 1 to sub 2
-    ?assertEqual([csr(ConnectionPid, 1, deactivating),
-                  csr(ConnectionPid, 2, waiting)],
-                 Consumers5),
+    assertCsrsEqual([csr(ConnectionPid, 1, deactivating),
+                     csr(ConnectionPid, 2, waiting)],
+                    Consumers5),
 
     assertSendMessageSteppingDownEffect(ConnectionPid, 1, Stream, ConsumerName, Effects5),
 
@@ -210,17 +210,17 @@ super_stream_partition_sac_test(_) ->
      State6,
      ok, Effects6} = ?MOD:apply(Command5, State5),
 
-    ?assertEqual([csr(ConnectionPid, 1, waiting),
-                  csr(ConnectionPid, 2, active)],
-                 Consumers6),
+    assertCsrsEqual([csr(ConnectionPid, 1, waiting),
+                     csr(ConnectionPid, 2, active)],
+                    Consumers6),
     assertSendMessageActivateEffect(ConnectionPid, 2, Stream, ConsumerName, true, Effects6),
 
     Command6 =
         unregister_consumer_command(Stream, ConsumerName, ConnectionPid, 1),
     {#?STATE{groups = #{GroupId := #group{consumers = Consumers7}}} =
      State7,
      ok, Effects7} = ?MOD:apply(Command6, State6),
-    ?assertEqual([csr(ConnectionPid, 2, active)], Consumers7),
+    assertCsrsEqual([csr(ConnectionPid, 2, active)], Consumers7),
     assertEmpty(Effects7),
 
     Command7 =
@@ -1641,6 +1641,11 @@ assertHasGroup(GroupId,
                Groups) ->
     #{GroupId := #group{partition_index = CurrentPI, consumers = CurrentCs}} = Groups,
     ?assertEqual(ExpectedPI, CurrentPI),
+    assertCsrsEqual(ExpectedCs, CurrentCs).
+
+assertCsrsEqual([Expected], [Current]) ->
+    assertCsrEqual(Expected, Current);
+assertCsrsEqual(ExpectedCs, CurrentCs) ->
     assertSize(length(ExpectedCs), CurrentCs),
     lists:foreach(fun(N) ->
                           Expected = lists:nth(N, ExpectedCs),