GPII-1839: Acceptance/Integration tests must use the dynamic device reporter

testData/preferences/acceptanceTests/maavis_highcontrast.json

@@ -6,7 +6,16 @@
                 "preferences": {
                     "http://registry.gpii.net/common/highContrastEnabled": true,
                     "http://registry.gpii.net/common/highContrastTheme": "yellow-black"
-                }
+                },
+                "metadata": [
+                    {
+                        "type": "priority",
+                        "scope": [
+                            "http://registry.gpii.net/applications/net.opendirective.maavis"
+                        ],
+                        "value": 1024
+                    }
+                ]
             }
         }
     }

testData/preferences/acceptanceTests/maavis_selfvoicing.json

@@ -5,7 +5,16 @@
                 "name": "Default preferences",
                 "preferences": {
                    "http://registry.gpii.net/common/selfVoicingEnabled": true
-               }
+               },
+               "metadata": [
+                   {
+                       "type": "priority",
+                       "scope": [
+                           "http://registry.gpii.net/applications/net.opendirective.maavis"
+                       ],
+                       "value": 1024
+                   }
+               ]
            }
        }
    }

testData/preferences/acceptanceTests/os_common.json

@@ -17,9 +17,24 @@
                     "http://registry.gpii.net/common/cursorSpeed": 1,
                     "http://registry.gpii.net/common/stickyKeys": true,
                     "http://registry.gpii.net/common/debounceEnabled": true,
-                    "http://registry.gpii.net/common/debounceInterval": 1
-                }
+                    "http://registry.gpii.net/common/debounceInterval": 1,
+                    "http://registry.gpii.net/applications/com.microsoft.windows.highContrast": {
+                        "HighContrastOn": {
+                            "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON",
+                            "value": true
+                        }
+                    }
+                },
+                "metadata": [
+                    {
+                        "type": "priority",
+                        "scope": [
+                            "http://registry.gpii.net/applications/com.microsoft.windows.highContrast"
+                        ],
+                        "value": 1024
+                    }
+                ]
             }
         }
     }
-}
+}

tests/ContextIntegrationTests.js

@@ -27,7 +27,7 @@ gpii.tests.contextIntegration.baseTestDef = {
         "gpii.test.common.lifecycleManagerReceiver"
     ],
     config: {
-        configName: "gpii.tests.acceptance.linux.builtIn.config",
+        configName: "gpii.tests.acceptance.linux.config",
         configPath: "%universal/tests/platform/linux/configs"
     }
 };

tests/IntegrationTests.js

@@ -29,6 +29,6 @@ fluid.require("%universal");
 
 gpii.loadTestingSupport();
 
-gpii.test.runSuitesWithFiltering(require("./platform/index-windows.js"), __dirname, ["gpii.test.integration.testCaseHolder.windows"]);
-gpii.test.runSuitesWithFiltering(require("./platform/index-linux.js"), __dirname, ["gpii.test.integration.testCaseHolder.linux"]);
+gpii.test.runSuitesWithFiltering(require("./platform/index-windows.js"), __dirname, ["gpii.test.integration.testCaseHolder.windows", "gpii.test.integration.deviceReporterAware.windows"]);
+gpii.test.runSuitesWithFiltering(require("./platform/index-linux.js"), __dirname, ["gpii.test.integration.testCaseHolder.linux", "gpii.test.integration.deviceReporterAware.linux"]);
 gpii.test.runSuitesWithFiltering(require("./platform/index-android.js"), __dirname, ["gpii.test.integration.testCaseHolder.android"]);

tests/configs/gpii.tests.acceptance.localInstall.config.txt

@@ -1,4 +1,4 @@
-This configuration file is used for acceptance testing.
+This configuration file is used for integration and acceptance testing on Android.
 
 It uses the basic (default) development setup of the system, but replaces the 
 folder with NP sets used to be (universal)/testData/preferences/acceptanceTests 
@@ -7,6 +7,3 @@ Besides that, everything will be based on the normal development mode setup.
 
 The name "localInstall" refers to a setup where GPII is running as installed 
 locally on the machine (as opposed to eg. running the system as a cloudBased flowmanager).
