From 68209f270e6f826d0b97ed94d807bc2293ae36be Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Thu, 19 Dec 2024 14:34:49 -0500 Subject: [PATCH] Correct message topology in test JSON --- .../fixtures/current_message_duplicate_device.json | 10 ++++------ .../fixtures/current_message_extra_device.json | 10 ++++------ .../fixtures/current_message_multi_device.json | 10 ++++------ .../current_message_multi_device_not_urgent.json | 10 ++++------ .../fixtures/current_message_multi_device_pni.json | 10 ++++------ .../fixtures/current_message_null_message_in_list.json | 4 ++-- .../fixtures/current_message_registration_id.json | 10 ++++------ .../fixtures/current_message_single_device.json | 4 ++-- .../current_message_single_device_bad_type.json | 4 ++-- .../current_message_single_device_not_urgent.json | 4 ++-- ...rent_message_single_device_server_receipt_type.json | 4 ++-- .../test/resources/fixtures/current_message_sync.json | 4 ++-- 12 files changed, 36 insertions(+), 48 deletions(-) diff --git a/service/src/test/resources/fixtures/current_message_duplicate_device.json b/service/src/test/resources/fixtures/current_message_duplicate_device.json index ec0496486..ba2e95319 100644 --- a/service/src/test/resources/fixtures/current_message_duplicate_device.json +++ b/service/src/test/resources/fixtures/current_message_duplicate_device.json @@ -1,23 +1,21 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 1, "destinationRegistrationId" : 222, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 2, "destinationRegistrationId" : 333, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 1, "destinationRegistrationId" : 222, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_extra_device.json b/service/src/test/resources/fixtures/current_message_extra_device.json index 3d6712bb8..38c642756 100644 --- a/service/src/test/resources/fixtures/current_message_extra_device.json +++ b/service/src/test/resources/fixtures/current_message_extra_device.json @@ -1,20 +1,18 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 1, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 3, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 4, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_multi_device.json b/service/src/test/resources/fixtures/current_message_multi_device.json index f5c8b6ba8..a08f84791 100644 --- a/service/src/test/resources/fixtures/current_message_multi_device.json +++ b/service/src/test/resources/fixtures/current_message_multi_device.json @@ -1,23 +1,21 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 1, "destinationRegistrationId" : 222, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 2, "destinationRegistrationId" : 333, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 3, "destinationRegistrationId" : 444, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_multi_device_not_urgent.json b/service/src/test/resources/fixtures/current_message_multi_device_not_urgent.json index 6fe8b8f49..11d034330 100644 --- a/service/src/test/resources/fixtures/current_message_multi_device_not_urgent.json +++ b/service/src/test/resources/fixtures/current_message_multi_device_not_urgent.json @@ -1,26 +1,24 @@ { "urgent": false, + "timestamp": 1234, "messages": [ { "type": 1, "destinationDeviceId": 1, "destinationRegistrationId": 222, - "content": "Zm9vYmFyego", - "timestamp": 1234 + "content": "Zm9vYmFyego" }, { "type": 1, "destinationDeviceId": 2, "destinationRegistrationId": 333, - "content": "Zm9vYmFyego", - "timestamp": 1234 + "content": "Zm9vYmFyego" }, { "type": 1, "destinationDeviceId": 3, "destinationRegistrationId": 444, - "content": "Zm9vYmFyego", - "timestamp": 1234 + "content": "Zm9vYmFyego" } ] } diff --git a/service/src/test/resources/fixtures/current_message_multi_device_pni.json b/service/src/test/resources/fixtures/current_message_multi_device_pni.json index fb894d16b..9e1018cb2 100644 --- a/service/src/test/resources/fixtures/current_message_multi_device_pni.json +++ b/service/src/test/resources/fixtures/current_message_multi_device_pni.json @@ -1,23 +1,21 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 1, "destinationRegistrationId" : 2222, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 2, "destinationRegistrationId" : 3333, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 3, "destinationRegistrationId" : 4444, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_null_message_in_list.json b/service/src/test/resources/fixtures/current_message_null_message_in_list.json index 11dcf0b5c..7d6d12f65 100644 --- a/service/src/test/resources/fixtures/current_message_null_message_in_list.json +++ b/service/src/test/resources/fixtures/current_message_null_message_in_list.json @@ -1,8 +1,8 @@ { + "timestamp" : 1234, "messages" : [ { "type" : 1, "destinationDeviceId" : 1, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, null ] } diff --git a/service/src/test/resources/fixtures/current_message_registration_id.json b/service/src/test/resources/fixtures/current_message_registration_id.json index 699b58cfb..642a420f0 100644 --- a/service/src/test/resources/fixtures/current_message_registration_id.json +++ b/service/src/test/resources/fixtures/current_message_registration_id.json @@ -1,23 +1,21 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 1, "destinationRegistrationId" : 222, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 2, "destinationRegistrationId" : 999, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }, { "type" : 1, "destinationDeviceId" : 3, "destinationRegistrationId" : 444, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_single_device.json b/service/src/test/resources/fixtures/current_message_single_device.json index d35253c3a..66884af7d 100644 --- a/service/src/test/resources/fixtures/current_message_single_device.json +++ b/service/src/test/resources/fixtures/current_message_single_device.json @@ -1,8 +1,8 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 1, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_single_device_bad_type.json b/service/src/test/resources/fixtures/current_message_single_device_bad_type.json index 4822afcfb..130179fe4 100644 --- a/service/src/test/resources/fixtures/current_message_single_device_bad_type.json +++ b/service/src/test/resources/fixtures/current_message_single_device_bad_type.json @@ -1,8 +1,8 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 7, "destinationDeviceId" : 1, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] } diff --git a/service/src/test/resources/fixtures/current_message_single_device_not_urgent.json b/service/src/test/resources/fixtures/current_message_single_device_not_urgent.json index 78aa66af3..49447d1d3 100644 --- a/service/src/test/resources/fixtures/current_message_single_device_not_urgent.json +++ b/service/src/test/resources/fixtures/current_message_single_device_not_urgent.json @@ -1,11 +1,11 @@ { "urgent": false, + "timestamp": 1234, "messages": [ { "type": 1, "destinationDeviceId": 1, - "content": "Zm9vYmFyego", - "timestamp": 1234 + "content": "Zm9vYmFyego" } ] } diff --git a/service/src/test/resources/fixtures/current_message_single_device_server_receipt_type.json b/service/src/test/resources/fixtures/current_message_single_device_server_receipt_type.json index 34646ef4d..b91052914 100644 --- a/service/src/test/resources/fixtures/current_message_single_device_server_receipt_type.json +++ b/service/src/test/resources/fixtures/current_message_single_device_server_receipt_type.json @@ -1,10 +1,10 @@ { + "timestamp": 1234, "messages": [ { "type": 5, "destinationDeviceId": 1, - "content": "Zm9vYmFyego", - "timestamp": 1234 + "content": "Zm9vYmFyego" } ] } diff --git a/service/src/test/resources/fixtures/current_message_sync.json b/service/src/test/resources/fixtures/current_message_sync.json index 6207f5943..c28145408 100644 --- a/service/src/test/resources/fixtures/current_message_sync.json +++ b/service/src/test/resources/fixtures/current_message_sync.json @@ -1,8 +1,8 @@ { + "timestamp" : 1234, "messages" : [{ "type" : 1, "destinationDeviceId" : 2, - "content" : "Zm9vYmFyego", - "timestamp" : 1234 + "content" : "Zm9vYmFyego" }] }