From 8c3d03ce380c5144b525610511ab431b1e2e5599 Mon Sep 17 00:00:00 2001
From: Simon Woolf <simon.woolf@ably.com>
Date: Wed, 8 Jan 2025 14:00:35 +0000
Subject: [PATCH] MessageAction enum changes

per https://github.com/ably/specification/pull/263
---
 .../java/io/ably/lib/types/MessageAction.java     | 12 +++++-------
 .../test/java/io/ably/lib/test/common/Setup.java  | 15 +++++++++------
 .../test/java/io/ably/lib/types/MessageTest.java  |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/src/main/java/io/ably/lib/types/MessageAction.java b/lib/src/main/java/io/ably/lib/types/MessageAction.java
index 8c80e914c..02439df2a 100644
--- a/lib/src/main/java/io/ably/lib/types/MessageAction.java
+++ b/lib/src/main/java/io/ably/lib/types/MessageAction.java
@@ -1,13 +1,11 @@
 package io.ably.lib.types;
 
 public enum MessageAction {
-    MESSAGE_UNSET, // 0
-    MESSAGE_CREATE, // 1
-    MESSAGE_UPDATE, // 2
-    MESSAGE_DELETE, // 3
-    ANNOTATION_CREATE, // 4
-    ANNOTATION_DELETE, // 5
-    META_OCCUPANCY; // 6
+    MESSAGE_CREATE, // 0
+    MESSAGE_UPDATE, // 1
+    MESSAGE_DELETE, // 2
+    META_OCCUPANCY; // 3
+    MESSAGE_SUMMARY; // 4
 
     static MessageAction tryFindByOrdinal(int ordinal) {
         return values().length <= ordinal ? null: values()[ordinal];
diff --git a/lib/src/test/java/io/ably/lib/test/common/Setup.java b/lib/src/test/java/io/ably/lib/test/common/Setup.java
index b6171edf0..613812380 100644
--- a/lib/src/test/java/io/ably/lib/test/common/Setup.java
+++ b/lib/src/test/java/io/ably/lib/test/common/Setup.java
@@ -6,6 +6,7 @@
 import com.google.gson.Gson;
 
 import io.ably.lib.http.Http;
+import io.ably.lib.util.Log;
 import io.ably.lib.http.HttpCore;
 import io.ably.lib.http.HttpScheduler;
 import io.ably.lib.http.HttpUtils;
@@ -159,7 +160,8 @@ public void fillInOptions(ClientOptions opts, TestParameters params) {
             opts.environment = environment;
             opts.port = port;
             opts.tlsPort = tlsPort;
-            opts.tls = tls;
+            opts.tls = false;
+            opts.logLevel = Log.VERBOSE;
         }
     }
 
@@ -201,10 +203,11 @@ private static TestVars __getTestVars() {
                      * convenience methods */
                     opts.key = "none:none";
                     opts.restHost = host;
-                    opts.environment = environment;
-                    opts.port = port;
-                    opts.tlsPort = tlsPort;
-                    opts.tls = true;
+                    opts.environment = "local";
+                    opts.logLevel = Log.VERBOSE;
+                    opts.port = 8080;
+                    opts.tlsPort = 8081;
+                    opts.tls = false;
                     ably = new AblyRest(opts);
                 } catch(AblyException e) {
                     TerminationReason.UNABLE_TO_INSTANCE_REST.exit(e);
@@ -255,7 +258,7 @@ private static void __clearTestVars() {
                 opts.environment = environment;
                 opts.port = port;
                 opts.tlsPort = tlsPort;
-                opts.tls = true;
+                opts.tls = false;
                 ably = new AblyRest(opts);
                 ably.http.request(new Http.Execute<Void>() {
                     @Override
diff --git a/lib/src/test/java/io/ably/lib/types/MessageTest.java b/lib/src/test/java/io/ably/lib/types/MessageTest.java
index 9e58d9c3b..1873aa7af 100644
--- a/lib/src/test/java/io/ably/lib/types/MessageTest.java
+++ b/lib/src/test/java/io/ably/lib/types/MessageTest.java
@@ -65,7 +65,7 @@ public void serialize_message_with_serial() {
         assertEquals("test-key", serializedObject.get("connectionKey").getAsString());
         assertEquals("test-data", serializedObject.get("data").getAsString());
         assertEquals("test-name", serializedObject.get("name").getAsString());
-        assertEquals(1, serializedObject.get("action").getAsInt());
+        assertEquals(0, serializedObject.get("action").getAsInt());
         assertEquals("01826232498871-001@abcdefghij:001", serializedObject.get("serial").getAsString());
     }
 
@@ -76,7 +76,7 @@ public void deserialize_message_with_serial() throws Exception {
        jsonObject.addProperty("clientId", "test-client-id");
        jsonObject.addProperty("data", "test-data");
        jsonObject.addProperty("name", "test-name");
-       jsonObject.addProperty("action", 1);
+       jsonObject.addProperty("action", 0);
        jsonObject.addProperty("serial", "01826232498871-001@abcdefghij:001");
 
         // When