GPII-1839 Using the Dynamic Device Reporter when running acceptance tests

gpii/configs/gpii.config.cloudBased.development.all.local.json

@@ -22,6 +22,6 @@
         "%preferencesServer/configs/gpii.preferencesServer.config.development.json",
         "%canopyMatchMaker/configs/gpii.canopyMatchMaker.config.base.json",
         "%rawPreferencesServer/configs/gpii.rawPreferencesServer.config.development.json",
-        "%deviceReporter/configs/gpii.deviceReporter.config.development.json"
+        "%deviceReporter/configs/gpii.deviceReporter.config.production.json"
     ]
 }

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

@@ -1,9 +1,10 @@
 This configuration file is used for acceptance testing.
 
-It uses the basic (default) development setup of the system, but replaces the 
-folder with NP sets used to be (universal)/testData/preferences/acceptanceTests 
-as opposed to the normal preferences folder. 
-Besides that, everything will be based on the normal development mode setup.
+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).

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

@@ -9,5 +9,5 @@
             }
         }
     },
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

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

@@ -1,8 +1,5 @@
 This config file is used for integration and acceptance tests 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 'android_builtIn.json', which will
-report only the standard built in solutions as installed.
+It makes use of dynamic device reporter:  It uses the basic local install setup
+in development mode, but with the device reporter in production mode, merging in
+gpii's "all.development.dr.production" configuration.

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

@@ -9,5 +9,5 @@
             }
         }
     },
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

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

@@ -1,8 +1,5 @@
 This configuration file is used by the for acceptance test: android-talkback-testSpec.js.
 
-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 makes use of dynamic device reporter:  It includes the basic local install
+setup in development mode, but with the device reporter in production mode,
+merging in gpii's "all.development.dr.production" configuration.

tests/platform/linux/configs/gpii.tests.acceptance.linux.builtIn.config.json

@@ -9,5 +9,5 @@
             }
         }
     },  
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

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

@@ -1,8 +1,5 @@
 This config file is used for integration and acceptance tests on Linux as well as the context integration tests
 
-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 'linux_builtIn.json', which will
-report only the standard built in solutions as installed.
+It makes use of dynamic device reporter:  It includes the basic local install
+setup in development mode, but with the device reporter in production mode,
+merging in gpii's "all.development.dr.production" configuration.

tests/platform/linux/configs/gpii.tests.acceptance.linux.chrome.config.json

@@ -9,5 +9,5 @@
             }
         }
     },    
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/linux/configs/gpii.tests.acceptance.linux.chrome.config.txt

@@ -1,8 +1,6 @@
 This configuration file is used for testing the chrome extension in Linux
 
-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 'chrome.json', which will report
-the Cloud4all Chrome extension for Google Chrome as being installed on the system.
+It makes use of dynamic device reporter:  It includes the basic local install
+setup in development mode (modifying the preferences folder used), but with the
+device reporter in production mode, merging in gpii's
+"all.development.dr.production" configuration.

tests/platform/linux/configs/gpii.tests.acceptance.linux.orca.config.json

@@ -9,5 +9,5 @@
             }
         }
     },  
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/linux/configs/gpii.tests.acceptance.linux.orca.config.txt

@@ -1,8 +1,6 @@
-This configuration file is used by the for acceptance test: AcceptanceTests_orca.js.
+This configuration file is used by the acceptance test: AcceptanceTests_orca.js.
 
-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 'orca.json', which will report
-Orca as being installed on the system.
+It makes use of dynamic device reporter:  It includes the basic local install
+setup in development mode (modifying the preferences folder used), but with the
+device reporter in production mode, merging in gpii's
+"all.development.dr.production" configuration.

tests/platform/linux/linux-builtIn-testSpec.js

@@ -58,7 +58,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
                 "expectConfigured": "true",
                 "expectRestored": "false"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["gnome-shell"]
+            }
+        }
     },
     {
         name: "Testing os_common2 using default matchmaker",
@@ -76,7 +81,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
                 }]
             }
         },
-        processes: []
+        processes: [],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["gsettings-desktop-schemas"]
+            }
+        }
     },
     {
         name: "Testing os_gnome using default matchmaker",
@@ -115,7 +125,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
                 "expectConfigured": "true",
                 "expectRestored": "false"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["gnome-shell"]
+            }
+        }
     },
     {
         name: "Testing os_win7 using default matchmaker",
@@ -151,7 +166,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
                 "expectConfigured": "true",
                 "expectRestored": "false"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["gnome-shell"]
+            }
+        }
     }
 ]);
 

