Skip to content
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.

Sign up for GitHub

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

GPII-4125: Initial implementation of the "live" solutions registry. #860

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

GPII-4125: Initial implementation of the "live" solutions registry. #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e877948
GPII-4125: Initial rough work on breaking apart the solutions registry.
the-t-in-rtf Feb 10, 2020
c394737
Merge remote-tracking branch 'upstream/master' into GPII-4125
the-t-in-rtf Feb 12, 2020
54120a1
GPII-4344: Generated replacement solutions to pick up improved transf…
the-t-in-rtf Feb 12, 2020
7ebb296
GPII-4125: Committed broken config to demonstrate resolver expansion …
the-t-in-rtf Feb 12, 2020
399646b
GPII-4125: Stashed work in progress on de/rehydrators and new tests.
the-t-in-rtf Feb 17, 2020
9d108b5
Merge remote-tracking branch 'upstream/master' into GPII-4125
the-t-in-rtf Mar 19, 2020
d0bbbc9
GPII-4125: Refined scripts to break apart legacy files into individua…
the-t-in-rtf Mar 23, 2020
419d0b5
GPII-4125: Required gpii-universal from "rehydrator" to avoid downstr…
the-t-in-rtf Mar 23, 2020
7873d35
GPII-4125: Tightened up de/rehydration strategy and generated drop-in…
the-t-in-rtf Apr 2, 2020
a549abc
GPII-4125: Fixed linting erors in SR README.
the-t-in-rtf Apr 2, 2020
adc0576
Merge remote-tracking branch 'upstream/master' into GPII-4125
the-t-in-rtf Apr 6, 2020
f67c24b
GPII-4125: Generated LSR entry for color filters.
the-t-in-rtf Apr 9, 2020
531e34f
GPII-4125: Fixed LSR structure of solution contexts in base grades.
the-t-in-rtf Apr 15, 2020
76409a8
GPII-4125: Reverted Windows screen resolution to use an array to (hop…
the-t-in-rtf Apr 16, 2020
c3da444
GPII-4125: Reverted windows resolution as array based on downstream c…
the-t-in-rtf Apr 16, 2020
ddfb2f2
GPII-4125: Fixed stray arrayed resolution in test data.
the-t-in-rtf Apr 16, 2020
5865003
GPII-4461: "Overboard" screen mirror setting.
the-t-in-rtf Apr 21, 2020
07ca80f
GPII-4482: Update JAWS liveness.
the-t-in-rtf May 19, 2020
05ec3fc
GPII-4482: Updated legacy win32.json5 to reflect new liveness of JAWS.
the-t-in-rtf May 19, 2020
fa8abe4
Merge remote-tracking branch 'upstream/master' into GPII-4125
the-t-in-rtf Jun 8, 2020
b6455d2
GPII-4125: Tidied up max/min tests.
the-t-in-rtf Jun 8, 2020
06f8e9a
GPII-4125: Incorporated JAWS and ZoomText content coming from upstream.
the-t-in-rtf Jun 8, 2020
fb8740a
GPII-4125: Pruned leftover web.json5 material from LSR and generated …
the-t-in-rtf Jun 8, 2020
6709eca
GPII-4125: Regenerated SR following upstream changes.
the-t-in-rtf Jun 9, 2020
84816ab
GPII-4504: Added SR entry for Fusion 2020.
the-t-in-rtf Jun 11, 2020
900876d
GPII-4504: Updated JAWS/ZoomText entries to assist in testing Fusion …
the-t-in-rtf Jun 11, 2020
0cee5b7
GPII-4504: Updated additional outdated versioned "2019" paths to assi…
the-t-in-rtf Jun 11, 2020
4e5ef8a
Merge remote-tracking branch 'upstream/master' into GPII-4125
the-t-in-rtf Jun 15, 2020
4098c11
Updated LSR entries following merge with upstream master.
the-t-in-rtf Jun 15, 2020
cc83c6f
GPII-4125: Twiddled JAWS and Fusion settings to investigate /enabled …
the-t-in-rtf Jun 16, 2020
7bb88a9
GPII-4515: Generate 'agnostic' files from legacy SR.
the-t-in-rtf Jul 2, 2020
fc42262
GPII-4515: Actually add material that generates 'agnostic' files from…
the-t-in-rtf Jul 2, 2020
a3da19e
GPII-4515: Break apart SR migration data into individual solutions.
the-t-in-rtf Jul 2, 2020
fda2115
NOJIRA: Reverted recent schema change.
the-t-in-rtf Jul 2, 2020
a1fa0b3
NOJIRA: Created "generic solution" based on flat.json5.
the-t-in-rtf Jul 6, 2020
a4aaa9d
NOJIRA: Renamed JSON5 morphic export to JSON.
the-t-in-rtf Jul 6, 2020
03aa408
NOJIRA: Fixed indenting of ASD files.
the-t-in-rtf Jul 6, 2020
f8cb93b
NOJIRA: Onboarded work in progress from google sheets.
the-t-in-rtf Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload3.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gpii/node_modules/flowManager/configs/gpii.flowManager.config.base.json5
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gpii/node_modules/matchMakerFramework/test/MatchMakerFrameworkTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fluid.defaults("gpii.tests.matchMakerFramework.testCaseHolder", {
}]
});

var fullSolutionsRegistry = fluid.require("%gpii-universal/testData/solutions");
var fullSolutionsRegistry = fluid.require("%solutionsRegistry/src/generated");

