Fix MAP_CLEAR subscription test to use sendMapClearOnChannel

Use sendMapClearOnChannel (server round-trip) instead of
processObjectOperationMessageOnChannel (synthetic injection),
faithfully porting the JS test. Also add `objects` to the
SubscriptionCallbacksScenarios context so that tests can call
sendMapClearOnChannel.

The test now uses the pre-existing sampleMap and sampleCounter keys
(set up by the test runner) rather than manually injecting keys.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: lawrence-forooghian

Tests/AblyLiveObjectsTests/JS Integration Tests/ObjectsHelper.swift

@@ -226,14 +226,16 @@ final class ObjectsHelper: Sendable {
     /// This goes through the real publish path (server round-trip) so the operation gets a
     /// real server-assigned timeserial.
     func sendMapClearOnChannel(objects: any RealtimeObjects, objectId: String) async throws {
-        let internallyTypedObjects = objects as! PublicDefaultRealtimeObjects
+        guard let internallyTypedObjects = objects as? PublicDefaultRealtimeObjects else {
+            preconditionFailure("Expected PublicDefaultRealtimeObjects")
+        }
         try await internallyTypedObjects.testsOnly_publish(objectMessages: [
             OutboundObjectMessage(
                 operation: ObjectOperation(
                     action: .known(.mapClear),
                     objectId: objectId,
-                    mapClear: WireMapClear()
-                )
+                    mapClear: WireMapClear(),
+                ),
             ),
         ])
     }

Tests/AblyLiveObjectsTests/JS Integration Tests/ObjectsIntegrationTests.swift

@@ -4223,6 +4223,7 @@ private struct ObjectsIntegrationTests {
     @available(iOS 17.0.0, tvOS 17.0.0, *)
     enum SubscriptionCallbacksScenarios: Scenarios {
         struct Context {
+            var objects: any RealtimeObjects
             var root: any LiveMap
             var objectsHelper: ObjectsHelper
             var channelName: String
@@ -4429,48 +4430,30 @@ private struct ObjectsIntegrationTests {
             .init(
                 disabled: false,
                 allTransportsAndProtocols: false,
-                // Deviation from JS: The JS test checks event.message.operation.action === 'map.clear',
-                // but Swift's LiveMapUpdate has no operation action field — it only exposes per-key
-                // changes via update: [String: LiveMapUpdateAction]. Additionally, the JS test doesn't
-                // verify the per-key 'removed' entries in event.update, which is an untested gap.
-                // This Swift port checks the per-key .removed entries instead.
+                // Deviation from JS: The JS test checks event.message.operation.action === 'map.clear'
+                // (operation metadata), but Swift's LiveMapUpdate has no operation action field — it
+                // only exposes per-key changes via update: [String: LiveMapUpdateAction]. So instead
+                // of checking the operation action, this test verifies that the subscription update
+                // contains .removed entries for each key that existed on the map before the clear.
+                // This is something the JS test doesn't verify (it only checks operation metadata,
+                // not the per-key update entries).
                 description: "can subscribe to the incoming MAP_CLEAR operation on a LiveMap",
                 action: { ctx in
                     let root = ctx.root
+                    let objects = ctx.objects
                     let objectsHelper = ctx.objectsHelper
-                    let channel = ctx.channel
-
-                    // set some keys on root so the clear has something to remove
-                    await objectsHelper.processObjectOperationMessageOnChannel(
-                        channel: channel,
-                        serial: lexicoTimeserial(seriesId: "aaa", timestamp: 0, counter: 0),
-                        siteCode: "aaa",
-                        state: [objectsHelper.mapSetOp(objectId: "root", key: "foo", data: .object(["string": .string("bar")]))],
-                    )
-                    await objectsHelper.processObjectOperationMessageOnChannel(
-                        channel: channel,
-                        serial: lexicoTimeserial(seriesId: "aaa", timestamp: 1, counter: 0),
-                        siteCode: "aaa",
-                        state: [objectsHelper.mapSetOp(objectId: "root", key: "baz", data: .object(["number": .number(NSNumber(value: 42))]))],
-                    )
 
                     let updates = try root.updates()
                     async let subscriptionPromise: Void = {
                         let update = try #require(await updates.first { _ in true })
-                        // verify per-key removed entries for all keys that existed before the clear
-                        #expect(update.update["foo"] == .removed, "Check \"foo\" key has .removed action after MAP_CLEAR")
-                        #expect(update.update["baz"] == .removed, "Check \"baz\" key has .removed action after MAP_CLEAR")
+                        // verify per-key removed entries for all keys that existed before the clear.
+                        // the test setup creates sampleMap and sampleCounter on root, so those are
+                        // the keys that should be removed.
+                        #expect(update.update[ctx.sampleMapKey] == .removed, "Check \"\(ctx.sampleMapKey)\" key has .removed action after MAP_CLEAR")
+                        #expect(update.update[ctx.sampleCounterKey] == .removed, "Check \"\(ctx.sampleCounterKey)\" key has .removed action after MAP_CLEAR")
                     }()
 
-                    // send MAP_CLEAR.
-                    // JS uses sendMapClearOnChannel (channel.sendState) which is a private API.
-                    // Swift uses processObjectOperationMessageOnChannel instead.
-                    await objectsHelper.processObjectOperationMessageOnChannel(
-                        channel: channel,
-                        serial: lexicoTimeserial(seriesId: "zzz", timestamp: 99_999_999_999_999, counter: 0),
-                        siteCode: "zzz",
-                        state: [objectsHelper.mapClearOp(objectId: "root")],
-                    )
+                    try await objectsHelper.sendMapClearOnChannel(objects: objects, objectId: "root")
 
                     try await subscriptionPromise
                 },
@@ -4743,6 +4726,7 @@ private struct ObjectsIntegrationTests {
 
             try await testCase.scenario.action(
                 .init(
+                    objects: objects,
                     root: root,
                     objectsHelper: objectsHelper,
                     channelName: testCase.channelName,