From ba3314ba3c901442a3fe4e33ecb900328924876e Mon Sep 17 00:00:00 2001 From: rajanika Date: Fri, 17 Jan 2025 19:57:18 +0530 Subject: [PATCH 1/4] fix validation key conflicts --- .../FireboltCertification/SecureStorage.feature | 6 +++--- .../fixtures/fireboltCalls/discoverylaunch.json | 5 ----- cypress/fixtures/fireboltCalls/metrics.json | 9 --------- cypress/fixtures/fireboltCalls/parameters.json | 10 ---------- cypress/fixtures/fireboltCalls/securestorage.js | 16 ++++++++++++++++ .../fixtures/fireboltCalls/securestorage.json | 16 ---------------- 6 files changed, 19 insertions(+), 43 deletions(-) diff --git a/cypress/TestCases/FireboltCertification/SecureStorage.feature b/cypress/TestCases/FireboltCertification/SecureStorage.feature index 2431ce983..09fe16dd3 100644 --- a/cypress/TestCases/FireboltCertification/SecureStorage.feature +++ b/cypress/TestCases/FireboltCertification/SecureStorage.feature @@ -342,13 +342,13 @@ Feature: SecureStorage And '3rd party app' invokes the 'Firebolt' API to 'set secure value for key authTestTokenDevice1' And 'Firebolt' platform responds with 'null for updating a secure data value' And '3rd party app' invokes the 'Firebolt' API to 'get stored value for authTestTokenDevice1 with scope device' - And 'Firebolt' platform responds with ' expected value for authTestTokenDevice1 stored data in securestorage' + And 'Firebolt' platform responds with 'expected value for authTestTokenDevice1 stored data in securestorage' And '3rd party app' invokes the 'Firebolt' API to 'set secure value for key authTestTokenDevice2' And 'Firebolt' platform responds with 'null for updating a secure data value' And '3rd party app' invokes the 'Firebolt' API to 'get stored value for authTestTokenDevice2 with scope device' And 'Firebolt' platform responds with 'expected value for authTestTokenDevice2 stored data in securestorage' And 'secondary 3rd party app' invokes the 'Firebolt' API to 'get stored value for authTestTokenDevice1 with scope device' - And 'Firebolt' platform responds to 'secondary 3rd party app' with ' expected value for authTestTokenDevice1 stored data in securestorage' + And 'Firebolt' platform responds to 'secondary 3rd party app' with 'expected value for authTestTokenDevice1 stored data in securestorage' And 'secondary 3rd party app' invokes the 'Firebolt' API to 'get stored value for authTestTokenDevice2 with scope device' And 'Firebolt' platform responds to 'secondary 3rd party app' with 'expected value for authTestTokenDevice2 stored data in securestorage' When '3rd party app' invokes the 'Firebolt' API to 'remove the stored value authTestTokenDevice1 with scope device' @@ -360,7 +360,7 @@ Feature: SecureStorage When '3rd party app' invokes the 'Firebolt' API to 'get stored value for authTestTokenDevice2 with scope device' Then 'Firebolt' platform responds with 'expected value for authTestTokenDevice2 stored data in securestorage' When 'secondary 3rd party app' invokes the 'Firebolt' API to 'get stored value for authTestTokenDevice2 with scope device' - Then 'Firebolt' platform responds to 'secondary 3rd party app' with ' Date: Thu, 23 Jan 2025 19:09:13 +0530 Subject: [PATCH 2/4] revert changes to metrics.json --- cypress/fixtures/fireboltCalls/metrics.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cypress/fixtures/fireboltCalls/metrics.json b/cypress/fixtures/fireboltCalls/metrics.json index 9d0b266f6..0653d656e 100644 --- a/cypress/fixtures/fireboltCalls/metrics.json +++ b/cypress/fixtures/fireboltCalls/metrics.json @@ -1,3 +1,11 @@ - { + "SEND_METRICS_EVENT_WITH_EMPTY_SCHEMA": { + "method": "manage_metrics.event", + "params": "METRICS_EMPTY_SCHEMA" + }, + "NULL_FOR_METRICS_EVENT": { + "method": "metrics.event", + "validationJsonPath": "result", + "content": "NULL" + } } \ No newline at end of file From 1f2fc4e39607e234290444901f0523db99b72ff7 Mon Sep 17 00:00:00 2001 From: Rajanika Date: Thu, 23 Jan 2025 19:11:33 +0530 Subject: [PATCH 3/4] revert unncessary changes --- .../fixtures/fireboltCalls/discoverylaunch.json | 5 +++++ cypress/fixtures/fireboltCalls/parameters.json | 10 ++++++++++ cypress/fixtures/fireboltCalls/securestorage.js | 16 ---------------- .../fixtures/fireboltCalls/securestorage.json | 16 ++++++++++++++++ 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/cypress/fixtures/fireboltCalls/discoverylaunch.json b/cypress/fixtures/fireboltCalls/discoverylaunch.json index 425c397c9..76481564f 100644 --- a/cypress/fixtures/fireboltCalls/discoverylaunch.json +++ b/cypress/fixtures/fireboltCalls/discoverylaunch.json @@ -107,6 +107,11 @@ "method": "discovery.launch", "params": "DISCOVERYLAUNCH_PLAYENTITY_INTENT_WITHOUT_ENTITYTYPE_AND_WITH_PROGRAMTYPE_MOVIE_FOR_TVEPISODEENTITY" }, + "TRUE_FOR_DISCOVERYLAUNCH": { + "method": "discovery.launch", + "validationJsonPath": "result", + "content": "TRUE" + }, "FOREGROUND_FOR_LIFECYCLE_STATE": { "method": "lifecycle.state", "validationJsonPath": "result", diff --git a/cypress/fixtures/fireboltCalls/parameters.json b/cypress/fixtures/fireboltCalls/parameters.json index 78ba29e04..ed275b410 100644 --- a/cypress/fixtures/fireboltCalls/parameters.json +++ b/cypress/fixtures/fireboltCalls/parameters.json @@ -209,6 +209,16 @@ "validationJsonPath": "result.discovery", "content": "PARAMETERS_INITIALIZATION_PLAYENTITYINTENT_WITHOUT_OPTIONS" }, + "PARAMETERS_INITIALIZATION_ADVERTISINGID_AD_OFF": { + "method": "parameters.initialization", + "validationJsonPath": "result", + "content": "ADVERTISING_ADVERTISINGID_ADOFF" + }, + "PARAMETERS_INITIALIZATION_ADVERTISINGID_AD_ON": { + "method": "parameters.initialization", + "validationJsonPath": "result", + "content": "ADVERTISING_ADVERTISINGID_ADON" + }, "NULLINTENT_SOURCE_FOR_INITIALIZATION_PARAMETERS": { "method": "parameters.initialization", "context": "DISCOVERY_LAUNCH_NULL", diff --git a/cypress/fixtures/fireboltCalls/securestorage.js b/cypress/fixtures/fireboltCalls/securestorage.js index 5a12a1325..58140bd9f 100644 --- a/cypress/fixtures/fireboltCalls/securestorage.js +++ b/cypress/fixtures/fireboltCalls/securestorage.js @@ -414,16 +414,6 @@ exports.NULL_FOR_UPDATING_A_SECURE_DATA_VALUE_FOR_AN_APP = { validationJsonPath: 'result', content: null, }; -exports.NULL_FOR_UPDATING_A_SECURE_DATA_VALUE = { - method: 'securestorage.set', - validationJsonPath: 'result', - content: null, -}; -exports.NULL_FOR_REMOVING_STORED_VALUE = { - method: 'securestorage.remove', - validationJsonPath: 'result', - content: null, -}; exports.EXPECTED_VALUE_FOR_AUTHTESTTOKENDEVICE2_STORED_DATA_IN_SECURESTORAGE = { method: 'securestorage.get', validationJsonPath: 'result', @@ -538,12 +528,6 @@ exports.INVALID_PARAMS_FOR_SETTING_A_DATA_VALUE_IN_SECURESTORAGE = { content: errorContent.INVALID_PARAMS, expectingError: true, }; -exports.INVALID_PARAMETERS_FOR_SECURESTORAGE_REMOVE = { - method: 'securestorage.remove', - validationJsonPath: 'result', - content: errorContent.INVALID_PARAMS, - expectingError: true, -}; exports.INVALID_PARAMETERS_FOR_SECURESTORAGE_REMOVEFORAPP = { method: 'securestorage.removeForApp', validationJsonPath: 'result', diff --git a/cypress/fixtures/fireboltCalls/securestorage.json b/cypress/fixtures/fireboltCalls/securestorage.json index 295cc76e3..f62a2a047 100644 --- a/cypress/fixtures/fireboltCalls/securestorage.json +++ b/cypress/fixtures/fireboltCalls/securestorage.json @@ -1,4 +1,14 @@ { + "NULL_FOR_UPDATING_A_SECURE_DATA_VALUE": { + "method": "securestorage.set", + "validationJsonPath": "result", + "content": "NULL" + }, + "NULL_FOR_REMOVING_STORED_VALUE": { + "method": "securestorage.remove", + "validationJsonPath": "result", + "content": "NULL" + }, "NULL_FOR_REMOVING_STORED_VALUE_FOR_AN_APP": { "method": "securestorage.removeForApp", "validationJsonPath": "result", @@ -139,6 +149,12 @@ "content": "INVALID_PARAMS", "expectingError": true }, + "INVALID_PARAMETERS_FOR_SECURESTORAGE_REMOVE": { + "method": "securestorage.remove", + "validationJsonPath": "result", + "content": "INVALID_PARAMS", + "expectingError": true + }, "SET_SECURE_VALUE_WITH_EMPTY_KEY": { "method": "securestorage.set", "params": "SECURESTORAGE_SET_KEY_EMPTY", From eaecc209217cda0ec2f82688a78d01b1db25190d Mon Sep 17 00:00:00 2001 From: Rajanika Date: Thu, 23 Jan 2025 19:15:15 +0530 Subject: [PATCH 4/4] revert metrics.json changes --- cypress/fixtures/fireboltCalls/metrics.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cypress/fixtures/fireboltCalls/metrics.json b/cypress/fixtures/fireboltCalls/metrics.json index 0653d656e..595c1b45d 100644 --- a/cypress/fixtures/fireboltCalls/metrics.json +++ b/cypress/fixtures/fireboltCalls/metrics.json @@ -1,11 +1,12 @@ + { - "SEND_METRICS_EVENT_WITH_EMPTY_SCHEMA": { - "method": "manage_metrics.event", - "params": "METRICS_EMPTY_SCHEMA" - }, - "NULL_FOR_METRICS_EVENT": { - "method": "metrics.event", - "validationJsonPath": "result", - "content": "NULL" - } + "SEND_METRICS_EVENT_WITH_EMPTY_SCHEMA": { + "method": "manage_metrics.event", + "params": "METRICS_EMPTY_SCHEMA" + }, + "NULL_FOR_METRICS_EVENT": { + "method": "metrics.event", + "validationJsonPath": "result", + "content": "NULL" + } } \ No newline at end of file