-
-This file is used as a "base config" by architecture-specific tests in the windows 
-and linux repositories, as well as locally as the base for universal integration tests.

tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.txt

@@ -0,0 +1,13 @@
+This configuration file is used for acceptance testing.
+
+It uses the basic (default) development setup of the system, with a couple of
+modifications.  It replaces the folder with NP sets in (universal)/testData/preferences/acceptanceTests
+as opposed to the normal preferences folder.  It also uses the dynamic device
+reporter (the device reporter in production mode).  Otherwise, everything else
+is based on the normal development mode setup.
+
+The name "localInstall" refers to a setup where GPII is running as installed 
+locally on the machine (as opposed to eg. running the system as a cloudBased flowmanager).
+
+This file is used as a "base config" by architecture-specific tests in the windows 
+and linux repositories, as well as locally as the base for universal integration tests.

tests/platform/android/android-builtIn-testSpec.txt

@@ -1,4 +1,4 @@
-AcceptanceTests_builtIn.js
+android-builtIn-testSpec.js
 
 Description:
 

tests/platform/android/android-talkback-testSpec.txt

@@ -1,4 +1,4 @@
-AcceptanceTests_talkback.js
+android-talkback-testSpec.js
 
 Description:
 

tests/platform/android/configs/gpii.tests.acceptance.android.builtIn.config.txt

@@ -1,8 +1,3 @@
-This config file is used for integration and acceptance tests on Android.
+This config file is used for integration and acceptance tests on built-in Android solutions.
 
-It includes to the basic localInstall setup for acceptance tests (modifying the
-preferences folder used), which in turn includes the standard development
-config file (running GPII locally, using development setup).
-
-This config sets the device reporter file to be 'android_builtIn.json', which will
-report only the standard built in solutions as installed.
+It uses the basic local install setup in development mode.

tests/platform/android/configs/gpii.tests.acceptance.android.talkback.config.txt

@@ -1,8 +1,3 @@
-This configuration file is used by the for acceptance test: android-talkback-testSpec.js.
+This config file is used for integration and acceptance tests of Talkback on Android.
 
-It includes to the basic localInstall setup for acceptance tests (modifying the
-preferences folder used), which in turn includes the standard development
-config file (running GPII locally, using development setup).
-
-This config sets the device reporter file to be 'talkback.json', which will report
-Talkback as being installed on the system.
+It uses the basic local install setup in development mode.

tests/platform/index-linux.js

@@ -24,6 +24,5 @@ module.exports = [
     "linux/linux-builtIn-testSpec.js",
     "linux/linux-orca-testSpec.js",
     "linux/linux-uioPlus-testSpec.js",
-    "linux/linux-dynamicDeviceReporter-testSpec.js",
     "linux/linux-xrandr-testSpec.js"
 ];

tests/platform/index-windows.js

@@ -27,6 +27,5 @@ module.exports = [
     "windows/windows-nvda-testSpec.js",
     "windows/windows-maavis-testSpec.js",
     "windows/windows-uioPlus-testSpec.js",
-    "windows/windows-readWrite-testSpec.js",
-    "windows/windows-dynamicDeviceReporter-testSpec.js"
+    "windows/windows-readWrite-testSpec.js"
 ];

tests/platform/linux/configs/gpii.tests.acceptance.linux.dynamicDeviceReporter.config.json → tests/platform/linux/configs/gpii.tests.acceptance.linux.config.json

@@ -1,4 +1,4 @@
 {
-    "type": "gpii.tests.acceptance.linux.dynamicDeviceReporter.config",
+    "type": "gpii.tests.acceptance.linux.config",
     "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/linux/configs/gpii.tests.acceptance.linux.dynamicDeviceReporter.config.txt → tests/platform/linux/configs/gpii.tests.acceptance.linux.config.txt

@@ -1,4 +1,4 @@
-This configuration file is used by the acceptance test: linux-dynamicDeviceReporter-config.js.
+This configuration file is used by the acceptance tests.
 
 This config makes use of dynamic device reporting, so it uses localInstall.dynamicDeviceReporter
 as its base config, which uses the all.development.dr.production gpii's config.