From 172569e53c13fd1effb6edddd924e205e6da608d Mon Sep 17 00:00:00 2001 From: Tony Atkins Date: Fri, 28 Feb 2020 16:54:18 +0100 Subject: [PATCH] GPII-4388: Removed legacy settings that were causing trouble on the other end of transforms. --- documentation/PreferencesServer.md | 7 +--- .../test/data/os_common.json | 2 - .../inverseCapabilities/os_win_expected.json | 3 +- .../test/data/prefsSafes.json | 12 +----- .../test/preferencesServerTests.js | 37 ++----------------- testData/ontologies/flat.json5 | 14 ------- .../ontologies/mappings/ISO24751-flat.json5 | 2 - 7 files changed, 8 insertions(+), 69 deletions(-) diff --git a/documentation/PreferencesServer.md b/documentation/PreferencesServer.md index d0bb6d7ec..1472c8d86 100644 --- a/documentation/PreferencesServer.md +++ b/documentation/PreferencesServer.md @@ -61,7 +61,6 @@ Return payload: "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -92,7 +91,6 @@ Return payload: "onscreenKeyboard": true, "mouseEmulation": { "cursorSpeed": 0.85, - "cursorAcceleration": 0.8, "-provisional-initDelay": 120, "-provisional-mouseEmulation/enabled": true } @@ -140,7 +138,6 @@ Example POST body: "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -170,7 +167,6 @@ payload would be: "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -265,8 +261,7 @@ before the PUT request: "name": "Default preferences", "preferences": { "http://registry.gpii.net/common/initDelay": 120, - "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800 + "http://registry.gpii.net/common/cursorSpeed": 0.850 } } } diff --git a/gpii/node_modules/matchMakerFramework/test/data/os_common.json b/gpii/node_modules/matchMakerFramework/test/data/os_common.json index f3c2b6059..61c3e577d 100644 --- a/gpii/node_modules/matchMakerFramework/test/data/os_common.json +++ b/gpii/node_modules/matchMakerFramework/test/data/os_common.json @@ -13,11 +13,9 @@ "http://registry.gpii.net/common/mouseTrailing": 10, "http://registry.gpii.net/common/highContrast/enabled": true, "http://registry.gpii.net/common/mouseEmulation/enabled": true, - "http://registry.gpii.net/common/cursorAcceleration": 1, "http://registry.gpii.net/common/cursorSpeed": 1, "http://registry.gpii.net/common/stickyKeys": true, "http://registry.gpii.net/common/debounce/enabled": true, - "http://registry.gpii.net/common/debounceInterval": 1, "http://registry.gpii.net/common/onScreenKeyboard/enabled": true } } diff --git a/gpii/node_modules/matchMakerFramework/test/inverseCapabilities/os_win_expected.json b/gpii/node_modules/matchMakerFramework/test/inverseCapabilities/os_win_expected.json index 9722daef6..613bbb092 100644 --- a/gpii/node_modules/matchMakerFramework/test/inverseCapabilities/os_win_expected.json +++ b/gpii/node_modules/matchMakerFramework/test/inverseCapabilities/os_win_expected.json @@ -27,8 +27,7 @@ "http://registry.gpii.net/common/mouseEmulation/enabled": true }, "com.microsoft.windows.filterKeys": { - "http://registry.gpii.net/common/debounce/enabled": true, - "http://registry.gpii.net/common/debounceInterval": 1 + "http://registry.gpii.net/common/debounce/enabled": true }, "com.microsoft.windows.screenResolution": {}, "com.microsoft.windows.screenDPI": { diff --git a/gpii/node_modules/preferencesServer/test/data/prefsSafes.json b/gpii/node_modules/preferencesServer/test/data/prefsSafes.json index b2c47f698..902ac3890 100644 --- a/gpii/node_modules/preferencesServer/test/data/prefsSafes.json +++ b/gpii/node_modules/preferencesServer/test/data/prefsSafes.json @@ -19,7 +19,6 @@ "mouseEmulation": { "-provisional-initDelay": 120, "cursorSpeed": 0.850, - "cursorAcceleration": 0.800, "-provisional-mouseEmulation/enabled": true } }, @@ -74,7 +73,6 @@ "mouseEmulation": { "-provisional-initDelay": 120, "cursorSpeed": 0.850, - "cursorAcceleration": 0.800, "-provisional-mouseEmulation/enabled": true } }, @@ -124,7 +122,6 @@ "gpii-default": { "name": "Default preferences", "preferences": { - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -143,8 +140,7 @@ "gpii-xyz1234": { "name": "Nighttime at home", "preferences": { - "http://registry.gpii.net/common/cursorSpeed": 1, - "http://registry.gpii.net/common/cursorAcceleration": 1 + "http://registry.gpii.net/common/cursorSpeed": 1 }, "metadata": [], "priority": 100 @@ -179,7 +175,6 @@ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true , "http://registry.gpii.net/common/initDelay": 120 , "http://registry.gpii.net/common/cursorSpeed": 0.850 , - "http://registry.gpii.net/common/cursorAcceleration": 0.800 , "http://registry.gpii.net/common/mouseEmulation/enabled": true , "http://registry.gpii.net/common/unknown": true , "http://registry.gpii.net/applications/org.alsa-project": { @@ -227,7 +222,6 @@ "preferences": { "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -244,8 +238,7 @@ "gpii-xyz1234": { "name": "Nighttime at home", "preferences": { - "http://registry.gpii.net/common/cursorSpeed": 1, - "http://registry.gpii.net/common/cursorAcceleration": 1 + "http://registry.gpii.net/common/cursorSpeed": 1 }, "metadata": [], "priority": 100 @@ -318,7 +311,6 @@ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true , "http://registry.gpii.net/common/initDelay": 120 , "http://registry.gpii.net/common/cursorSpeed": 0.850 , - "http://registry.gpii.net/common/cursorAcceleration": 0.800 , "http://registry.gpii.net/common/mouseEmulation/enabled": true , "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/applications/org.alsa-project": { diff --git a/gpii/node_modules/preferencesServer/test/preferencesServerTests.js b/gpii/node_modules/preferencesServer/test/preferencesServerTests.js index 5d3d94958..99bd1083f 100644 --- a/gpii/node_modules/preferencesServer/test/preferencesServerTests.js +++ b/gpii/node_modules/preferencesServer/test/preferencesServerTests.js @@ -83,7 +83,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -121,7 +120,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -159,7 +157,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/applications/org.alsa-project": { "volume": 14, @@ -194,7 +191,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "onscreenKeyboard": true, "mouseEmulation": { "cursorSpeed": 0.85, - "cursorAcceleration": 0.8, "-provisional-initDelay": 120, "-provisional-mouseEmulation/enabled": true } @@ -238,7 +234,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "gpii-default": { "name": "Default preferences", "preferences": { - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -257,8 +252,7 @@ gpii.tests.preferencesServer.get.successFixtures = [ "gpii-xyz1234": { "name": "Nighttime at home", "preferences": { - "http://registry.gpii.net/common/cursorSpeed": 1, - "http://registry.gpii.net/common/cursorAcceleration": 1 + "http://registry.gpii.net/common/cursorSpeed": 1 }, "priority": 100 } @@ -282,7 +276,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "preferences": { "control": { "mouseEmulation": { - "cursorAcceleration": 0.8, "-provisional-mouseEmulation/enabled": true } }, @@ -309,8 +302,7 @@ gpii.tests.preferencesServer.get.successFixtures = [ "preferences": { "control": { "mouseEmulation": { - "cursorSpeed": 1, - "cursorAcceleration": 1 + "cursorSpeed": 1 } } }, @@ -337,7 +329,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/common/fontSize": 24, @@ -370,7 +361,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "preferences": { "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, @@ -394,8 +384,7 @@ gpii.tests.preferencesServer.get.successFixtures = [ "gpii-xyz1234": { "name": "Nighttime at home", "preferences": { - "http://registry.gpii.net/common/cursorSpeed": 1, - "http://registry.gpii.net/common/cursorAcceleration": 1 + "http://registry.gpii.net/common/cursorSpeed": 1 }, "priority": 100 } @@ -424,7 +413,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "onscreenKeyboard": true, "mouseEmulation": { "cursorSpeed": 0.85, - "cursorAcceleration": 0.8, "-provisional-initDelay": 120, "-provisional-mouseEmulation/enabled": true } @@ -459,8 +447,7 @@ gpii.tests.preferencesServer.get.successFixtures = [ "preferences": { "control": { "mouseEmulation": { - "cursorSpeed": 1, - "cursorAcceleration": 1 + "cursorSpeed": 1 } } }, @@ -488,7 +475,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "preferences": { "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.85, - "http://registry.gpii.net/common/cursorAcceleration": 0.8, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/applications/org.alsa-project": { "volume": 14, @@ -510,8 +496,6 @@ gpii.tests.preferencesServer.get.successFixtures = [ "http://registry\\.gpii\\.net/common/slowKeysInterval", "http://registry\\.gpii\\.net/common/slowKeys/enabled", "http://registry\\.gpii\\.net/common/debounce/enabled", - "http://registry\\.gpii\\.net/common/debounceInterval", - "http://registry\\.gpii\\.net/common/cursorAcceleration", "http://registry\\.gpii\\.net/common/mouseEmulation/enabled", "http://registry\\.gpii\\.net/common/onScreenKeyboard/enabled" ], @@ -622,7 +606,6 @@ gpii.tests.preferencesServer.post.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -651,7 +634,6 @@ gpii.tests.preferencesServer.post.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -858,7 +840,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": false, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.85, - "http://registry.gpii.net/common/cursorAcceleration": 0.8, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1002,7 +983,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "preferences": { "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1069,7 +1049,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.85, - "http://registry.gpii.net/common/cursorAcceleration": 0.8, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1155,7 +1134,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1226,7 +1204,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.85, - "http://registry.gpii.net/common/cursorAcceleration": 0.8, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/flatOnly": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1313,7 +1290,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "preferences": { "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1388,7 +1364,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.85, - "http://registry.gpii.net/common/cursorAcceleration": 0.8, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1451,7 +1426,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1478,7 +1452,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1509,7 +1482,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { @@ -1536,7 +1508,6 @@ gpii.tests.preferencesServer.put.successFixtures = [ "http://registry.gpii.net/common/onScreenKeyboard/enabled": true, "http://registry.gpii.net/common/initDelay": 120, "http://registry.gpii.net/common/cursorSpeed": 0.850, - "http://registry.gpii.net/common/cursorAcceleration": 0.800, "http://registry.gpii.net/common/mouseEmulation/enabled": true, "http://registry.gpii.net/common/unknown": true, "http://registry.gpii.net/applications/org.alsa-project": { diff --git a/testData/ontologies/flat.json5 b/testData/ontologies/flat.json5 index 2648c5fe7..33b7e2f01 100644 --- a/testData/ontologies/flat.json5 +++ b/testData/ontologies/flat.json5 @@ -177,13 +177,6 @@ "maximum": 100 } }, - "http://registry.gpii.net/common/cursorAcceleration": { - "schema": { - "title": "Cursor acceleration", - "description": "The acceleration of the mouse cursor", // needs to be defined - "type": "number" - } - }, "http://registry.gpii.net/common/cursorColor": { "schema": { "title": "Cursor Color", @@ -222,13 +215,6 @@ "default": false } }, - "http://registry.gpii.net/common/debounceInterval": { - "schema": { - "title": "Debounce Interval", - "description": "Debounce interval", // needs to be defined - "type": "number" - } - }, "http://registry.gpii.net/common/DPIScale": { "schema": { "title": "DPI Scale", diff --git a/testData/ontologies/mappings/ISO24751-flat.json5 b/testData/ontologies/mappings/ISO24751-flat.json5 index f36213aa8..70169d4d7 100644 --- a/testData/ontologies/mappings/ISO24751-flat.json5 +++ b/testData/ontologies/mappings/ISO24751-flat.json5 @@ -40,14 +40,12 @@ "http://registry\\.gpii\\.net/common/onScreenKeyboard/enabled": "control.onscreenKeyboard", "http://registry\\.gpii\\.net/common/initDelay": "control.mouseEmulation.-provisional-initDelay", "http://registry\\.gpii\\.net/common/cursorSpeed": "control.mouseEmulation.cursorSpeed", - "http://registry\\.gpii\\.net/common/cursorAcceleration": "control.mouseEmulation.cursorAcceleration", "http://registry\\.gpii\\.net/common/mouseEmulation/enabled": "control.mouseEmulation.-provisional-mouseEmulation/enabled", "http://registry\\.gpii\\.net/common/stickyKeys": "control.keyboardEnhancement.stickyKeys", "http://registry\\.gpii\\.net/common/toggleKeys": "control.keyboardEnhancement.toggleKeys", "http://registry\\.gpii\\.net/common/slowKeysInterval": "control.keyboardEnhancement.slowKeys.slowKeysInterval", "http://registry\\.gpii\\.net/common/slowKeys/enabled": "control.keyboardEnhancement.slowKeys.-provisional-slowKeys/enabled", "http://registry\\.gpii\\.net/common/debounce/enabled": "control.keyboardEnhancement.debounceKeys.-provisional-debounce/enabled", - "http://registry\\.gpii\\.net/common/debounceInterval": "control.keyboardEnhancement.debounceKeys.debounceInterval", "http://registry\\.gpii\\.net/common/hapticFeedback": "control.-provisional-hapticFeedback", "http://registry\\.gpii\\.net/common/tableOfContents": "control.structuralNavigation.tableOfContents", "http://registry\\.gpii\\.net/common/adaptationPreference": "content.adaptationPreference",