diff --git a/gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json b/gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json index 318b0b60e..74662367a 100644 --- a/gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json +++ b/gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json @@ -56,7 +56,8 @@ "description": "Whether to enable/disable High Contrast.", "type": "boolean", "default": false - } + }, + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" } }, "capabilitiesTransformations": { @@ -84,12 +85,6 @@ } }, "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.HCF_HIGHCONTRASTON" - } } } }, diff --git a/gpii/node_modules/lifecycleManager/src/LifecycleManager.js b/gpii/node_modules/lifecycleManager/src/LifecycleManager.js index ed434a0fb..189fc4b67 100644 --- a/gpii/node_modules/lifecycleManager/src/LifecycleManager.js +++ b/gpii/node_modules/lifecycleManager/src/LifecycleManager.js @@ -736,6 +736,11 @@ var fluid = fluid || require("infusion"), options: handlerSpec.options }]; + // GPII-3119 Optionally include supportedSettings if there are any + if (handlerSpec.supportedSettings !== undefined) { + returnObj[solutionId][0].supportedSettings = handlerSpec.supportedSettings; + } + return returnObj; }; diff --git a/gpii/node_modules/matchMakerFramework/test/data/app_specific_only.json b/gpii/node_modules/matchMakerFramework/test/data/app_specific_only.json index 7ebe2cf92..e8cac4ce4 100644 --- a/gpii/node_modules/matchMakerFramework/test/data/app_specific_only.json +++ b/gpii/node_modules/matchMakerFramework/test/data/app_specific_only.json @@ -5,16 +5,11 @@ "preferences": { "http://registry.gpii.net/applications/com.microsoft.windows.mouseTrailing": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, "http://registry.gpii.net/applications/com.microsoft.windows.highContrast": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, diff --git a/gpii/node_modules/matchMakerFramework/test/data/multi_context.json b/gpii/node_modules/matchMakerFramework/test/data/multi_context.json index d0ac7a020..a1cdaeaa0 100644 --- a/gpii/node_modules/matchMakerFramework/test/data/multi_context.json +++ b/gpii/node_modules/matchMakerFramework/test/data/multi_context.json @@ -5,7 +5,6 @@ "preferences": { "http://registry.gpii.net/applications/com.microsoft.windows.highContrast": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, diff --git a/gpii/node_modules/matchMakerFramework/test/data/os_win.json b/gpii/node_modules/matchMakerFramework/test/data/os_win.json index 6f9899eae..cb6946cf7 100644 --- a/gpii/node_modules/matchMakerFramework/test/data/os_win.json +++ b/gpii/node_modules/matchMakerFramework/test/data/os_win.json @@ -6,46 +6,35 @@ "preferences": { "http://registry.gpii.net/applications/com.microsoft.windows.mouseTrailing": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, "http://registry.gpii.net/applications/com.microsoft.windows.mouseKeys": { "MouseKeysOn": { - "path": "pvParam.dwFlags.MKF_MOUSEKEYSON", "value": true }, "MaxSpeed": { - "path": "pvParam.iMaxSpeed", "value": 100 }, "Acceleration": { - "path": "pvParam.iTimeToMaxSpeed", "value": 1000 } }, "http://registry.gpii.net/applications/com.microsoft.windows.stickyKeys": { "StickyKeysOn": { - "path": "pvParam.dwFlags.SKF_STICKYKEYSON", "value": true } }, "http://registry.gpii.net/applications/com.microsoft.windows.filterKeys": { "FilterKeysEnable": { - "path": "pvParam.dwFlags.FKF_FILTERKEYSON", "value": true }, "BounceKeysInterval": { - "path": "pvParam.iBounceMSec", "value": 1000 } }, "http://registry.gpii.net/applications/com.microsoft.windows.highContrast": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, diff --git a/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js b/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js index 090838f88..d063d9392 100644 --- a/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js +++ b/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js @@ -175,8 +175,8 @@ gpii.settingsHandlers.invokeSettingsHandler = function (handler, payload) { var response = gpii.settingsHandlers.transformPayload(payload, function (element, path) { var solutionId = path[0]; // first entry of path will always be solution ID // Note shallow copy performed within filterKeys - var directLoad = fluid.filterKeys(element, ["settings", "options"]); - var others = fluid.censorKeys(element, ["settings", "options"]); + var directLoad = fluid.filterKeys(element, ["settings", "options", "supportedSettings"]); + var others = fluid.censorKeys(element, ["settings", "options", "supportedSettings"]); worklist.push({ path: path, result: handler(directLoad, solutionId), diff --git a/gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5 b/gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5 index 720d4f986..24ef9ea2c 100644 --- a/gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5 +++ b/gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5 @@ -51,7 +51,11 @@ "type": "object", "additionalProperties": false, "properties": { - "schema": { "$ref": "gss-v7-full#", "required": true } + "schema": { "$ref": "gss-v7-full#", "required": true }, + "path": { + "type": ["string", "object"], + "required": false + } } } }, diff --git a/gpii/node_modules/transformer/test/TransformerTests.js b/gpii/node_modules/transformer/test/TransformerTests.js index 2f0326295..ef3689e83 100644 --- a/gpii/node_modules/transformer/test/TransformerTests.js +++ b/gpii/node_modules/transformer/test/TransformerTests.js @@ -269,6 +269,10 @@ var testSolutionsEntry = { "description": "Swap mouse left/right buttons", "type": "boolean", "default": false + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -278,12 +282,6 @@ var testSolutionsEntry = { "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -322,6 +320,10 @@ var testSolutionsEntry = { "enumLabels": ["full-page"] } ] + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -331,12 +333,6 @@ var testSolutionsEntry = { "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.ScrollLines", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -390,7 +386,8 @@ var testSolutionsEntry = { "description": "Whether to enable/disable High Contrast", "type": "boolean", "default": false - } + }, + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" } }, "capabilities": [ @@ -423,12 +420,6 @@ var testSolutionsEntry = { } }, "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.HCF_HIGHCONTRASTON" - } } } }, @@ -1125,7 +1116,6 @@ gpii.tests.transformer.configurationToSettingsTestSpecs = [ "http://registry.gpii.net/common/highContrast/enabled": true, "http://registry.gpii.net/applications/com.microsoft.windows.highContrast": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } } @@ -1175,7 +1165,6 @@ gpii.tests.transformer.configurationToSettingsTestSpecs = [ }, "settings": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, @@ -1420,12 +1409,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -1444,12 +1427,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -1472,12 +1449,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -1496,12 +1467,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [ "true": "", "false": "", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam" - } } } }, @@ -1519,12 +1484,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 0cfba1702..f64383ad3 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -4977,7 +4977,8 @@ "default": "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -4986,12 +4987,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.desktopBackground.Image", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam" - } } } }, @@ -5044,7 +5039,8 @@ "default": "" } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -5053,12 +5049,6 @@ "type": "fluid.transforms.literalValue", "input": "", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam" - } } } }, @@ -6315,7 +6305,8 @@ "default": false } } - } + }, + "path": "pvParam.dwFlags.FKF_FILTERKEYSON" }, "SlowKeysInterval": { "schema": { @@ -6330,7 +6321,8 @@ "default": 0 // 0 means no interval time } } - } + }, + "path": "pvParam.iWaitMSec" }, "BounceKeysInterval": { "schema": { @@ -6338,7 +6330,8 @@ "description": "Bounce keys interval time in milliseconds", "type": "integer", "default": 0 - } + }, + "path": "pvParam.iBounceMSec" } }, "capabilitiesTransformations": { @@ -6351,12 +6344,6 @@ "right": false, "operator": "||", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.FKF_FILTERKEYSON" - } } }, "SlowKeysInterval": { @@ -6372,12 +6359,6 @@ }, "false": 0, "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.iWaitMSec" - } } }, "BounceKeysInterval": { @@ -6409,12 +6390,6 @@ }, "false": 0, "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.iBounceMSec" - } } } }, @@ -6533,7 +6508,8 @@ "default": false } } - } + }, + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" } }, "capabilities": [ @@ -6566,12 +6542,6 @@ } }, "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.HCF_HIGHCONTRASTON" - } } } }, @@ -6758,7 +6728,8 @@ "off", "on" ] - } + }, + "path": "pvParam.Enabled" } }, "capabilitiesTransformations": { @@ -6767,12 +6738,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.audioDescription.AudioDescriptionEnabled", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.Enabled" - } } } }, @@ -6832,7 +6797,8 @@ "60s", "300s" ] - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -6841,12 +6807,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.notificationDuration.NotificationDuration", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam" - } } } }, @@ -7020,7 +6980,8 @@ "description": "Enable/Disable ToggleKeys feature", "type": "boolean", "default": false - } + }, + "path": "pvParam.dwFlags.TKF_TOGGLEKEYSON" } }, "capabilitiesTransformations": { @@ -7029,12 +6990,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/common/toggleKeys", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.TKF_TOGGLEKEYSON" - } } } }, @@ -7078,7 +7033,8 @@ "description": "Displays a underline showing which is the shortcut to active a menu item", "type": "boolean", "default": false - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -7087,12 +7043,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.underlineMenuShortcuts.Enabled", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam" - } } } }, @@ -7118,6 +7068,10 @@ "description": "Set the keyboard as the preferred input method", "type": "boolean", "default": false + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -7127,15 +7081,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.underlineMenuShortcuts.KeyboardPrefEnabled", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": { - "get": "pvParam", - "set": "uiParam" - } - } } } }, @@ -7632,7 +7577,8 @@ "default": false } } - } + }, + "path": "pvParam.dwFlags.MKF_MOUSEKEYSON" }, "MaxSpeed": { "schema": { @@ -7640,7 +7586,8 @@ "description": "Speed of mouse keys", "type": "number", "multipleOf": 10 - } + }, + "path": "pvParam.iMaxSpeed" }, "Acceleration": { "schema": { @@ -7650,7 +7597,8 @@ "minimum": -1000, // TODO: Not clear how to describe this setting "maximum": 1000 - } + }, + "path": "pvParam.iTimeToMaxSpeed" } }, "capabilitiesTransformations": { @@ -7659,12 +7607,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/common/mouseEmulation/enabled", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.MKF_MOUSEKEYSON" - } } }, "MaxSpeed": { @@ -7679,12 +7621,6 @@ } }, "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.iMaxSpeed" - } } }, "Acceleration": { @@ -7708,12 +7644,6 @@ } }, "operator": "+" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.iTimeToMaxSpeed" - } } } }, @@ -7780,6 +7710,10 @@ "default": 0 } } + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -7789,12 +7723,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -7840,6 +7768,10 @@ ] } } + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -7849,12 +7781,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.ScrollLines", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -7888,7 +7814,8 @@ "enumLabels": ["RoutingFocus", "RoutingHybrid"] } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -7897,9 +7824,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.ScrollRouting", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -7933,7 +7857,8 @@ "default": false } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -7942,9 +7867,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.EnableCursorShadow", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -7980,6 +7902,10 @@ "maximum": 100 } } + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -7989,12 +7915,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.ScrollChars", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -8029,7 +7949,8 @@ "default": 0 } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -8038,9 +7959,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.WindowsTrackingEnabled", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -8075,7 +7993,8 @@ "default": 0 } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -8084,9 +8003,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.WindowsTrackingEnabled", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -8121,6 +8037,10 @@ "default": 1 } } + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -8130,12 +8050,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.AutoWinArrangement", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -8202,7 +8116,8 @@ "default": 10 } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -8211,9 +8126,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.PointerSpeed", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -8250,7 +8162,8 @@ "default": 1 } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -8262,9 +8175,6 @@ "outputPath": "value", "true": [6, 10, 1], "false": [0, 0, 1] - }, - "path": { - "literalValue": "pvParam" } } }, @@ -8299,6 +8209,10 @@ "default": 0 } } + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -8308,12 +8222,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SnapToDefaultButton", "outputPath": "value" - }, - "path": { - "literalValue": { - "get": "pvParam", - "set": "uiParam" - } } } }, @@ -8348,7 +8256,8 @@ "default": 1 } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -8357,9 +8266,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.HidePointer", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -8394,7 +8300,8 @@ "default": 0 } } - } + }, + "path": "pvParam" } }, "capabilitiesTransformations": { @@ -8403,9 +8310,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.MouseSonar", "outputPath": "value" - }, - "path": { - "literalValue": "pvParam" } } }, @@ -8524,6 +8428,10 @@ "maximum": 10 } } + }, + "path": { + "get": "pvParam", + "set": "uiParam" } } }, @@ -8533,15 +8441,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/common/mouseTrailing", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": { - "get": "pvParam", - "set": "uiParam" - } - } } } }, @@ -9646,7 +9545,8 @@ "path": { "type": "string", "required": true}, "value": { "type": "boolean", "required": true} } - } + }, + "path": "pvParam.dwFlags.SKF_STICKYKEYSON" } }, "capabilitiesTransformations": { @@ -9655,12 +9555,6 @@ "type": "fluid.transforms.value", "inputPath": "http://registry\\.gpii\\.net/common/stickyKeys", "outputPath": "value" - }, - "path": { - "transform": { - "type": "fluid.transforms.literalValue", - "input": "pvParam.dwFlags.SKF_STICKYKEYSON" - } } } }, diff --git a/tests/data/preferences/os_win.json5 b/tests/data/preferences/os_win.json5 index 4c0abb57e..99bd4a9a4 100644 --- a/tests/data/preferences/os_win.json5 +++ b/tests/data/preferences/os_win.json5 @@ -6,50 +6,36 @@ "preferences": { "http://registry.gpii.net/applications/com.microsoft.windows.mouseTrailing": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, "http://registry.gpii.net/applications/com.microsoft.windows.mouseKeys": { "MouseKeysOn": { - "path": "pvParam.dwFlags.MKF_MOUSEKEYSON", "value": true }, "MaxSpeed": { - "path": "pvParam.iMaxSpeed", "value": 100 }, "Acceleration": { - "path": "pvParam.iTimeToMaxSpeed", "value": 1000 } }, "http://registry.gpii.net/applications/com.microsoft.windows.stickyKeys": { "StickyKeysOn": { - "path": "pvParam.dwFlags.SKF_STICKYKEYSON", "value": true } }, "http://registry.gpii.net/applications/com.microsoft.windows.toggleKeys": { "ToggleKeysOn": { - "path": "pvParam.dwFlags.TKF_TOGGLEKEYSON", "value": true } }, "http://registry.gpii.net/applications/com.microsoft.windows.underlineMenuShortcuts": { "UnderlineMenuShortcutsOn": { - "value": 1, - "path": "pvParam" + "value": 1 }, "KeyboardPreferenceOn": { - "value": 1, - "path": { - "get": "pvParam", - "set": "uiParam" - } + "value": 1 } }, "http://registry.gpii.net/applications/com.microsoft.windows.shortcutWarningMessage": { @@ -60,11 +46,9 @@ }, "http://registry.gpii.net/applications/com.microsoft.windows.filterKeys": { "FilterKeysEnable": { - "path": "pvParam.dwFlags.FKF_FILTERKEYSON", "value": true }, "BounceKeysInterval": { - "path": "pvParam.iBounceMSec", "value": 1000 } }, @@ -157,73 +141,45 @@ }, "http://registry.gpii.net/applications/com.microsoft.windows.mouseSettings": { "SwapMouseButtonsConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 }, "ScrollWheelModeConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 4294967294 }, "ScrollFocusRoutingConfig": { - "path": "pvParam", "value": 1 }, "MouseCursorShadowEnable": { - "path": "pvParam", "value": 1 }, "ScrollCharsConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 }, "WindowsTrackingConfig": { - "path": "pvParam", "value": 1 }, "ActiveZOrder": { - "path": "pvParam", "value": 0 }, "WindowsArrangement": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 }, "DoubleClickTimeConfig": { "value": 600 }, "PointerSpeedConfig": { - "path": "pvParam", "value": 15 }, "EnhancePrecisionConfig": { - "path": "pvParam", "value": [0, 0, 1] }, "SnapToDefaultButtonConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 }, "HidePointerConfig": { - "path": "pvParam", "value": 0 }, "MouseSonarConfig": { - "path": "pvParam", "value": 1 }, "DoubleClickWidthConfig": { diff --git a/tests/data/preferences/os_win_2.json5 b/tests/data/preferences/os_win_2.json5 index b732c15b2..6b75cd973 100644 --- a/tests/data/preferences/os_win_2.json5 +++ b/tests/data/preferences/os_win_2.json5 @@ -9,7 +9,6 @@ "value": { "r": 67, "g": 187, "b": 19 } }, "ImageConfig": { - "path": "pvParam", "value": "" } } diff --git a/tests/data/preferences/os_win_highContrast.json5 b/tests/data/preferences/os_win_highContrast.json5 index a3faa6457..f96c2b284 100644 --- a/tests/data/preferences/os_win_highContrast.json5 +++ b/tests/data/preferences/os_win_highContrast.json5 @@ -10,7 +10,6 @@ "preferences": { "http://registry.gpii.net/applications/com.microsoft.windows.highContrast": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } } diff --git a/tests/platform/windows/windows-builtIn-testSpec.js b/tests/platform/windows/windows-builtIn-testSpec.js index b4813b62a..64e291b60 100644 --- a/tests/platform/windows/windows-builtIn-testSpec.js +++ b/tests/platform/windows/windows-builtIn-testSpec.js @@ -128,10 +128,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "SwapMouseButtonsConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 } }, @@ -142,15 +138,19 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "SwapMouseButtonsConfig": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } }, { "settings": { "ScrollWheelModeConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 4294967294 } }, @@ -161,12 +161,19 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "ScrollWheelModeConfig": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } }, { "settings": { "ScrollFocusRoutingConfig": { - "path": "pvParam", "value": 1 } }, @@ -177,12 +184,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "ScrollFocusRoutingConfig": { + "path": "pvParam" + } } }, { "settings": { "MouseCursorShadowEnable": { - "path": "pvParam", "value": 1 } }, @@ -193,15 +204,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "MouseCursorShadowEnable": { + "path": "pvParam" + } } }, { "settings": { "ScrollCharsConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, @@ -212,12 +224,19 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "ScrollCharsConfig": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } }, { "settings": { "WindowsTrackingConfig": { - "path": "pvParam", "value": 1 } }, @@ -228,12 +247,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "WindowsTrackingConfig": { + "path": "pvParam" + } } }, { "settings": { "ActiveZOrder": { - "path": "pvParam", "value": 0 } }, @@ -244,15 +267,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "ActiveZOrder": { + "path": "pvParam" + } } }, { "settings": { "WindowsArrangement": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 } }, @@ -263,12 +287,19 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "WindowsArrangement": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } }, { "settings": { "PointerSpeedConfig": { - "path": "pvParam", "value": 15 } }, @@ -279,12 +310,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "PointerSpeedConfig": { + "path": "pvParam" + } } }, { "settings": { "EnhancePrecisionConfig": { - "path": "pvParam", "value": [0, 0, 1] } }, @@ -297,15 +332,16 @@ gpii.tests.windows.builtIn = [ "valueType": "INT", "length": 3 } + }, + "supportedSettings": { + "EnhancePrecisionConfig": { + "path": "pvParam" + } } }, { "settings": { "SnapToDefaultButtonConfig": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 } }, @@ -316,12 +352,19 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "SnapToDefaultButtonConfig": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } }, { "settings": { "HidePointerConfig": { - "path": "pvParam", "value": 0 } }, @@ -332,12 +375,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "HidePointerConfig": { + "path": "pvParam" + } } }, { "settings": { "MouseSonarConfig": { - "path": "pvParam", "value": 1 } }, @@ -348,6 +395,11 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "UINT" } + }, + "supportedSettings": { + "MouseSonarConfig": { + "path": "pvParam" + } } } ], @@ -355,10 +407,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, @@ -369,6 +417,14 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "MouseTrails": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } } ], @@ -376,15 +432,12 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseKeysOn": { - "path": "pvParam.dwFlags.MKF_MOUSEKEYSON", "value": true }, "MaxSpeed": { - "path": "pvParam.iMaxSpeed", "value": 100 }, "Acceleration": { - "path": "pvParam.iTimeToMaxSpeed", "value": 1000 } }, @@ -396,6 +449,17 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "MOUSEKEYS" } + }, + "supportedSettings": { + "MouseKeysOn": { + "path": "pvParam.dwFlags.MKF_MOUSEKEYSON" + }, + "MaxSpeed": { + "path": "pvParam.iMaxSpeed" + }, + "Acceleration": { + "path": "pvParam.iTimeToMaxSpeed" + } } } ], @@ -403,7 +467,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "StickyKeysOn": { - "path": "pvParam.dwFlags.SKF_STICKYKEYSON", "value": true } }, @@ -415,6 +478,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "STICKYKEYS" } + }, + "supportedSettings": { + "StickyKeysOn": { + "path": "pvParam.dwFlags.SKF_STICKYKEYSON" + } } } ], @@ -422,11 +490,9 @@ gpii.tests.windows.builtIn = [ { "settings": { "FilterKeysEnable": { - "path": "pvParam.dwFlags.FKF_FILTERKEYSON", "value": true }, "BounceKeysInterval": { - "path": "pvParam.iBounceMSec", "value": 1000 } }, @@ -438,6 +504,17 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "FILTERKEYS" } + }, + "supportedSettings": { + "FilterKeysEnable": { + "path": "pvParam.dwFlags.FKF_FILTERKEYSON" + }, + "SlowKeysInterval": { + "path": "pvParam.iWaitMSec" + }, + "BounceKeysInterval": { + "path": "pvParam.iBounceMSec" + } } } ], @@ -445,7 +522,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "ToggleKeysOn": { - "path": "pvParam.dwFlags.TKF_TOGGLEKEYSON", "value": true } }, @@ -457,6 +533,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "TOGGLEKEYS" } + }, + "supportedSettings": { + "ToggleKeysOn": { + "path": "pvParam.dwFlags.TKF_TOGGLEKEYSON" + } } } ], @@ -464,7 +545,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "UnderlineMenuShortcutsOn": { - "path": "pvParam", "value": 1 } }, @@ -475,15 +555,16 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "UnderlineMenuShortcutsOn": { + "path": "pvParam" + } } }, { "settings": { "KeyboardPreferenceOn": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 1 } }, @@ -494,6 +575,14 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "KeyboardPreferenceOn": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } } ] @@ -844,7 +933,6 @@ gpii.tests.windows.builtIn = [ "com.microsoft.windows.desktopBackgroundColor": [{ "settings": { "ImageConfig": { - "path": "pvParam", "value": "" } }, @@ -857,6 +945,11 @@ gpii.tests.windows.builtIn = [ "valueType": "TCHAR", "length": 260 } + }, + "supportedSettings": { + "ImageConfig": { + "path": "pvParam" + } } }] }, @@ -922,10 +1015,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, @@ -936,6 +1025,14 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "MouseTrails": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } } ], @@ -943,7 +1040,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseKeysOn": { - "path": "pvParam.dwFlags.MKF_MOUSEKEYSON", "value": true } }, @@ -955,6 +1051,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "MOUSEKEYS" } + }, + "supportedSettings": { + "MouseKeysOn": { + "path": "pvParam.dwFlags.MKF_MOUSEKEYSON" + } } } ], @@ -962,7 +1063,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "StickyKeysOn": { - "path": "pvParam.dwFlags.SKF_STICKYKEYSON", "value": true } }, @@ -974,6 +1074,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "STICKYKEYS" } + }, + "supportedSettings": { + "StickyKeysOn": { + "path": "pvParam.dwFlags.SKF_STICKYKEYSON" + } } } ], @@ -981,11 +1086,9 @@ gpii.tests.windows.builtIn = [ { "settings": { "FilterKeysEnable": { - "path": "pvParam.dwFlags.FKF_FILTERKEYSON", "value": false }, "BounceKeysInterval": { - "path": "pvParam.iBounceMSec", "value": 0 } }, @@ -997,6 +1100,14 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "FILTERKEYS" } + }, + "supportedSettings": { + "FilterKeysEnable": { + "path": "pvParam.dwFlags.FKF_FILTERKEYSON" + }, + "BounceKeysInterval": { + "path": "pvParam.iBounceMSec" + } } } ] @@ -1145,10 +1256,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, @@ -1159,6 +1266,14 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "MouseTrails": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } } ], @@ -1166,7 +1281,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseKeysOn": { - "path": "pvParam.dwFlags.MKF_MOUSEKEYSON", "value": true } }, @@ -1178,6 +1292,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "MOUSEKEYS" } + }, + "supportedSettings": { + "MouseKeysOn": { + "path": "pvParam.dwFlags.MKF_MOUSEKEYSON" + } } } ], @@ -1185,7 +1304,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "StickyKeysOn": { - "path": "pvParam.dwFlags.SKF_STICKYKEYSON", "value": true } }, @@ -1197,6 +1315,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "STICKYKEYS" } + }, + "supportedSettings": { + "StickyKeysOn": { + "path": "pvParam.dwFlags.SKF_STICKYKEYSON" + } } } ], @@ -1204,11 +1327,9 @@ gpii.tests.windows.builtIn = [ { "settings": { "FilterKeysEnable": { - "path": "pvParam.dwFlags.FKF_FILTERKEYSON", "value": false }, "BounceKeysInterval": { - "path": "pvParam.iBounceMSec", "value": 0 } }, @@ -1220,6 +1341,14 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "FILTERKEYS" } + }, + "supportedSettings": { + "FilterKeysEnable": { + "path": "pvParam.dwFlags.FKF_FILTERKEYSON" + }, + "BounceKeysInterval": { + "path": "pvParam.iBounceMSec" + } } } ] @@ -1368,10 +1497,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseTrails": { - "path": { - "get": "pvParam", - "set": "uiParam" - }, "value": 10 } }, @@ -1382,6 +1507,14 @@ gpii.tests.windows.builtIn = [ "pvParam": { "type": "BOOL" } + }, + "supportedSettings": { + "MouseTrails": { + "path": { + "get": "pvParam", + "set": "uiParam" + } + } } } ], @@ -1389,7 +1522,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "MouseKeysOn": { - "path": "pvParam.dwFlags.MKF_MOUSEKEYSON", "value": true } }, @@ -1401,6 +1533,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "MOUSEKEYS" } + }, + "supportedSettings": { + "MouseKeysOn": { + "path": "pvParam.dwFlags.MKF_MOUSEKEYSON" + } } } ], @@ -1408,7 +1545,6 @@ gpii.tests.windows.builtIn = [ { "settings": { "StickyKeysOn": { - "path": "pvParam.dwFlags.SKF_STICKYKEYSON", "value": true } }, @@ -1420,6 +1556,11 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "STICKYKEYS" } + }, + "supportedSettings": { + "StickyKeysOn": { + "path": "pvParam.dwFlags.SKF_STICKYKEYSON" + } } } ], @@ -1427,11 +1568,9 @@ gpii.tests.windows.builtIn = [ { "settings": { "FilterKeysEnable": { - "path": "pvParam.dwFlags.FKF_FILTERKEYSON", "value": false }, "BounceKeysInterval": { - "path": "pvParam.iBounceMSec", "value": 0 } }, @@ -1443,6 +1582,14 @@ gpii.tests.windows.builtIn = [ "type": "struct", "name": "FILTERKEYS" } + }, + "supportedSettings": { + "FilterKeysEnable": { + "path": "pvParam.dwFlags.FKF_FILTERKEYSON" + }, + "BounceKeysInterval": { + "path": "pvParam.iBounceMSec" + } } } ] @@ -1679,7 +1826,6 @@ gpii.tests.windows.builtInHighContrast = [ { // high contrast settings "settings": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, @@ -1691,6 +1837,11 @@ gpii.tests.windows.builtInHighContrast = [ "type": "struct", "name": "HIGHCONTRAST" } + }, + "supportedSettings": { + "HighContrastOn": { + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" + } } } ] @@ -1706,7 +1857,6 @@ gpii.tests.windows.builtInHighContrast = [ { // high contrast settings "settings": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, @@ -1718,6 +1868,11 @@ gpii.tests.windows.builtInHighContrast = [ "type": "struct", "name": "HIGHCONTRAST" } + }, + "supportedSettings": { + "HighContrastOn": { + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" + } } } ] @@ -1771,7 +1926,6 @@ gpii.tests.windows.builtInHighContrast = [ { // high contrast settings "settings": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, @@ -1783,6 +1937,11 @@ gpii.tests.windows.builtInHighContrast = [ "type": "struct", "name": "HIGHCONTRAST" } + }, + "supportedSettings": { + "HighContrastOn": { + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" + } } } ] @@ -1836,7 +1995,6 @@ gpii.tests.windows.builtInHighContrast = [ { // high contrast settings "settings": { "HighContrastOn": { - "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON", "value": true } }, @@ -1848,6 +2006,11 @@ gpii.tests.windows.builtInHighContrast = [ "type": "struct", "name": "HIGHCONTRAST" } + }, + "supportedSettings": { + "HighContrastOn": { + "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON" + } } } ]