Skip to content

Commit 6e3b87a

Browse files
amb26amb26
committed
Merge branch 'GPII-564'
* GPII-564: GPII-564: Added descriptive text files to configurations and the acceptance tests GPII-564: Fixed reference to universal config file GPII-564: Moved built in acceptance test to its own file, following the new format for acceptance tests, added required config file GPII-564: Removed local install config to universal, deleted unnused config files GPII-564: Separated NVDA acceptance tests out to living in it's own file. Set up configs to read from the correct folders/files when reading prefs and device reporter data
2 parents 3423b80 + 9ff5443 commit 6e3b87a

File tree

10 files changed

+258
-143
lines changed

10 files changed

+258
-143
lines changed

tests/AcceptanceTests.js renamed to tests/acceptanceTests/AcceptanceTests_builtIn.js

Lines changed: 4 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
GPII Acceptance Testing
44
5-
Copyright 2013 Raising the Floor International
5+
Copyright 2014 Raising the Floor International
66
77
Licensed under the New BSD license. You may not use this file except in
88
compliance with this License.
@@ -11,30 +11,18 @@ You may obtain a copy of the License at
1111
https://github.com/gpii/universal/LICENSE.txt
1212
*/
1313

14-
/*global __dirname, require*/
14+
/*global require,process*/
1515

1616
"use strict";
1717
var fluid = require("universal"),
1818
path = require("path"),
19-
kettle = fluid.registerNamespace("kettle"),
2019
gpii = fluid.registerNamespace("gpii");
2120

22-
fluid.require("../gpii/node_modules/registrySettingsHandler", require);
23-
fluid.require("../gpii/node_modules/registryResolver", require);
24-
fluid.require("../gpii/node_modules/spiSettingsHandler", require);
25-
26-
fluid.require("universal/tests/AcceptanceTests", require);
27-
28-
var configPath = path.resolve(__dirname, "./acceptanceTests/setup1/configs");
29-
var gpiiConfig = {
30-
nodeEnv: "development-config",
31-
configPath: configPath
32-
};
21+
fluid.require("./AcceptanceTests_include", require);
3322

