-
Notifications
You must be signed in to change notification settings - Fork 62
TT-15: Make Kurzweil 3000 work with GPII #397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
xpheal
wants to merge
13
commits into
GPII:master
Choose a base branch
from
xpheal:TT-15
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9b2be26
Zoomtext done
xpheal 6225ba7
revert changes
xpheal 6556838
revert changes
xpheal f9ff664
add newline
xpheal 7739b1a
Merge remote-tracking branch 'remote/master'
xpheal 3d0e5f3
Kurzweil done
xpheal d0302c9
remove extra batch file
xpheal 576fb28
installed Solutions changes
xpheal 71caa1f
Merge remote-tracking branch 'remote/master'
xpheal d21c7b6
solution update
xpheal bbe776d
Merge remote-tracking branch 'remote/master'
xpheal 097e8ed
Merge remote-tracking branch 'origin' into TT-15
xpheal 74748ff
upstream update
xpheal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [ | ||
| { "id": "com.kesi.kurzweil" } | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| [ | ||
| { | ||
| "id": "com.kesi.kurzweil" | ||
| }, | ||
|
|
||
| { | ||
| "id": "org.gnome.desktop.interface" | ||
| }, | ||
|
|
||
18 changes: 18 additions & 0 deletions
18
testData/preferences/acceptanceTests/kurzweil_application.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "flat": { | ||
| "contexts": { | ||
| "gpii-default": { | ||
| "name": "Default preferences", | ||
| "preferences": { | ||
| "http://registry.gpii.net/applications/com.kesi.kurzweil": { | ||
| "View.MyZoomValue": 200, | ||
| "Speech.EnglishReadingSpeed": 100, | ||
| "Speech.EnglishReadingVolume": 100, | ||
| "Fonts.FontSize": 20, | ||
| "Fonts.FontName": "Times New Roman" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "flat": { | ||
| "contexts": { | ||
| "gpii-default": { | ||
| "name": "Default preferences", | ||
| "preferences": { | ||
| "http://registry.gpii.net/common/magnification": 200, | ||
| "http://registry.gpii.net/common/speechRate": 100, | ||
| "http://registry.gpii.net/common/volume": 100, | ||
| "http://registry.gpii.net/common/fontSize": 20, | ||
| "http://registry.gpii.net/common/fontFaceFontName": "Times New Roman" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "flat": { | ||
| "contexts": { | ||
| "gpii-default": { | ||
| "name": "Default preferences", | ||
| "preferences": { | ||
| "http://registry.gpii.net/applications/com.kesi.kurzweil": { | ||
| "View.MyZoomValue": 200, | ||
| "Speech.EnglishReadingSpeed": 100, | ||
| "Speech.EnglishReadingVolume": 100, | ||
| "Fonts.FontSize": 20, | ||
| "Fonts.FontName": "Times New Roman" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "flat": { | ||
| "contexts": { | ||
| "gpii-default": { | ||
| "name": "Default preferences", | ||
| "preferences": { | ||
| "http://registry.gpii.net/common/magnification": 200, | ||
| "http://registry.gpii.net/common/speechRate": 100, | ||
| "http://registry.gpii.net/common/volume": 100, | ||
| "http://registry.gpii.net/common/fontSize": 20, | ||
| "http://registry.gpii.net/common/fontFaceFontName": "Times New Roman" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| { | ||
| "com.kesi.kurzweil": { | ||
| "name": "Kurzweil 3000", | ||
| "contexts": { | ||
| "OS": [ | ||
| { | ||
| "id": "win32" | ||
| } | ||
| ] | ||
| }, | ||
| "settingsHandlers": { | ||
| "configuration": { | ||
| "type": "gpii.settingsHandlers.INISettingsHandler", | ||
| "options": { | ||
| "filename": "${{environment}.APPDATA}\\KESI\\Kurzweil 3000\\gpii\\K3000Settings.k3s" | ||
| }, | ||
| "capabilities": [ | ||
| "applications.com\\.kesi\\.kurzweil.id", | ||
| "display.screenReader.speechRate", | ||
| "display.screenEnhancement.magnification", | ||
| "-provisional-general.-provisional-volume", | ||
| "display.screenEnhancement.fontSize", | ||
| "display.screenEnhancement.fontFaceFontName" | ||
| ], | ||
| "capabilitiesTransformations": { | ||
| "View\\.MyZoomValue": "http://registry\\.gpii\\.net/common/magnification", | ||
| "Speech\\.EnglishReadingSpeed": "http://registry\\.gpii\\.net/common/speechRate", | ||
| "Speech\\.EnglishReadingVolume": "http://registry\\.gpii\\.net/common/volume", | ||
| "Fonts\\.FontSize": "http://registry\\.gpii\\.net/common/fontSize", | ||
| "Fonts\\.FontName": "http://registry\\.gpii\\.net/common/fontFaceFontName" | ||
| } | ||
| } | ||
| }, | ||
| "configure": [ | ||
| "settings.configuration" | ||
| ], | ||
| "restore": [ | ||
| "settings.configuration" | ||
| ], | ||
| "start": [ | ||
| { | ||
| "type": "gpii.launch.exec", | ||
| "command": "\"${{registry}.HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Kurzweil 3000.exe\\}\"" | ||
| } | ||
| ], | ||
| "stop": [ | ||
| { | ||
| "type": "gpii.windows.killProcessByName", | ||
| "filename": "Kurzweil 3000.exe" | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
tests/platform/windows/configs/windows-kurzweil-config.JSON
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "typeName": "acceptanceTests.windows.kurzweil", | ||
| "options": { | ||
| "components": { | ||
| "server": { | ||
| "options": { | ||
| "components": { | ||
| "deviceReporter": { | ||
| "options": { | ||
| "installedSolutionsUrl": "file://%root/../../../testData/deviceReporter/acceptanceTests/kurzweil.json" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "includes": [ | ||
| "${universal}/tests/configs/localInstall.json" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
|
|
||
| GPII Acceptance Testing | ||
|
|
||
| Copyright 2014 Raising the Floor International | ||
|
|
||
| Licensed under the New BSD license. You may not use this file except in | ||
| compliance with this License. | ||
|
|
||
| The research leading to these results has received funding from the European Union's | ||
| Seventh Framework Programme (FP7/2007-2013) under grant agreement no. 289016. | ||
|
|
||
| You may obtain a copy of the License at | ||
| https://github.com/GPII/universal/blob/master/LICENSE.txt | ||
| */ | ||
|
|
||
|
|
||
| "use strict"; | ||
| var fluid = require("universal"), | ||
| gpii = fluid.registerNamespace("gpii"); | ||
|
|
||
| gpii.loadTestingSupport(); | ||
|
|
||
| fluid.registerNamespace("gpii.tests.windows"); | ||
|
|
||
| gpii.tests.windows.kurzweil = [ | ||
| { | ||
| name: "Testing NP set \"kurzweil_application\" using Flat matchmaker", | ||
| userToken: "kurzweil_application", | ||
| settingsHandlers: { | ||
| "gpii.settingsHandlers.INISettingsHandler": { | ||
| "some.app.id": [ | ||
| { | ||
| "settings": { | ||
| "View.MyZoomValue": 200, | ||
| "Speech.EnglishReadingSpeed": 100, | ||
| "Speech.EnglishReadingVolume": 100, | ||
| "Fonts.FontSize": 20, | ||
| "Fonts.FontName": "Times New Roman" | ||
| }, | ||
| "options": { | ||
| "filename": "${{environment}.APPDATA}\\KESI\\Kurzweil 3000\\gpii\\K3000Settings.k3s" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| processes: [ | ||
| { | ||
| "command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq Kurzweil 3000.exe\" | find /I \"Kurzweil 3000.exe\" /C", | ||
| "expectConfigured": "1", | ||
| "expectRestored": "0" | ||
| } | ||
| ] | ||
| }, | ||
|
|
||
| { | ||
| name: "Testing NP set \"kurzweil_common\" using Flat matchmaker", | ||
| userToken: "kurzweil_common", | ||
| settingsHandlers: { | ||
| "gpii.settingsHandlers.INISettingsHandler": { | ||
| "some.app.id": [ | ||
| { | ||
| "settings": { | ||
| "View.MyZoomValue": 200, | ||
| "Speech.EnglishReadingSpeed": 100, | ||
| "Speech.EnglishReadingVolume": 100, | ||
| "Fonts.FontSize": 20, | ||
| "Fonts.FontName": "Times New Roman" | ||
| }, | ||
| "options": { | ||
| "filename": "${{environment}.APPDATA}\\KESI\\Kurzweil 3000\\gpii\\K3000Settings.k3s" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| processes: [ | ||
| { | ||
| "command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq Kurzweil 3000.exe\" | find /I \"Kurzweil 3000.exe\" /C", | ||
| "expectConfigured": "1", | ||
| "expectRestored": "0" | ||
| } | ||
| ] | ||
| } | ||
| ]; | ||
|
|
||
| module.exports = gpii.test.bootstrap({ | ||
| testDefs: "gpii.tests.windows.kurzweil", | ||
| configName: "windows-kurzweil-config", | ||
| configPath: "configs" | ||
| }, ["gpii.test.integration.testCaseHolder.windows"], | ||
| module, require, __dirname); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| windows-kurzweil-testSpec.js | ||
|
|
||
| Descriptions: | ||
| This will run the acceptance tests for Kurzweil 3000 (KESI). It uses 2 NP sets: kurzweil_common.json and kurzweil_application.json | ||
|
|
||
| Prerequisites: | ||
| * Kurzweil 3000 needs to be installed | ||
| * Need to set up username "gpii" for Kurzweil(incomplete) | ||
| * The name "gpii" is required for Kurzweil's settings folder | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does (incomplete) refer to here?
It seems that in order to make this integration more useful, we would need to in addition expose a preference for the Kurzweil username in the user's NP set.
Is there any automated way that we can find to provision the gpii user - can it be done just via the filesystem or is some interaction with the app required?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi,
(incomplete) means that we haven't come to a conclusion on how to handle the issue.
If we can get the user's Kurzweil username from the user, I believe we can locate the user's Kurzweil settings folder and change the settings.