From bbbc56f8f39153b54945dfb395c5106c1a31de5e Mon Sep 17 00:00:00 2001 From: luyi Date: Fri, 4 Oct 2024 17:45:13 +0200 Subject: [PATCH] Regenerate payload for Session Replay integration tests --- .../consent_granted_sr_test_payload.json | 48 +++-- ...eckbox_and_radio_fields_allow_payload.json | 106 ++++------ ...heckbox_and_radio_fields_mask_payload.json | 58 +++--- ..._radio_fields_mask_user_input_payload.json | 58 +++--- .../sr_image_buttons_allow_payload.json | 52 ++--- .../sr_image_buttons_mask_payload.json | 64 +++--- ...image_buttons_mask_user_input_payload.json | 185 +++++++++--------- .../sr_images_allow_payload.json | 38 ++-- .../sr_images_mask_payload.json | 46 +++-- .../sr_images_mask_user_input_payload.json | 38 ++-- .../sr_sensitive_fields_allow_payload.json | 62 +++--- .../sr_sensitive_fields_mask_payload.json | 90 ++++----- ...sitive_fields_mask_user_input_payload.json | 62 +++--- .../sr_text_fields_allow_payload.json | 78 +++----- .../sr_text_fields_mask_payload.json | 98 ++++------ ...r_text_fields_mask_user_input_payload.json | 68 +++---- ...ds_with_input_mask_user_input_payload.json | 68 +++---- .../sessionreplay/BaseSessionReplayTest.kt | 12 +- .../sessionreplay/ConsentGrantedSrTest.kt | 3 +- .../SrCheckBoxAndRadioFieldsAllowTest.kt | 3 - .../SrCheckBoxAndRadioFieldsMaskTest.kt | 3 - ...CheckBoxAndRadioFieldsMaskUserInputTest.kt | 3 - .../imagebuttons/SrImageButtonsAllowTest.kt | 3 - .../imagebuttons/SrImageButtonsMaskTest.kt | 3 - .../SrImageButtonsMaskUserInputTest.kt | 3 - .../sessionreplay/images/SrImagesAllowTest.kt | 3 - .../sessionreplay/images/SrImagesMaskTest.kt | 3 - .../images/SrImagesMaskUserInputTest.kt | 3 - .../SrSensitiveFieldsAllowTest.kt | 3 - .../SrSensitiveFieldsMaskTest.kt | 3 - .../SrSensitiveFieldsMaskUserInputTest.kt | 3 - .../textfields/SrTextFieldsAllowTest.kt | 3 - .../textfields/SrTextFieldsMaskTest.kt | 3 - .../SrTextFieldsMaskUserInputTest.kt | 3 - .../SrTextFieldsWithInputMaskUserInputTest.kt | 3 - 35 files changed, 593 insertions(+), 689 deletions(-) diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json index b1f15ba5ea..e423ac3b60 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 172, - "height": 19, "type": "text", "text": "Welcome to Session Replay", "textStyle": { @@ -46,23 +42,15 @@ } }, { - "width": 88, - "height": 48, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 88, - "height": 48, - "border": { - "color": "#000000ff", - "width": 1 - }, "type": "text", - "text": "Click Me", + "text": "CLICK ME", "textStyle": { "family": "roboto, sans-serif", "size": 14, @@ -82,10 +70,32 @@ } }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay (End to End)", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json index cdb27aca70..b2e926fa43 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Default CheckBox", "textStyle": { @@ -46,17 +42,10 @@ } }, { - "width": 16, - "height": 16, - "border": { - "color": "#a538afff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat CheckBox", "textStyle": { @@ -78,17 +67,10 @@ } }, { - "width": 16, - "height": 16, - "border": { - "color": "#cc0000ff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "Material CheckBox", "textStyle": { @@ -110,17 +92,10 @@ } }, { - "width": 16, - "height": 16, - "border": { - "color": "#ffbb33ff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "Default Radio", "textStyle": { @@ -142,21 +117,10 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, - "border": { - "color": "#a538afff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Radio", "textStyle": { @@ -178,21 +142,10 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, - "border": { - "color": "#cc0000ff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "Material Radio", "textStyle": { @@ -214,23 +167,36 @@ } }, { - "width": 16, - "height": 16, + "type": "image", + "isEmpty": false + }, + { "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, - "border": { - "color": "#ffbb33ff", - "width": 1 + "backgroundColor": "#212121ff", + "opacity": 1.0 }, "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "type": "text", + "text": "Session Replay Sensitive Fields (End to…", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json index 82a5e31d61..e4a31a5e90 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxx xxxxxxxx", "textStyle": { @@ -46,8 +42,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#a538afff", "width": 1 @@ -55,8 +49,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxx xxxxxx xxxxxxxx", "textStyle": { @@ -78,8 +70,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#cc0000ff", "width": 1 @@ -87,8 +77,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxxx xxxxxxxx", "textStyle": { @@ -110,8 +98,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#ffbb33ff", "width": 1 @@ -119,8 +105,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxx xxxxx", "textStyle": { @@ -142,8 +126,6 @@ } }, { - "width": 16, - "height": 16, "shapeStyle": { "opacity": 1.0, "cornerRadius": 10 @@ -155,8 +137,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxx xxxxxx xxxxx", "textStyle": { @@ -178,8 +158,6 @@ } }, { - "width": 16, - "height": 16, "shapeStyle": { "opacity": 1.0, "cornerRadius": 10 @@ -191,8 +169,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxxx xxxxx", "textStyle": { @@ -214,8 +190,6 @@ } }, { - "width": 16, - "height": 16, "shapeStyle": { "opacity": 1.0, "cornerRadius": 10 @@ -227,10 +201,32 @@ "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "xxxxxxx xxxxxx xxxxxxxxx xxxxxx xxxx xxxxxxx", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json index cdb27aca70..3de9390f6f 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Default CheckBox", "textStyle": { @@ -46,8 +42,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#a538afff", "width": 1 @@ -55,8 +49,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat CheckBox", "textStyle": { @@ -78,8 +70,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#cc0000ff", "width": 1 @@ -87,8 +77,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Material CheckBox", "textStyle": { @@ -110,8 +98,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#ffbb33ff", "width": 1 @@ -119,8 +105,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Default Radio", "textStyle": { @@ -142,8 +126,6 @@ } }, { - "width": 16, - "height": 16, "shapeStyle": { "opacity": 1.0, "cornerRadius": 10 @@ -155,8 +137,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Radio", "textStyle": { @@ -178,8 +158,6 @@ } }, { - "width": 16, - "height": 16, "shapeStyle": { "opacity": 1.0, "cornerRadius": 10 @@ -191,8 +169,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Material Radio", "textStyle": { @@ -214,8 +190,6 @@ } }, { - "width": 16, - "height": 16, "shapeStyle": { "opacity": 1.0, "cornerRadius": 10 @@ -227,10 +201,32 @@ "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Sensitive Fields (End to…", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json index e2b8024ddd..5557cbef1e 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,17 +21,13 @@ "type": "shape" }, { - "width": 80, - "height": 80, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -44,17 +38,13 @@ "isEmpty": false }, { - "width": 80, - "height": 80, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -65,17 +55,13 @@ "isEmpty": false }, { - "width": 80, - "height": 80, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -86,10 +72,32 @@ "isEmpty": false }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Image Buttons (End to…", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json index e2b8024ddd..56c6b01aaa 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,73 +21,83 @@ "type": "shape" }, { - "width": 80, - "height": 80, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 80, - "height": 80, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 80, - "height": 80, "shapeStyle": { - "backgroundColor": "#5a595bff", + "backgroundColor": "#ffffffff", "opacity": 1.0 }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "xxxxxxx xxxxxx xxxxx xxxxxxx xxxx xxxxxxx", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json index 1a46f725db..5557cbef1e 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json @@ -1,103 +1,104 @@ -[ - { - "type": 4, - "data": { - "width": 411, - "height": 914 - } - }, - { - "type": 6, - "data": { - "has_focus": true - } - }, - { - "type": 10, - "data": { - "wireframes": [ - { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, - "type": "shape" +[{ + "type": 4, + "data": { + "width": 411, + "height": 866 + } +}, { + "type": 6, + "data": { + "has_focus": true + } +}, { + "type": 10, + "data": { + "wireframes": [ + { + "shapeStyle": { + "backgroundColor": "#303030ff", + "opacity": 1.0 }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "type": "shape" + "type": "shape" + }, + { + "shapeStyle": { + "backgroundColor": "#ffffffff", + "opacity": 1.0 }, - { - "width": 80, - "height": 84, - "clip": { - "top": 2, - "bottom": 2, - "left": 0, - "right": 0 - }, - "type": "image", - "mimeType": "image/webp", - "isEmpty": false + "type": "shape" + }, + { + "clip": { + "top": 2, + "bottom": 2, + "left": 0, + "right": 0 }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "type": "shape" + "type": "image", + "isEmpty": false + }, + { + "shapeStyle": { + "backgroundColor": "#ffffffff", + "opacity": 1.0 }, - { - "width": 80, - "height": 84, - "clip": { - "top": 2, - "bottom": 2, - "left": 0, - "right": 0 - }, - "type": "image", - "mimeType": "image/webp", - "isEmpty": false + "type": "shape" + }, + { + "clip": { + "top": 2, + "bottom": 2, + "left": 0, + "right": 0 }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "type": "shape" + "type": "image", + "isEmpty": false + }, + { + "shapeStyle": { + "backgroundColor": "#ffffffff", + "opacity": 1.0 }, - { - "width": 80, - "height": 84, - "clip": { - "top": 2, - "bottom": 2, + "type": "shape" + }, + { + "clip": { + "top": 2, + "bottom": 2, + "left": 0, + "right": 0 + }, + "type": "image", + "isEmpty": false + }, + { + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Image Buttons (End to…", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, "left": 0, "right": 0 }, - "type": "image", - "mimeType": "image/webp", - "isEmpty": false - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "alignment": { + "horizontal": "left", + "vertical": "top" + } } - ] - } + } + ] } -] \ No newline at end of file +}] \ No newline at end of file diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json index 8703072656..a7d2d0134c 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -35,8 +31,6 @@ "isEmpty": false }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -47,10 +41,32 @@ "isEmpty": false }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Images (End to End)", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json index 8703072656..f448fb1e4c 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,34 +21,52 @@ "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "xxxxxxx xxxxxx xxxxxx xxxx xx xxxx", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json index 8703072656..a7d2d0134c 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -35,8 +31,6 @@ "isEmpty": false }, { - "width": 80, - "height": 84, "clip": { "top": 2, "bottom": 2, @@ -47,10 +41,32 @@ "isEmpty": false }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Images (End to End)", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json index 9d7e8f4be8..63a976c6c6 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,14 +21,10 @@ "type": "shape" }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -52,14 +46,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -81,14 +71,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -110,14 +96,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -139,14 +121,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -168,14 +146,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -197,14 +171,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -226,10 +196,32 @@ } }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Sensitive Fields (End to…", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json index 9d7e8f4be8..e61424181a 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,14 +21,10 @@ "type": "shape" }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -52,14 +46,10 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -81,14 +71,10 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -110,14 +96,10 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -139,14 +121,10 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -168,14 +146,10 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -197,14 +171,10 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -226,10 +196,32 @@ } }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "xxxxxxx xxxxxx xxxxxxxxx xxxxxx xxxx xxxxxxx", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json index 9d7e8f4be8..63a976c6c6 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,14 +21,10 @@ "type": "shape" }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -52,14 +46,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -81,14 +71,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -110,14 +96,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -139,14 +121,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -168,14 +146,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -197,14 +171,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -226,10 +196,32 @@ } }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Sensitive Fields (End to…", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json index 209b4654df..07aa5e7b51 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "Default Text View", "textStyle": { @@ -46,8 +42,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "Material Text View", "textStyle": { @@ -69,8 +63,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "App Compat Text View", "textStyle": { @@ -92,14 +84,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Edit Text View", "textStyle": { @@ -121,14 +109,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Default Auto Complete Text View", "textStyle": { @@ -150,14 +134,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Edit Text View", "textStyle": { @@ -179,14 +159,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Auto Complete Text View", "textStyle": { @@ -208,14 +184,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Material Auto Complete Text View", "textStyle": { @@ -237,8 +209,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "Checked Text View", "textStyle": { @@ -260,17 +230,10 @@ } }, { - "width": 19, - "height": 19, - "border": { - "color": "#ffffffff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Checked Text View", "textStyle": { @@ -292,23 +255,36 @@ } }, { - "width": 19, - "height": 19, + "type": "image", + "isEmpty": false + }, + { "shapeStyle": { - "backgroundColor": "#ffffffff", + "backgroundColor": "#212121ff", "opacity": 1.0 }, - "border": { - "color": "#ffffffff", - "width": 1 - }, "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "type": "text", + "text": "Session Replay Text Fields (End to End)", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json index 61ef0846e6..9dc6f76c72 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "xxxxxxx xxxx xxxx", "textStyle": { @@ -46,8 +42,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "xxxxxxxx xxxx xxxx", "textStyle": { @@ -69,8 +63,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "xxx xxxxxx xxxx xxxx", "textStyle": { @@ -92,16 +84,12 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", "size": 17, @@ -121,16 +109,12 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxxxxxx xxxx xxxxxxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", "size": 17, @@ -150,16 +134,12 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxx xxxxxx xxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", "size": 17, @@ -179,16 +159,12 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxx xxxxxx xxxx xxxxxxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", "size": 17, @@ -208,16 +184,12 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxxxxxxx xxxx xxxxxxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", "size": 17, @@ -237,8 +209,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxx xxxx xxxx", "textStyle": { @@ -260,8 +230,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -269,8 +237,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxx xxxxxx xxxxxxx xxxx xxxx", "textStyle": { @@ -292,8 +258,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -301,10 +265,32 @@ "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "xxxxxxx xxxxxx xxxx xxxxxx xxxx xx xxxx", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json index 489126f73f..5e87b63a25 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "Default Text View", "textStyle": { @@ -46,8 +42,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "Material Text View", "textStyle": { @@ -69,8 +63,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "App Compat Text View", "textStyle": { @@ -92,14 +84,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Edit Text View", "textStyle": { @@ -121,14 +109,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Default Auto Complete Text View", "textStyle": { @@ -150,14 +134,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Edit Text View", "textStyle": { @@ -179,14 +159,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Auto Complete Text View", "textStyle": { @@ -208,14 +184,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Material Auto Complete Text View", "textStyle": { @@ -237,8 +209,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "Checked Text View", "textStyle": { @@ -260,8 +230,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -269,8 +237,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Checked Text View", "textStyle": { @@ -292,8 +258,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -301,10 +265,32 @@ "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Text Fields (End to End)", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json index d00e932eb4..367daa9e42 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json @@ -2,7 +2,7 @@ "type": 4, "data": { "width": 411, - "height": 914 + "height": 866 } }, { "type": 6, @@ -14,8 +14,6 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, "shapeStyle": { "backgroundColor": "#303030ff", "opacity": 1.0 @@ -23,8 +21,6 @@ "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "Default Text View", "textStyle": { @@ -46,8 +42,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "Material Text View", "textStyle": { @@ -69,8 +63,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "App Compat Text View", "textStyle": { @@ -92,14 +84,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -121,14 +109,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -150,14 +134,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -179,14 +159,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -208,14 +184,10 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { @@ -237,8 +209,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "Checked Text View", "textStyle": { @@ -260,8 +230,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -269,8 +237,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Checked Text View", "textStyle": { @@ -292,8 +258,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -301,10 +265,32 @@ "type": "shape" }, { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "shapeStyle": { + "backgroundColor": "#212121ff", + "opacity": 1.0 + }, + "type": "shape" + }, + { + "type": "text", + "text": "Session Replay Text Fields (End to End)", + "textStyle": { + "family": "roboto, sans-serif", + "size": 20, + "color": "#ffffffff" + }, + "textPosition": { + "padding": { + "top": 0, + "bottom": 0, + "left": 0, + "right": 0 + }, + "alignment": { + "horizontal": "left", + "vertical": "top" + } + } } ] } diff --git a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt index 183313dbc1..25d12e0786 100644 --- a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt +++ b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt @@ -13,6 +13,8 @@ import androidx.test.platform.app.InstrumentationRegistry import com.datadog.android.Datadog import com.datadog.android.rum.GlobalRumMonitor import com.datadog.android.sdk.integration.RuntimeConfig +import com.datadog.android.sdk.integration.sessionreplay.BaseSessionReplayTest.MatchingStrategy.CONTAINS +import com.datadog.android.sdk.integration.sessionreplay.BaseSessionReplayTest.MatchingStrategy.EXACT import com.datadog.android.sdk.rules.HandledRequest import com.datadog.android.sdk.rules.SessionReplayTestRule import com.datadog.android.sdk.utils.waitFor @@ -253,8 +255,16 @@ internal abstract class BaseSessionReplayTest { wireframeJson.remove("id") wireframeJson.remove("x") wireframeJson.remove("y") + wireframeJson.remove("width") + wireframeJson.remove("height") wireframeJson.remove("base64") wireframeJson.remove("resourceId") + wireframeJson.remove("size") + wireframeJson.remove("top") + wireframeJson.remove("bottom") + wireframeJson.remove("left") + wireframeJson.remove("right") + wireframeJson.remove("text") wireframeJson }?.fold(JsonArray()) { acc, jsonObject -> acc.add(jsonObject) @@ -294,7 +304,7 @@ internal abstract class BaseSessionReplayTest { } companion object { - internal val INITIAL_WAIT_MS = TimeUnit.SECONDS.toMillis(60) + internal val INITIAL_WAIT_MS = TimeUnit.SECONDS.toMillis(30) private const val UI_THREAD_DELAY_IN_MS = 1000L private const val PAYLOAD_UPDATE_REQUEST = "updateSrPayloads" private val SEGMENT_FORM_DATA_REGEX = diff --git a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt index 6df0531ad7..5768decc4b 100644 --- a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt +++ b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt @@ -8,7 +8,6 @@ package com.datadog.android.sdk.integration.sessionreplay import com.datadog.android.privacy.TrackingConsent import com.datadog.android.sdk.rules.SessionReplayTestRule -import org.junit.Ignore import org.junit.Rule import org.junit.Test @@ -21,7 +20,7 @@ internal class ConsentGrantedSrTest : BaseSessionReplayTest