GPII-564: Moved built in acceptance test to its own file, following the new format for acceptance tests, added required config file

Author: kaspermarkus

tests/acceptanceTests/AcceptanceTests.js …ceptanceTests/AcceptanceTests_builtIn.jstests/acceptanceTests/AcceptanceTests.js renamed to tests/acceptanceTests/AcceptanceTests_builtIn.js tests/acceptanceTests/AcceptanceTests.js renamed to tests/acceptanceTests/AcceptanceTests_builtIn.js

@@ -2,7 +2,7 @@
 
 GPII Acceptance Testing
 
-Copyright 2013 Raising the Floor International
+Copyright 2014 Raising the Floor International
 
 Licensed under the New BSD license. You may not use this file except in
 compliance with this License.
@@ -11,30 +11,18 @@ You may obtain a copy of the License at
 https://github.com/gpii/universal/LICENSE.txt
 */
 
-/*global __dirname, require*/
+/*global require,process*/
 
 "use strict";
 var fluid = require("universal"),
     path = require("path"),
-    kettle = fluid.registerNamespace("kettle"),
     gpii = fluid.registerNamespace("gpii");
 
-fluid.require("../gpii/node_modules/registrySettingsHandler", require);
-fluid.require("../gpii/node_modules/registryResolver", require);
-fluid.require("../gpii/node_modules/spiSettingsHandler", require);
-
-fluid.require("universal/tests/AcceptanceTests", require);
-
-var configPath = path.resolve(__dirname, "./acceptanceTests/setup1/configs");
-var gpiiConfig = {
-   nodeEnv: "development-config",
-   configPath: configPath
-};
+fluid.require("./AcceptanceTests_include", require);
 
 var testDefs = [
     {
         name: "Testing os_win7 using Flat matchmaker",
-        config: gpiiConfig,
         token: "os_win7",
         settingsHandlers: {
             "gpii.windows.spiSettingsHandler": {
@@ -179,7 +167,6 @@ var testDefs = [
         ]
     }, {
         name: "Testing os_common using Flat matchmaker",
-        config: gpiiConfig,
         token: "os_common",
         settingsHandlers: {
             "gpii.windows.spiSettingsHandler": {
@@ -324,7 +311,6 @@ var testDefs = [
         ]
     }, {
         name: "Testing os_gnome using Flat matchmaker",
-        config: gpiiConfig,
         token: "os_gnome",
         settingsHandlers: {
             "gpii.windows.registrySettingsHandler": {
@@ -415,5 +401,4 @@ var testDefs = [
     }
 ];
 
-testDefs = gpii.acceptanceTesting.buildTests(testDefs);
-module.exports = kettle.tests.bootstrap(testDefs);
+gpii.acceptanceTesting.windows.runTests("builtIn_config", testDefs);

…/acceptanceTests/AcceptanceTests_incl.js …ceptanceTests/AcceptanceTests_include.jstests/acceptanceTests/AcceptanceTests_incl.js renamed to tests/acceptanceTests/AcceptanceTests_include.js tests/acceptanceTests/AcceptanceTests_incl.js renamed to tests/acceptanceTests/AcceptanceTests_include.js

@@ -18,7 +18,7 @@ var fluid = require("universal"),
     path = require("path"),
     gpii = fluid.registerNamespace("gpii");
 
-fluid.require("./AcceptanceTests_incl", require);
+fluid.require("./AcceptanceTests_include", require);
 
 var testDefs = [
     {

tests/acceptanceTests/AcceptanceTests_nvda.js

@@ -0,0 +1,21 @@
+{
+    "typeName": "acceptanceTests.builtIn",
+    "options": {
+        "components": {
+            "server": {
+                "options": {
+                    "components": {
+                        "deviceReporter": {
+                            "options": {
+                                "installedSolutionsUrl": "file://%root/../../../testData/deviceReporter/acceptanceTests/builtIn.json"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "includes": [
+        "../../../../node_modules/universal/tests/acceptanceTests/localInstall.json"
+    ]
+}