[ECO-5553] Fixed channel delta encoding integration test assertions

for modes and params

Author: sacOO7

lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java

@@ -174,7 +174,7 @@ public void attach_with_channel_params_channels_get() {
             channel.attach();
             (new ChannelWaiter(channel)).waitFor(ChannelState.attached);
             assertEquals("Verify attached state reached", ChannelState.attached, channel.state);
-            assertEquals("Verify channel params", channel.getParams(), options.params);
+            assertEquals("Verify channel params", options.params, channel.getParams());
             assertArrayEquals("Verify channel modes", new ChannelMode[] { ChannelMode.subscribe }, channel.getModes());
         } catch (AblyException e) {
             e.printStackTrace();
@@ -208,7 +208,7 @@ public void attach_with_channel_params_set_options() {
             channel.attach();
             (new ChannelWaiter(channel)).waitFor(ChannelState.attached);
             assertEquals("Verify attached state reached", ChannelState.attached, channel.state);
-            assertEquals("Verify channel params", channel.getParams(), options.params);
+            assertEquals("Verify channel params", options.params, channel.getParams());
             assertArrayEquals("Verify channel modes", new ChannelMode[] { ChannelMode.subscribe }, channel.getModes());
         } catch (AblyException e) {
             e.printStackTrace();
@@ -285,7 +285,10 @@ public void attach_with_channel_params_modes_and_channel_modes() {
             (new ChannelWaiter(channel)).waitFor(ChannelState.attached);
             assertEquals("Verify attached state reached", ChannelState.attached, channel.state);
             assertEquals("Verify channel params", channel.getParams(), options.params);
-            assertArrayEquals("Verify channel modes", new ChannelMode[] { ChannelMode.subscribe, ChannelMode.presence }, channel.getModes());
+            // modes in params overrides individual modes in options
+            assertThat("Verify channel modes", Arrays.asList(channel.getModes()),
+                Matchers.containsInAnyOrder(ChannelMode.presence, ChannelMode.subscribe));
+
         } catch (AblyException e) {
             e.printStackTrace();
             fail("init0: Unexpected exception instantiating library");

lib/src/test/java/io/ably/lib/test/realtime/RealtimeDeltaDecoderTest.java

@@ -11,6 +11,7 @@
 import io.ably.lib.transport.ConnectionManager;
 import io.ably.lib.transport.ITransport;
 import io.ably.lib.transport.WebSocketTransport;
+import io.ably.lib.types.ChannelOptions;
 import io.ably.lib.types.ClientOptions;
 import io.ably.lib.types.Message;
 import io.ably.lib.types.MessageExtras;
@@ -20,6 +21,7 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
+import java.util.Map;
 import java.util.Objects;
 
 import static org.junit.Assert.assertEquals;
@@ -52,6 +54,8 @@ public void simple_delta_codec() {
 
             (new ChannelWaiter(channel)).waitFor(ChannelState.attached);
 
+            assertEquals("Verify channel params", Map.of("delta", "vcdiff"), channel.getParams());
+
             for (int i = 0; i < testData.length; i++) {
                 channel.publish(Integer.toString(i), testData[i]);
             }
@@ -90,14 +94,18 @@ private void delta_failure_recovery(final ITransport.Factory websocketFactory, S
             opts.transportFactory = websocketFactory;
             ably = new AblyRealtime(opts);
 
-            /* create a channel */
-            final Channel channel = ably.channels.get("[?delta=vcdiff]" + testName);
+            ChannelOptions options = new ChannelOptions();
+            options.params = Map.of("delta", "vcdiff");
+            /* create a channel with channelOptions set to vcdiff*/
+            final Channel channel = ably.channels.get(testName, options);
 
             /* attach */
             channel.attach();
             (new ChannelWaiter(channel)).waitFor(ChannelState.attached);
             assertEquals("Verify attached state reached", channel.state, ChannelState.attached);
 
+            assertEquals("Verify channel params", Map.of("delta", "vcdiff"), channel.getParams());
+
             /* subscribe */
             MessageWaiter messageWaiter = new MessageWaiter(channel);