tests/platform/linux/linux-orca-testSpec.js

@@ -58,7 +58,12 @@ gpii.tests.linux.orca.testDefs = [
                 "expectConfigured": "true",
                 "expectRestored": "false"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["orca"]
+            }
+        }
     },
     {
         name: "Testing screenreader_orca using Flat matchmaker",
@@ -94,7 +99,12 @@ gpii.tests.linux.orca.testDefs = [
                 "expectConfigured": "true",
                 "expectRestored": "false"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["orca"]
+            }
+        }
     },
     {
         name: "Testing screenreader_nvda using Flat matchmaker",
@@ -129,7 +139,12 @@ gpii.tests.linux.orca.testDefs = [
                 "expectConfigured": "true",
                 "expectRestored": "false"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.packageKit.find": {
+                "expectInstalled": ["orca"]
+            }
+        }
     }
 ];
 

tests/platform/windows/configs/gpii.tests.acceptance.windows.builtIn.config.json

@@ -9,5 +9,5 @@
             }
         }
     },     
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

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

@@ -1,5 +1,7 @@
-This configuration file is used by the for acceptance test: AcceptanceTests_builtIn.js.
+This configuration file is used by the acceptance test: AcceptanceTests_builtIn.js.
 
-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 'win7_builtIn.json', which will report only the standard built in solutions as installed.
+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.

tests/platform/windows/configs/gpii.tests.acceptance.windows.chrome.config.json

@@ -9,5 +9,5 @@
             }
         }
     },     
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/windows/configs/gpii.tests.acceptance.windows.chrome.config.txt

@@ -1,8 +1,7 @@
 This configuration file is used for testing the chrome extension in Windows
 
-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 'chrome.json', which will report
-the Cloud4all Chrome extension for Google Chrome as being installed on the system.
+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.

tests/platform/windows/configs/gpii.tests.acceptance.windows.jaws.config.json

@@ -9,5 +9,5 @@
             }
         }
     },     
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/windows/configs/gpii.tests.acceptance.windows.jaws.config.txt

@@ -0,0 +1,6 @@
+This configuration file is used by the acceptance test: windows-jaws-testSpec.js.
+
+It makes use of dynamic device reporter:  It includes the basic local install
+setup in development mode (modifying the preferences folder used), but with the
+device reporter in production mode, merging in gpii's
+"all.development.dr.production" configuration.

tests/platform/windows/configs/gpii.tests.acceptance.windows.maavis.config.json

@@ -9,5 +9,5 @@
             }
         }
     },       
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/windows/configs/gpii.tests.acceptance.windows.maavis.config.txt

@@ -0,0 +1,6 @@
+This configuration file is used by the acceptance test: windows-maavis-testSpec.js.
+
+It makes use of dynamic device reporter:  It includes the basic local install
+setup in development mode (modifying the preferences folder used), but with the
+device reporter in production mode, merging in gpii's
+"all.development.dr.production" configuration.

tests/platform/windows/configs/gpii.tests.acceptance.windows.nvda.config.json

@@ -9,5 +9,5 @@
             }
         }
     },      
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/windows/configs/gpii.tests.acceptance.windows.nvda.config.txt

@@ -1,5 +1,3 @@
-This configuration file is used by the for acceptance test: AcceptanceTests_nvda.js.
+This configuration file is used by the acceptance test: AcceptanceTests_nvda.js.
 
-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 'nvda.json', which will report nvda as being installed on the system.
+It makes use of dynamic device reporter:  It includes the basic local install setup in development mode (modifying the preferences folder used), but with the device reporter in production mode, merging in gpii's "all.development.dr.production" configuration.

tests/platform/windows/configs/gpii.tests.acceptance.windows.readWrite.config.json

@@ -9,5 +9,5 @@
             }
         }
     },      
-    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.config.json"
+    "mergeConfigs": "%universal/tests/configs/gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json"
 }

tests/platform/windows/configs/gpii.tests.acceptance.windows.readWrite.config.txt

@@ -1,5 +1,4 @@
 This configuration file is used by the acceptance tests for Read&Write Gold
 
-It includes 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).
+It makes use of dynamic device reporter:  It includes the basic local install setup in development mode (modifying the preferences folder used), but with the device reporter in production mode, merging in gpii's "all.development.dr.production" configuration.
 
-This config sets the device reporter file to be 'readWrite.json', which will report Read&Write Gold as being installed on the system.