3423
var testDefs = [
3524
{
3625
name: "Testing os_win7 using Flat matchmaker",
37-
config: gpiiConfig,
3826
token: "os_win7",
3927
settingsHandlers: {
4028
"gpii.windows.spiSettingsHandler": {
@@ -179,7 +167,6 @@ var testDefs = [
179167
]
180168
}, {
181169
name: "Testing os_common using Flat matchmaker",
182-
config: gpiiConfig,
183170
token: "os_common",
184171
settingsHandlers: {
185172
"gpii.windows.spiSettingsHandler": {
@@ -324,7 +311,6 @@ var testDefs = [
324311
]
325312
}, {
326313
name: "Testing os_gnome using Flat matchmaker",
327-
config: gpiiConfig,
328314
token: "os_gnome",
329315
settingsHandlers: {
330316
"gpii.windows.registrySettingsHandler": {
@@ -412,127 +398,7 @@ var testDefs = [
412398
"expectRestored": "0"
413399
}
414400
]
415-
}, {
416-
name: "Testing screenreader_nvda using Flat matchmaker",
417-
config: gpiiConfig,
418-
token: "screenreader_nvda",
419-
settingsHandlers: {
420-
"gpii.settingsHandlers.INISettingsHandler": {
421-
"data": [
422-
{
423-
"settings": {
424-
"speech.espeak.rate": "17.20430107526882",
425-
"speech.espeak.volume": "80",
426-
"speech.espeak.pitch": "60",
427-
"speech.espeak.rateBoost": true,
428-
"virtualBuffers.autoSayAllOnPageLoad": false,
429-
"speech.synth": "espeak",
430-
"speech.outputDevice": "Microsoft Sound Mapper",
431-
"speech.symbolLevel": "300",
432-
"speech.espeak.voice": "en\\en-wi",
433-
"reviewCursor.followFocus": false,
434-
"reviewCursor.followCaret": true,
435-
"reviewCursor.followMouse": true,
436-
"keyboard.speakTypedWords": true,
437-
"keyboard.speakTypedCharacters": false,
438-
"presentation.reportHelpBalloons": false,
439-
"speech.espeak.sayCapForCapitals": true
440-
},
441-
"options": {
442-
// This needs to be addressed with GPII-497.
443-
"path": path.resolve(process.env.APPDATA, "nvda/nvda.ini"),
444-
"allowNumberSignComments": true,
445-
"allowSubSections": true
446-
}
447-
}
448-
]
449-
}
450-
},
451-
processes: [
452-
{
453-
"command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq nvda.exe\" | find /I \"nvda.exe\" /C",
454-
"expectConfigured": "1",
455-
"expectRestored": "0"
456-
}
457-
]
458-
}, {
459-
name: "Testing screenreader_common using Flat matchmaker",
460-
config: gpiiConfig,
461-
token: "screenreader_common",
462-
settingsHandlers: {
463-
"gpii.settingsHandlers.INISettingsHandler": {
464-
"data": [
465-
{
466-
"settings": {
467-
"speech.espeak.rate": "17.20430107526882",
468-
"speech.espeak.volume": "75",
469-
"speech.espeak.pitch": "15",
470-
"speech.espeak.rateBoost": true,
471-
"virtualBuffers.autoSayAllOnPageLoad": false,
472-
"speech.symbolLevel": "300",
473-
"speech.espeak.voice": "en\\en-wi",
474-
"reviewCursor.followFocus": false,
475-
"reviewCursor.followCaret": true,
476-
"reviewCursor.followMouse": true,
477-
"keyboard.speakTypedWords": true,
478-
"keyboard.speakTypedCharacters": false,
479-
"presentation.reportHelpBalloons": false,
480-
"speech.espeak.sayCapForCapitals": true
481-
},
482-
"options": {
483-
// This needs to be addressed with GPII-497.
484-
"path": path.resolve(process.env.APPDATA, "nvda/nvda.ini"),
485-
"allowNumberSignComments": true,
486-
"allowSubSections": true
487-
}
488-
}
489-
]
490-
}
491-
},
492-
processes: [
493-
{
494-
"command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq nvda.exe\" | find /I \"nvda.exe\" /C",
495-
"expectConfigured": "1",
496-
"expectRestored": "0"
497-
}
498-
]
499-
}, {
500-
name: "Testing screenreader_orca using Flat matchmaker",
501-
config: gpiiConfig,
502-
token: "screenreader_orca",
503-
settingsHandlers: {
504-
"gpii.settingsHandlers.INISettingsHandler": {
505-
"data": [
506-
{
507-
"settings": {
508-
"speech.symbolLevel": "300",
509-
"speech.espeak.rate": "17.20430107526882",
510-
"speech.espeak.voice": "en\\en-wi",
511-
"keyboard.speakTypedWords": true,
512-
"speech.espeak.rateBoost": true,
513-
"keyboard.speakTypedCharacters": false,
514-
"presentation.reportHelpBalloons": false,
515-
"virtualBuffers.autoSayAllOnPageLoad": false
516-
},
517-
"options": {
518-
// This needs to be addressed with GPII-497.
519-
"path": path.resolve(process.env.APPDATA, "nvda/nvda.ini"),
520-
"allowNumberSignComments": true,
521-
"allowSubSections": true
522-
}
523-
}
524-
]
525-
}
526-
},
527-
processes: [
528-
{
529-
"command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq nvda.exe\" | find /I \"nvda.exe\" /C",
530-
"expectConfigured": "1",
531-
"expectRestored": "0"
532-
}
533-
]
534401
}
535402
];
536403

537-
testDefs = gpii.acceptanceTesting.buildTests(testDefs);
538-
module.exports = kettle.tests.bootstrap(testDefs);
404+
gpii.acceptanceTesting.windows.runTests("builtIn_config", testDefs);

‎tests/acceptanceTests/AcceptanceTests_builtIn.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
AcceptanceTests_builtIn.js
2+
3+
Description:
4+
This tests the built in functionality of windows, incl. magnifier, onscreen keyboard, mouse trails, etc. It tests the system using three NP sets; (1) os_common: common terms compatible with windows built in settings, (2) os_win7: application specific windows settings (3) os_gnome: application specific gnome settings
5+
6+
Requirements:
7+
* Basic Windows 7 install
8+
9+
There are NO REQUIREMENTS to be able to run this acceptance tests, except being on a windows 7 machine. It should just run on a fresh install.

‎tests/acceptanceTests/AcceptanceTests_include.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
3+
GPII Acceptance Testing
4+
5+
Copyright 2013 Raising the Floor International
6+
7+
Licensed under the New BSD license. You may not use this file except in
8+
compliance with this License.
9+
10+
You may obtain a copy of the License at
11+
https://github.com/gpii/universal/LICENSE.txt
12+
*/
13+
14+
/*global __dirname, require*/
15+
16+
"use strict";
17+
var fluid = require("universal"),
18+
path = require("path"),
19+
kettle = fluid.registerNamespace("kettle"),
20+
gpii = fluid.registerNamespace("gpii");
21+
22+
fluid.registerNamespace("gpii.acceptanceTesting.windows");
23+
24+
fluid.require("../../gpii/node_modules/registrySettingsHandler", require);
25+
fluid.require("../../gpii/node_modules/registryResolver", require);
26+
fluid.require("../../gpii/node_modules/spiSettingsHandler", require);
27+
28+
fluid.require("universal/tests/AcceptanceTests", require);
29+
30+
31+
gpii.acceptanceTesting.windows.runTests = function (configFile, testDefs) {
32+
var gpiiConfig = {
33+
nodeEnv: configFile,
34+
configPath: path.resolve(__dirname, "./configs")
35+
};
36+
fluid.each(testDefs, function (testDef) {
37+
testDef.config = gpiiConfig;
38+
});
39+
testDefs = gpii.acceptanceTesting.buildTests(testDefs);
40+
module.exports = kettle.tests.bootstrap(testDefs);
41+
}

‎tests/acceptanceTests/AcceptanceTests_nvda.js‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
/*
2+
3+
GPII Acceptance Testing
4+
5+
Copyright 2014 Raising the Floor International
6+
7+
Licensed under the New BSD license. You may not use this file except in
8+
compliance with this License.
9+
10+
You may obtain a copy of the License at
11+
https://github.com/gpii/universal/LICENSE.txt
12+
*/
13+
14+
/*global require,process*/
15+
16+
"use strict";
17+
var fluid = require("universal"),
18+
path = require("path"),
19+
gpii = fluid.registerNamespace("gpii");
20+
21+
fluid.require("./AcceptanceTests_include", require);
22+
23+
var testDefs = [
24+
{
25+
name: "Testing screenreader_nvda using Flat matchmaker",
26+
token: "screenreader_nvda",
27+
settingsHandlers: {
28+
"gpii.settingsHandlers.INISettingsHandler": {
29+
"data": [
30+
{
31+
"settings": {
32+
"speech.espeak.rate": "17.20430107526882",
33+
"speech.espeak.volume": "80",
34+
"speech.espeak.pitch": "60",
35+
"speech.espeak.rateBoost": true,
36+
"virtualBuffers.autoSayAllOnPageLoad": false,
37+
"speech.synth": "espeak",
38+
"speech.outputDevice": "Microsoft Sound Mapper",
39+
"speech.symbolLevel": "300",
40+
"speech.espeak.voice": "en\\en-wi",
41+
"reviewCursor.followFocus": false,
42+
"reviewCursor.followCaret": true,
43+
"reviewCursor.followMouse": true,
44+
"keyboard.speakTypedWords": true,
45+
"keyboard.speakTypedCharacters": false,
46+
"presentation.reportHelpBalloons": false,
47+
"speech.espeak.sayCapForCapitals": true
48+
},
49+
"options": {
50+
// This needs to be addressed with GPII-497.
51+
"path": path.resolve(process.env.APPDATA, "nvda/nvda.ini"),
52+
"allowNumberSignComments": true,
53+
"allowSubSections": true
54+
}
55+
}
56+
]
57+
}
58+
},
59+
processes: [
60+
{
61+
"command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq nvda.exe\" | find /I \"nvda.exe\" /C",
62+
"expectConfigured": "1",
63+
"expectRestored": "0"
64+
}
65+
]
66+
}, {
67+
name: "Testing screenreader_common using Flat matchmaker",
68+
token: "screenreader_common",
69+
settingsHandlers: {
70+
"gpii.settingsHandlers.INISettingsHandler": {
71+
"data": [
72+
{
73+
"settings": {
74+
"speech.espeak.rate": "17.20430107526882",
75+
"speech.espeak.volume": "75",
76+
"speech.espeak.pitch": "15",
77+
"speech.espeak.rateBoost": true,
78+
"virtualBuffers.autoSayAllOnPageLoad": false,
79+
"speech.symbolLevel": "300",
80+
"speech.espeak.voice": "en\\en-wi",
81+
"reviewCursor.followFocus": false,
82+
"reviewCursor.followCaret": true,
83+
"reviewCursor.followMouse": true,
84+
"keyboard.speakTypedWords": true,
85+
"keyboard.speakTypedCharacters": false,
86+
"presentation.reportHelpBalloons": false,
87+
"speech.espeak.sayCapForCapitals": true
88+
},
89+
"options": {
90+
// This needs to be addressed with GPII-497.
91+
"path": path.resolve(process.env.APPDATA, "nvda/nvda.ini"),
92+
"allowNumberSignComments": true,
93+
"allowSubSections": true
94+
}
95+
}
96+
]
97+
}
98+
},
99+
processes: [
100+
{
101+
"command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq nvda.exe\" | find /I \"nvda.exe\" /C",
102+
"expectConfigured": "1",
103+
"expectRestored": "0"
104+
}
105+
]
106+
}, {
107+
name: "Testing screenreader_orca using Flat matchmaker",
108+
token: "screenreader_orca",
109+
settingsHandlers: {
110+
"gpii.settingsHandlers.INISettingsHandler": {
111+
"data": [
112+
{
113+
"settings": {
114+
"speech.symbolLevel": "300",
115+
"speech.espeak.rate": "17.20430107526882",
116+
"speech.espeak.voice": "en\\en-wi",
117+
"keyboard.speakTypedWords": true,
118+
"speech.espeak.rateBoost": true,
119+
"keyboard.speakTypedCharacters": false,
120+
"presentation.reportHelpBalloons": false,
121+
"virtualBuffers.autoSayAllOnPageLoad": false
122+
},
123+
"options": {
124+
// This needs to be addressed with GPII-497.
125+
"path": path.resolve(process.env.APPDATA, "nvda/nvda.ini"),
126+
"allowNumberSignComments": true,
127+
"allowSubSections": true
128+
}
129+
}
130+
]
131+
}
132+
},
133+
processes: [
134+
{
135+
"command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq nvda.exe\" | find /I \"nvda.exe\" /C",
136+
"expectConfigured": "1",
137+
"expectRestored": "0"
138+
}
139+
]
140+
}
141+
];
142+
143+
gpii.acceptanceTesting.windows.runTests("nvda_config", testDefs);

‎tests/acceptanceTests/AcceptanceTests_nvda.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
AcceptanceTests_nvda.js
2+
3+
Descriptions:
4+
This will run the acceptance tests for the free and open source screen reader NVDA. It uses 3 NP sets: screenreader_orca, screenreader_nvda and screenreader_common.
5+
6+
Requirements:
7+
* NVDA installed
8+
9+
To run these tests, you need to have NVDA INSTALLED. NVDA is free and can be downloaded from: http://www.nvaccess.org/download/

0 commit comments

Comments
 (0)