From 868ebe3d7f5fb5fc6e93bbe335b268b6a17d2485 Mon Sep 17 00:00:00 2001
From: Tony Atkins <tony@raisingthefloor.org>
Date: Thu, 12 Oct 2017 13:50:42 +0200
Subject: [PATCH] GPII-2515: Converted gsettings tests to use jqUnit.

---
 .../nodegsettings/nodegsettings_tests.js      | 71 +++++++++----------
 package.json                                  |  1 +
 tests/UnitTests.js                            |  1 +
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/gpii/node_modules/gsettingsBridge/nodegsettings/nodegsettings_tests.js b/gpii/node_modules/gsettingsBridge/nodegsettings/nodegsettings_tests.js
index fbc3457..7603294 100644
--- a/gpii/node_modules/gsettingsBridge/nodegsettings/nodegsettings_tests.js
+++ b/gpii/node_modules/gsettingsBridge/nodegsettings/nodegsettings_tests.js
@@ -16,28 +16,30 @@
 
 "use strict";
 
-var assert = require("assert");
+var jqUnit = require("node-jqunit");
 var gsettings = require("./build/Release/nodegsettings.node");
 
 /* Common variables for all tests */
 var keyScreenmag = "org.gnome.desktop.a11y.magnifier";
 
-/* Test getting and setting boolean values */
 
-var testBooleanValues = function () {
+jqUnit.module("Node gsettings tests...");
+
+jqUnit.test("Test getting and setting boolean values...", function () {
     var original = gsettings.get_gsetting(keyScreenmag, "show-cross-hairs");
-    assert.deepEqual(typeof(original), "boolean", "We got a boolean as expected");
+    jqUnit.assertDeepEq("We got a boolean as expected", "boolean", typeof(original));
+    // assert.deepEqual(typeof(original), "boolean", "We got a boolean as expected");
 
     var ret = gsettings.set_gsetting(keyScreenmag, "show-cross-hairs", true);
-    assert.ok(ret);
+    jqUnit.ok("Setting the value should succeed...", ret);
 
     var actual = gsettings.get_gsetting(keyScreenmag, "show-cross-hairs");
-    assert.deepStrictEqual(actual, true, "We can set boolean values");
+    jqUnit.assertEquals("We can set boolean values...", true, actual);
 
     ret = gsettings.set_gsetting(keyScreenmag, "show-cross-hairs", original);
-    assert.ok(ret);
+    jqUnit.ok("We can set the value back to its previous value...", ret);
 
-    // Todo need to set up an event for these assertions, they run too fast,
+    // TODO: We need to set up an event for these assertions, they run too fast,
     // and get the old value from gsettings before it's propagated.
     // exec('gsettings get '+keyScreenmag+' show-cross-hairs', function(res, out, err) {
     //     testBooleanValuesCallback1 = true;
@@ -48,57 +50,50 @@ var testBooleanValues = function () {
     //     testBooleanValuesCallback2 = true;
     //     assert.equal('false\n', out);
     // });
+});
 
-};
-
-var testDecimalValues = function () {
+jqUnit.test("Test getting and setting decimal values...", function () {
     var original = gsettings.get_gsetting(keyScreenmag, "mag-factor");
     var ret = gsettings.set_gsetting(keyScreenmag, "mag-factor", 3.0);
-    assert.ok(ret);
+    jqUnit.ok("Setting the value should succeed...", ret);
 
     var actual = gsettings.get_gsetting(keyScreenmag, "mag-factor");
-    assert.deepStrictEqual(actual, 3.0, "We can set decimal values");
+    jqUnit.assertEquals("We can set decimal values", 3.0, actual);
 
     var ret2 = gsettings.set_gsetting(keyScreenmag, "mag-factor", 5.3);
-    assert.ok(ret2);
+    jqUnit.ok("Resetting the value should succeed...", ret2);
     actual = gsettings.get_gsetting(keyScreenmag, "mag-factor");
-    assert.deepStrictEqual(actual, 5.3, "We can set decimal values");
+    jqUnit.assertEquals("We can reset decimal values", 5.3, actual);
 
     var ret3 = gsettings.set_gsetting(keyScreenmag, "mag-factor", original);
-    assert.ok(ret3);
-};
+    jqUnit.ok("Setting the value should succeed...", ret3);
+});
 
-var testStringValues = function () {
+jqUnit.test("Test getting and setting string values...", function () {
     var original = gsettings.get_gsetting(keyScreenmag, "screen-position");
     var ret = gsettings.set_gsetting(keyScreenmag, "screen-position", "left-half");
-    assert.ok(ret);
+    jqUnit.ok("Setting the value should succeed...", ret);
     var actual = gsettings.get_gsetting(keyScreenmag, "screen-position");
-    assert.deepStrictEqual(actual, "left-half", "We can set string values");
+    jqUnit.assertEquals("We can set string values", "left-half", actual);
     var ret2 = gsettings.set_gsetting(keyScreenmag, "screen-position", original);
-    assert.ok(ret2);
-};
+    jqUnit.ok("Setting the value should succeed...", ret2);
+});
 
-var testIntegerValues = function () {
+jqUnit.test("Test getting and setting integer values...", function () {
     var original = gsettings.get_gsetting(keyScreenmag, "cross-hairs-thickness");
     var ret = gsettings.set_gsetting(keyScreenmag, "cross-hairs-thickness", 7);
-    assert.ok(ret);
+    jqUnit.ok("Setting the value should succeed...", ret);
     var actual = gsettings.get_gsetting(keyScreenmag, "cross-hairs-thickness");
-    assert.deepStrictEqual(actual, 7, "We can set integer values");
+    jqUnit.assertEquals("We can set integer values", 7, actual);
     var ret2 = gsettings.set_gsetting(keyScreenmag, "cross-hairs-thickness", original);
-    assert.ok(ret2);
-};
+    jqUnit.ok("Setting the value should succeed...", ret2);
+});
 
-var testListKeys = function () {
+jqUnit.test("Test listing keys...", function () {
     var keys = gsettings.get_gsetting_keys(keyScreenmag);
-    assert.ok(Array.isArray(keys));
+    jqUnit.ok("Requesting a list of keys should return the correct type of variable...", Array.isArray(keys));
+
     for (var i = 0; i < keys.length; i++) {
-        assert.ok("string", typeof(keys[i]));
+        jqUnit.assertEquals("Each value in the list should be a string...", "string", typeof (keys[i]));
     }
-};
-
-/* Run test functions */
-testBooleanValues();
-testDecimalValues();
-testStringValues();
-testIntegerValues();
-testListKeys();
+});
diff --git a/package.json b/package.json
index dee5015..5459d8a 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "grunt-shell": "1.3.0",
     "istanbul": "git://github.com/the-t-in-rtf/istanbul#828eb930add7bd663ca20649a917f3f3829e48c5",
     "nan": "2.4.0",
+    "node-jqunit": "1.1.7",
     "rimraf": "2.6.1"
   },
   "license": "BSD-3-Clause",
diff --git a/tests/UnitTests.js b/tests/UnitTests.js
index aa5812f..975da06 100644
--- a/tests/UnitTests.js
+++ b/tests/UnitTests.js
@@ -1,6 +1,7 @@
 // Rollup to run all javascript-only unit tests.
 "use strict";
 require("../gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js");
+require("../gpii/node_modules/gsettingsBridge/tests/gsettingsTests");
 require("../gpii/node_modules/orca/test/orcaSettingsHandlerTests.js");
 require("../gpii/node_modules/packagekit/test/all-tests.js");
 require("../gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test");