From 9c5ea99906d479c07559c7c9a38b5444446870f2 Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Fri, 5 May 2017 14:52:59 -0400 Subject: [PATCH 01/10] GPII-2404: Windows display settings handler should report available screen resolutions - Modified the display settings handler to get both the current and all available screen resolutions in one JSON object. - Refactored the handler into a fluid component. - Updated the unit tests in light of the above. --- .../src/displaySettingsHandler.js | 108 +++++++++++++++--- .../test/testDisplaySettingsHandler.js | 104 +++++++++++++++-- 2 files changed, 187 insertions(+), 25 deletions(-) diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index 150d9ca12..d4756c943 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -91,16 +91,65 @@ windows.display.createDevModeStruct = function () { return dm; }; +fluid.defaults("gpii.windowsDisplay", { + gradeNames: ["fluid.component"], + invokers: { + getScreenResolution: { + funcName: "gpii.windows.display.getScreenResolution", + args: [] + }, + getAvailableResolutions: { + funcName: "gpii.windows.display.getAvailableResolutions", + args: ["{that}"] + }, + getAllScreenResolutions: { + funcName: "gpii.windows.display.getAllScreenResolutions", + args: [] + }, + isScreenResolutionInvalid: { + funcName: "gpii.windows.display.isInvalid", + args: ["{that}", "{arguments}.0"] + // resolution to test + }, + setScreenResolution: { + funcName: "gpii.windows.display.setScreenResolution", + args: ["{that}", "{arguments}.0"] + // { width, height } + }, + getImpl: { + funcName: "gpii.windows.display.getImpl", + args: [] + }, + setImpl: { + funcName: "gpii.windows.display.setImpl", + args: ["{arguments}.0"] + // settingsRequest payload + }, + get: { + funcName: "gpii.windows.displaySettingsHandler.get", + args: ["{arguments}.0"] + // payload + }, + set: { + funcName: "gpii.windows.displaySettingsHandler.set", + args: ["{arguments}.0"] + // array of settings + } + } +}); + + /* * Returns if a screen resolution is invalid * - * @param (Object) + * @psrsm that {Component} An instance of gpii.displaySettingsHandler + * @param screenRes (Object) Screen resolution to test as {width, height} * @returns {boolean} true if invalid */ -windows.display.isInvalid = function (screenRes) { +gpii.windows.display.isInvalid = function (that, screenRes) { var isInvalid = true; if (typeof(screenRes.width) === "number" && typeof(screenRes.height) === "number" && screenRes.width > 0 && screenRes.height > 0) { - fluid.each(windows.display.getAvailableResolutions(), function (validScreenRes) { + fluid.each(that.getAvailableResolutions(), function (validScreenRes) { if (validScreenRes.dmPelsWidth === screenRes.width && validScreenRes.dmPelsHeight === screenRes.height) { isInvalid = false; }; @@ -114,7 +163,7 @@ windows.display.isInvalid = function (screenRes) { * * @return {Object) The width and height of the screen. */ -windows.display.getScreenResolution = function () { +gpii.windows.display.getScreenResolution = function () { var dm = windows.display.createDevModeStruct(); if (windows.display.user32.EnumDisplaySettingsW(ref.NULL, c.ENUM_CURRENT_SETTINGS, dm.ref()) !== c.FALSE) { // note for unknown reason on win 10 the returned dmSize is 188 not expected 220 @@ -130,7 +179,7 @@ windows.display.getScreenResolution = function () { * * @return {list} of resolutions */ -windows.display.getAvailableResolutions = function () { +gpii.windows.display.getAvailableResolutions = function () { var index = 0; var dm = windows.display.createDevModeStruct(); var availableResolutions = []; @@ -148,14 +197,31 @@ windows.display.getAvailableResolutions = function () { return availableResolutions; }; +/* + * Gets the current and all available screen resolutions + * + * @return {Object) The width and height as "current-resolution" and an array of + * widths/heights as "available-resolutions". + */ +gpii.windows.display.getAllScreenResolutions = function () { + var winDisplay = gpii.windowsDisplay(); + var currentResolution = winDisplay.getScreenResolution(); + var available = winDisplay.getAvailableResolutions(); + return { + "screen-resolution": currentResolution, + "available-resolutions": available + }; +}; + /* * Sets the current display's screen resolution if possible * + * @psrsm that {Component} An instance of gpii.displaySettingsHandler * @param {Object} The new screen resolution width and height * @return {boolean} true if successfu */ -windows.display.setScreenResolution = function (newRes) { - if (windows.display.isInvalid(newRes)) { +gpii.windows.display.setScreenResolution = function (that, newRes) { + if (that.isScreenResolutionInvalid(newRes)) { fluid.fail("Received an invalid screen resolution: ", newRes); } else { var dmCurrent = windows.display.createDevModeStruct(); @@ -183,8 +249,17 @@ windows.display.setScreenResolution = function (newRes) { } }; -windows.display.setImpl = function (payload) { - var oldRes = windows.display.getScreenResolution(); +/* + * Sets the current display's screen resolution based on payload. + * + * @param {Object} Payload that contains a "screen-resolution" property. + * @return {Object} containing the resolution before changing it ("oldValue"), + * and a copy of the new resolution (newRes), both with + * memmbers {width, height} + */ +gpii.windows.display.setImpl = function (payload) { + var windowsDisplay = gpii.windowsDisplay(); + var oldRes = windowsDisplay.getScreenResolution(); var newRes = oldRes; var targetRes = payload.settings["screen-resolution"]; @@ -192,7 +267,7 @@ windows.display.setImpl = function (payload) { fluid.fail("Incorrect payload for screen resolution: " + JSON.stringify(payload, null, 4)); } - else if (windows.display.setScreenResolution(targetRes)) { + else if (windowsDisplay.setScreenResolution(targetRes)) { newRes = targetRes; } @@ -203,11 +278,14 @@ windows.display.setImpl = function (payload) { return results; }; -windows.display.getImpl = function () { - var curRes = windows.display.getScreenResolution(); - var results = { "screen-resolution": curRes }; - - return results; +/* + * Returns the current display's screen resolution as. + * + * @return {Object} containing "screen-resolution" property that is the current + * resolution {width, height} + */ +gpii.windows.display.getImpl = function () { + return gpii.windows.display.getAllScreenResolutions(); }; windows.displaySettingsHandler.get = function (payload) { diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index 5037ac706..2572432f1 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -20,52 +20,136 @@ var gpii = fluid.registerNamespace("gpii"); require("../../WindowsUtilities/WindowsUtilities.js"); require("../src/displaySettingsHandler.js"); +var windowsDisplay = gpii.windowsDisplay(); + jqUnit.module("Windows Display Settings Handler Tests"); jqUnit.test("Testing GetScreenResolution", function () { jqUnit.expect(3); - var screenRes = gpii.windows.display.getScreenResolution(); + var screenRes = windowsDisplay.getScreenResolution(); jqUnit.assertDeepEq("getScreenResolution returns an object", "object", typeof(screenRes)); jqUnit.assertDeepEq("value for width is a number", "number", typeof(screenRes.width)); jqUnit.assertDeepEq("value for height is a number", "number", typeof(screenRes.height)); }); +jqUnit.test("Get available screen resolutions", function () { + var availableReesolutions = windowsDisplay.getAvailableResolutions(); + jqUnit.assertNotNull("Available resoiultions array", availableReesolutions); + jqUnit.assertNotEquals("Number of availableReesolutions", + 0, availableReesolutions.length); +}); + +jqUnit.test("Get all screen resolutions", function () { + var current = windowsDisplay.getScreenResolution(); + var available = windowsDisplay.getAvailableResolutions(); + var all = windowsDisplay.getAllScreenResolutions(); + jqUnit.assertDeepEq("All screen resolutions contains current resolution", + current, all["screen-resolution"]); + jqUnit.assertDeepEq("All screen resolutions contains available resolution", + available, all["available-resolutions"]); +}); + +jqUnit.test("Valid and invalid screen resolutions", function () { + var currentResolution = windowsDisplay.getScreenResolution(); + jqUnit.assertFalse( + "Valid screen resolution", + windowsDisplay.isScreenResolutionInvalid(currentResolution) + ); + var invalidResolution = { width: -999, height: -666 }; + jqUnit.assertTrue( + "Valid screen resolution", + windowsDisplay.isScreenResolutionInvalid(invalidResolution) + ); +}); + jqUnit.test("Testing setScreenResolution ", function () { - var oldRes = gpii.windows.display.getScreenResolution(); + var oldRes = windowsDisplay.getScreenResolution(); // We can change resolution // Not such a good unit test as depends on available modes and current screen resolution jqUnit.expect(2); var targetRes = { width: 800, height: 600 }; - jqUnit.assertTrue("We can call to setScreenResolution, it returns 'true'", gpii.windows.display.setScreenResolution(targetRes)); - var newRes = gpii.windows.display.getScreenResolution(); + jqUnit.assertTrue("We can call to setScreenResolution, it returns 'true'", + windowsDisplay.setScreenResolution(targetRes)); + var newRes = windowsDisplay.getScreenResolution(); jqUnit.assertDeepEq("New resolution is set", targetRes, newRes); // Restore old resolution jqUnit.expect(2); - jqUnit.assertTrue("Resetting to old resolution", gpii.windows.display.setScreenResolution(oldRes)); - var restoredRes = gpii.windows.display.getScreenResolution(); + jqUnit.assertTrue("Resetting to old resolution", windowsDisplay.setScreenResolution(oldRes)); + var restoredRes = windowsDisplay.getScreenResolution(); jqUnit.assertDeepEq("Old resolution appear to be restored", oldRes, restoredRes); // test can't change to invalid resolution var badRes = { width: -123, height: -123 }; jqUnit.expectFrameworkDiagnostic("setScreenResolution fails when receives an invalid resolution such as {w: -123, h: -123}", function () { - gpii.windows.display.setScreenResolution(badRes); + windowsDisplay.setScreenResolution(badRes); }, "invalid screen resolution"); // test that setScreenResolution fails when it receives a faulty screen resolution var faulty1 = 2; jqUnit.expectFrameworkDiagnostic("setScreenResolution fails when receives a non-object parameter", function () { - gpii.windows.display.setScreenResolution(faulty1); + windowsDisplay.setScreenResolution(faulty1); }, "invalid screen resolution"); var faulty2 = { w: 0, h: 1 }; jqUnit.expectFrameworkDiagnostic("setScreenResolution fails when receives a wrong object", function () { - gpii.windows.display.setScreenResolution(faulty2); + windowsDisplay.setScreenResolution(faulty2); }, ["invalid screen resolution"]); var faulty3 = { width: 0, height: "" }; jqUnit.expectFrameworkDiagnostic("setScreenResolution fails when receives one string as value for height", function () { - gpii.windows.display.setScreenResolution(faulty3); + windowsDisplay.setScreenResolution(faulty3); }, "invalid screen resolution"); }); + +jqUnit.test("WIndows display settings handlerr: getImpl()", function () { + var actualSettings = windowsDisplay.getImpl(); + var expectedSettings = windowsDisplay.getAllScreenResolutions(); + jqUnit.assertDeepEq("Return value of getImpl() with no input", + expectedSettings, actualSettings); +}); + +jqUnit.test("Windows display settings handler: setImpl()", function () { + var allRez = windowsDisplay.getAllScreenResolutions(); + var newRez = fluid.find(allRez["available-resolutions"], function (aRez) { + if (aRez.dmPelsWidth !== allRez["screen-resolution"].width || + aRez.dmPelsHeight !== allRez["screen-resolution"].height) { + return aRez; + } + }, null); + if (newRez !== null) { + var rezToSet = {}; + rezToSet.width = newRez.dmPelsWidth; + rezToSet.height = newRez.dmPelsHeight; + var screenResolution = {}; + fluid.set(screenResolution, "screen-resolution", rezToSet); + var payload = {}; + payload.settings = screenResolution; + var oldRez = windowsDisplay.setImpl(payload); + jqUnit.assertDeepEq( + "New resolution via setImpl()", + windowsDisplay.getScreenResolution(), + rezToSet + ); + jqUnit.assertDeepEq( + "Old resolution from setImpl()", + allRez["screen-resolution"], + oldRez["screen-resolution"].oldValue + ); + // Revert to the previous resolution. + payload.settings["screen-resolution"] = allRez["screen-resolution"]; + oldRez = windowsDisplay.setImpl(payload); + jqUnit.assertDeepEq( + "Revert to old resolution using setImpl()", + windowsDisplay.getScreenResolution(), + allRez["screen-resolution"] + ); + jqUnit.assertDeepEq( + "Old resolution returned during revert via setImpl()", + rezToSet, + oldRez["screen-resolution"].oldValue + ); + } +}); + From 99e0c9a5b9cdc34f59b5084b32d5887bc7653740 Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Thu, 18 May 2017 16:55:32 -0400 Subject: [PATCH 02/10] GPII-2404: Windows display settings handler should report available screen resolutions Reverted getScreenResolution() to return an object with just width and height, but modified getImpl() to add a "screen-resolution" property. --- .../displaySettingsHandler/src/displaySettingsHandler.js | 4 +++- .../test/testDisplaySettingsHandler.js | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index d4756c943..d31d24993 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -285,7 +285,9 @@ gpii.windows.display.setImpl = function (payload) { * resolution {width, height} */ gpii.windows.display.getImpl = function () { - return gpii.windows.display.getAllScreenResolutions(); + var screenResolution = {}; + screenResolution["screen-resolution"] = gpii.windows.display.getScreenResolution(); + return screenResolution; }; windows.displaySettingsHandler.get = function (payload) { diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index 2572432f1..41137ecc2 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -103,11 +103,12 @@ jqUnit.test("Testing setScreenResolution ", function () { }, "invalid screen resolution"); }); -jqUnit.test("WIndows display settings handlerr: getImpl()", function () { +jqUnit.test("Windows display settings handlerr: getImpl()", function () { var actualSettings = windowsDisplay.getImpl(); var expectedSettings = windowsDisplay.getAllScreenResolutions(); jqUnit.assertDeepEq("Return value of getImpl() with no input", - expectedSettings, actualSettings); + expectedSettings["screen-resolution"], + actualSettings["screen-resolution"]); }); jqUnit.test("Windows display settings handler: setImpl()", function () { From 476f7d746cd6e42827669c9cda02aefbaa685b14 Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Fri, 19 May 2017 09:57:06 -0400 Subject: [PATCH 03/10] GPII-2404: Windows display settings handler reports available screen resolutions Better way to set current screen resolution return value. Also, cleaned up some comments. --- .../displaySettingsHandler/src/displaySettingsHandler.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index d31d24993..c6d8eb17e 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -109,7 +109,7 @@ fluid.defaults("gpii.windowsDisplay", { isScreenResolutionInvalid: { funcName: "gpii.windows.display.isInvalid", args: ["{that}", "{arguments}.0"] - // resolution to test + // { width, height } }, setScreenResolution: { funcName: "gpii.windows.display.setScreenResolution", @@ -177,7 +177,7 @@ gpii.windows.display.getScreenResolution = function () { /* * Gets available resolutions * - * @return {list} of resolutions + * @return {array} of resolutions */ gpii.windows.display.getAvailableResolutions = function () { var index = 0; @@ -279,14 +279,14 @@ gpii.windows.display.setImpl = function (payload) { }; /* - * Returns the current display's screen resolution as. + * Returns the display's current screen resolution. * * @return {Object} containing "screen-resolution" property that is the current * resolution {width, height} */ gpii.windows.display.getImpl = function () { var screenResolution = {}; - screenResolution["screen-resolution"] = gpii.windows.display.getScreenResolution(); + fluid.set(screenResolution, "screen-resolution", gpii.windows.display.getScreenResolution()); return screenResolution; }; From 0e78ce7c8c3e5c17ec1f31932d67b72951e3f21f Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Wed, 5 Jul 2017 16:46:04 -0400 Subject: [PATCH 04/10] GPII-2404: Windows display settings handler reports available screen resolutions Removed unused functions. --- .../src/displaySettingsHandler.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index c6d8eb17e..fb45f79a7 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -124,16 +124,6 @@ fluid.defaults("gpii.windowsDisplay", { funcName: "gpii.windows.display.setImpl", args: ["{arguments}.0"] // settingsRequest payload - }, - get: { - funcName: "gpii.windows.displaySettingsHandler.get", - args: ["{arguments}.0"] - // payload - }, - set: { - funcName: "gpii.windows.displaySettingsHandler.set", - args: ["{arguments}.0"] - // array of settings } } }); From 73d727cc4fce14306c09dab8219cb3329eb9f282 Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Thu, 24 Aug 2017 16:34:00 -0400 Subject: [PATCH 05/10] GPII-2404: Fixed lint error. --- .../displaySettingsHandler/src/displaySettingsHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index 439f27a60..90d730f19 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -275,7 +275,7 @@ gpii.windows.display.setImpl = function (payload) { results["screen-resolution"] = { oldValue: oldRes, newValue: newRes }; } - + var targetDpi = payload.settings["screen-dpi"]; if (targetDpi) { var oldDpi = windows.display.getScreenDpi(); From c35c2c96513bce3c782720470e67baa141911e8e Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Fri, 25 Aug 2017 10:58:32 -0400 Subject: [PATCH 06/10] GPII-2404: Display settings handler returns all screen resolutions. Modifed the "getAllScreenResolutions" to drop the "dmPels" prefix. --- .../src/displaySettingsHandler.js | 11 +++++++-- .../test/testDisplaySettingsHandler.js | 23 ++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index 90d730f19..057e5f400 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -207,6 +207,13 @@ gpii.windows.display.getAllScreenResolutions = function () { var winDisplay = gpii.windowsDisplay(); var currentResolution = winDisplay.getScreenResolution(); var available = winDisplay.getAvailableResolutions(); + var rule = { + width: "dmPelsWidth", + height: "dmPelsHeight" + }; + available = fluid.transform (available, function (currRes) { + return fluid.model.transformWithRules (currRes, rule); + }); return { "screen-resolution": currentResolution, "available-resolutions": available @@ -288,10 +295,10 @@ gpii.windows.display.setImpl = function (payload) { }; /* - * Returns the display's current screen resolution. + * Returns the display's current screen resolution, and dpi. * * @return {Object} containing "screen-resolution" property that is the current - * resolution {width, height}, and an "screen-dpi" property. + * resolution {width, height}, and a "screen-dpi" property. */ gpii.windows.display.getImpl = function () { var results = {}; diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index a32425ea0..f09c1a582 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -140,8 +140,19 @@ jqUnit.test("Get all screen resolutions", function () { var all = windowsDisplay.getAllScreenResolutions(); jqUnit.assertDeepEq("All screen resolutions contains current resolution", current, all["screen-resolution"]); - jqUnit.assertDeepEq("All screen resolutions contains available resolution", - available, all["available-resolutions"]); + + // Revisit use of "dmPels" prefix as returnsd by getAvailalbeResolutions(). + // Can't do a deep equals because the property names are different. + var allAvailable = all["available-resolutions"]; + jqUnit.assertEquals("All screen resolutions contain available resolutions", + available.length, allAvailable.length); + fluid.each (available, function (expected, index) { + var actual = allAvailable[index]; + jqUnit.assertEquals("Available resolution width in 'all' structure vs available", + expected.dmPelsWidth, actual.width); + jqUnit.assertEquals("Available resolution height in 'all' structure vs available", + expected.dmPelsHeight, actual.height); + }); }); jqUnit.test("Valid and invalid screen resolutions", function () { @@ -209,15 +220,15 @@ jqUnit.test("Windows display settings handlerr: getImpl()", function () { jqUnit.test("Windows display settings handler: setImpl()", function () { var allRez = windowsDisplay.getAllScreenResolutions(); var newRez = fluid.find(allRez["available-resolutions"], function (aRez) { - if (aRez.dmPelsWidth !== allRez["screen-resolution"].width || - aRez.dmPelsHeight !== allRez["screen-resolution"].height) { + if (aRez.width !== allRez["screen-resolution"].width || + aRez.height !== allRez["screen-resolution"].height) { return aRez; } }, null); if (newRez !== null) { var rezToSet = {}; - rezToSet.width = newRez.dmPelsWidth; - rezToSet.height = newRez.dmPelsHeight; + rezToSet.width = newRez.width; + rezToSet.height = newRez.height; var screenResolution = {}; fluid.set(screenResolution, "screen-resolution", rezToSet); var payload = {}; From f9778e3452f7414263e96b8c861008e8e8048aa7 Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Fri, 25 Aug 2017 11:39:50 -0400 Subject: [PATCH 07/10] GPII-2404: Fixed lint error. --- .../displaySettingsHandler/test/testDisplaySettingsHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index f09c1a582..d0418ec56 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -140,7 +140,7 @@ jqUnit.test("Get all screen resolutions", function () { var all = windowsDisplay.getAllScreenResolutions(); jqUnit.assertDeepEq("All screen resolutions contains current resolution", current, all["screen-resolution"]); - + // Revisit use of "dmPels" prefix as returnsd by getAvailalbeResolutions(). // Can't do a deep equals because the property names are different. var allAvailable = all["available-resolutions"]; From c9046f346f9f5ba6142594205a1a11030136d69b Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Mon, 18 Sep 2017 10:40:34 -0400 Subject: [PATCH 08/10] GPII-2404: Fixed unit test. Modified "Testing setScreenDpi" to use the "windowsDisplay" component when setting the screen resolution. --- .../test/testDisplaySettingsHandler.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index d0418ec56..26b5bc132 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -276,13 +276,14 @@ jqUnit.test("Testing getScreenDpi ", function () { // This test is only able to test the implementation for the version of Windows it's running on. jqUnit.test("Testing setScreenDpi ", function () { // Make sure the resolution is good enough to have DPI above 100%. 1024x768 provides up to 125%. + debugger; var res = gpii.windows.display.getScreenResolution(); if (res.width < 1024 || res.height < 768) { teardowns.push(function () { - gpii.windows.display.setScreenResolution(res); + windowsDisplay.setScreenResolution(res); }); - gpii.windows.display.setScreenResolution({width: 1024, height: 768}); + windowsDisplay({width: 1024, height: 768}); } // Restore the original setting at the end. From 624605a9068101bf020bb95ec10575f7e18dd045 Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Mon, 18 Sep 2017 11:28:28 -0400 Subject: [PATCH 09/10] GPII-2404: Fixed typo in unit test. --- .../displaySettingsHandler/test/testDisplaySettingsHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index 26b5bc132..bb7d3914a 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -283,7 +283,7 @@ jqUnit.test("Testing setScreenDpi ", function () { windowsDisplay.setScreenResolution(res); }); - windowsDisplay({width: 1024, height: 768}); + windowsDisplay.setScreenResolution({width: 1024, height: 768}); } // Restore the original setting at the end. From 736bad82ccbcb2e4d517a3b09cc3f17c643e744b Mon Sep 17 00:00:00 2001 From: Joseph Scheuhammer Date: Mon, 18 Sep 2017 12:04:02 -0400 Subject: [PATCH 10/10] GPII-2404: Fixed lint error --- .../displaySettingsHandler/test/testDisplaySettingsHandler.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js index bb7d3914a..941115148 100644 --- a/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/test/testDisplaySettingsHandler.js @@ -276,7 +276,6 @@ jqUnit.test("Testing getScreenDpi ", function () { // This test is only able to test the implementation for the version of Windows it's running on. jqUnit.test("Testing setScreenDpi ", function () { // Make sure the resolution is good enough to have DPI above 100%. 1024x768 provides up to 125%. - debugger; var res = gpii.windows.display.getScreenResolution(); if (res.width < 1024 || res.height < 768) { teardowns.push(function () {