gpii.tests.matchMakerFramework.filterSolutionsFixture = [
{
Expand Down
36 changes: 18 additions & 18 deletions gpii/node_modules/matchMakerFramework/test/js/MatchMakerUtilitiesTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,16 +393,16 @@ var fluid = fluid || require("infusion"),
name: "Three solutions, two of same type",
payload: {
solutionCapabilities: {
"fakemag1": [
"net.gpii.test.fakemag1": [
"http://registry\\.gpii\\.net/common/magnification/enabled",
"http://registry\\.gpii\\.net/common/magnification"
],
"fakemag2": [
"net.gpii.test.fakemag2": [
"http://registry\\.gpii\\.net/common/magnification/enabled",
"http://registry\\.gpii\\.net/common/magnification",
"http://registry\\.gpii\\.net/common/invertColours"
],
"fakescreenreader1": [
"net.gpii.test.fakescreenreader1": [
"http://registry\\.gpii\\.net/common/screenReaderTTS/enabled",
"http://registry\\.gpii\\.net/common/pitch",
"http://registry\\.gpii\\.net/common/volumeTTS",
Expand All @@ -411,23 +411,23 @@ var fluid = fluid || require("infusion"),
}
},
expectedSolutionTypes: {
"fakemag1": [
"net.gpii.test.fakemag1": [
"http://registry\\.gpii\\.net/common/magnifierApplication"
],
"fakemag2": [
"net.gpii.test.fakemag2": [
"http://registry\\.gpii\\.net/common/magnifierApplication"
],
"fakescreenreader1": [
"net.gpii.test.fakescreenreader1": [
"http://registry\\.gpii\\.net/common/screenReaderApplication"
]
},
expectedSolutionTypeMapping: {
"http://registry\\.gpii\\.net/common/magnifierApplication": {
"fakemag1": true,
"fakemag2": true
"net.gpii.test.fakemag1": true,
"net.gpii.test.fakemag2": true
},
"http://registry\\.gpii\\.net/common/screenReaderApplication": {
"fakescreenreader1": true
"net.gpii.test.fakescreenreader1": true
}
}
}];
Expand Down Expand Up @@ -947,7 +947,7 @@ var fluid = fluid || require("infusion"),
fluid.registerNamespace("gpii.tests.matchMakerUtilities.getLeastLiveness");

gpii.tests.matchMakerUtilities.getLeastLiveness.solutions = {
"fakemag1": {
"net.gpii.test.fakemag1": {
"capabilities": [
"http://registry\\.gpii\\.net/common/magnification/enabled"
],
Expand All @@ -964,7 +964,7 @@ var fluid = fluid || require("infusion"),
}
}
},
"fakemag2": {
"net.gpii.test.fakemag2": {
"capabilities": [
"http://registry\\.gpii\\.net/common/magnification/enabled"
],
Expand All @@ -982,7 +982,7 @@ var fluid = fluid || require("infusion"),
}
}
},
"fakescreenreader1": {
"net.gpii.test.fakescreenreader1": {
"capabilities": [
"http://registry\\.gpii\\.net/common/screenReaderTTS/enabled"
],
Expand Down Expand Up @@ -1017,27 +1017,27 @@ var fluid = fluid || require("infusion"),
{
name: "Basic with single solution",
term: "http://registry.gpii.net/common/magnification",
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, ["fakemag1"]),
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, ["net.gpii.test.fakemag1"]),
expected: "live"
}, {
name: "Term present in multiple solutions, least lively wins",
term: "http://registry.gpii.net/common/magnification",
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, ["fakemag1", "fakemag2"]),
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, ["net.gpii.test.fakemag1", "net.gpii.test.fakemag2"]),
expected: "liveRestart"
}, {
name: "Term inferred from capability transformations",
term: "http://registry.gpii.net/common/invertColours",
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, [ "fakemag2"]),
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, [ "net.gpii.test.fakemag2"]),
expected: "liveRestart"
}, {
name: "Term in a secondary settingshandler block",
name: "Term in a secondary settings handler block",
term: "http://registry.gpii.net/common/pitch",
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, [ "fakescreenreader1"]),
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, [ "net.gpii.test.fakescreenreader1"]),
expected: "manualRestart"
}, {
name: "No terms provided",
term: undefined,
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, [ "fakescreenreader1"]),
solutions: fluid.filterKeys(gpii.tests.matchMakerUtilities.getLeastLiveness.solutions, [ "net.gpii.test.fakescreenreader1"]),
expected: "OSRestart"
}
];
Expand Down
8 changes: 4 additions & 4 deletions gpii/node_modules/settingsHandlers/test/JawsSettingsHandlerTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ var test = {
payload: {
"com.freedomscientific.jaws": [{
options: {
"defaultSettingsFilePath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2019\\Settings\\enu\\DEFAULT.JCF",
"voiceProfilesDirPath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2019\\Settings\\VoiceProfiles"
"defaultSettingsFilePath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2020\\Settings\\enu\\DEFAULT.JCF",
"voiceProfilesDirPath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2020\\Settings\\VoiceProfiles"
},
settings: {
"ENU-Global.Pitch": 90
Expand All @@ -27,8 +27,8 @@ var test = {
expectedResult: {
"com.freedomscientific.jaws": [{
options: {
"defaultSettingsFilePath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2019\\Settings\\enu\\DEFAULT.JCF",
"voiceProfilesDirPath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2019\\Settings\\VoiceProfiles"
"defaultSettingsFilePath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2020\\Settings\\enu\\DEFAULT.JCF",
"voiceProfilesDirPath": "C:\\Users\\vagrant\\AppData\\Roaming\\Freedom Scientific\\JAWS\\2020\\Settings\\VoiceProfiles"
},
settings: {
"ENU-Global.Pitch": {
Expand Down
25 changes: 24 additions & 1 deletion gpii/node_modules/solutionsRegistry/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions ...gistry/src/generated/agnostic-solutions-database/com.aisquared.zoomtext-translations.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading