Merge pull request #5492 from gmeluski/bug/5479-unit-test-fix

dangoor · dangoor · commit a855576b1352 · 2013-10-18T05:48:13.000-07:00
Change not.toBeNull() to toBeTruthy() in unit tests
diff --git a/src/extensions/default/CSSCodeHints/unittests.js b/src/extensions/default/CSSCodeHints/unittests.js
@@ -80,7 +80,7 @@ define(function (require, exports, module) {
         function expectHints(provider, implicitChar) {
             expect(provider.hasHints(testEditor, implicitChar)).toBe(true);
             var hintsObj = provider.getHints();
-            expect(hintsObj).not.toBeNull();
+            expect(hintsObj).toBeTruthy();
             return hintsObj.hints; // return just the array of hints
         }
         
diff --git a/src/extensions/default/HTMLCodeHints/unittests.js b/src/extensions/default/HTMLCodeHints/unittests.js
@@ -72,7 +72,7 @@ define(function (require, exports, module) {
         function expectHints(provider) {
             expect(provider.hasHints(testEditor, null)).toBe(true);
             var hintsObj = provider.getHints();
-            expect(hintsObj).not.toBeNull();
+            expect(hintsObj).toBeTruthy();
             return hintsObj.hints; // return just the array of hints
         }
         
diff --git a/src/extensions/default/HtmlEntityCodeHints/unittests.js b/src/extensions/default/HtmlEntityCodeHints/unittests.js
@@ -52,7 +52,7 @@ define(function (require, exports, module) {
         function expectHints(provider) {
             expect(provider.hasHints(testEditorAndDoc.editor, null)).toBe(true);
             var hintsObj = provider.getHints(null);
-            expect(hintsObj).not.toBeNull();
+            expect(hintsObj).toBeTruthy();
             return hintsObj.hints; // return just the array of hints
         }
         
diff --git a/src/extensions/default/InlineColorEditor/unittests.js b/src/extensions/default/InlineColorEditor/unittests.js
@@ -213,7 +213,7 @@ define(function (require, exports, module) {
                     makeColorEditor({line: 1, ch: 18});
                     runs(function () {
                         inline.colorEditor.setColorFromString("rgb(20, 20, 20)");
-                        expect(inline.getCurrentRange()).not.toBeNull();
+                        expect(inline.getCurrentRange()).toBeTruthy();
                     });
                 });
     
diff --git a/src/extensions/default/JavaScriptCodeHints/unittests.js b/src/extensions/default/JavaScriptCodeHints/unittests.js
@@ -185,7 +185,7 @@ define(function (require, exports, module) {
          */
         function hintsAbsent(hintObj, absentHints) {
             _waitForHints(hintObj, function (hintList) {
-                expect(hintList).not.toBeNull();
+                expect(hintList).toBeTruthy();
                 absentHints.forEach(function (absentHint) {
                     expect(_indexOf(hintList, absentHint)).toBe(-1);
                 });
@@ -203,7 +203,7 @@ define(function (require, exports, module) {
          */
         function hintsPresent(hintObj, expectedHints) {
             _waitForHints(hintObj, function (hintList) {
-                expect(hintList).not.toBeNull();
+                expect(hintList).toBeTruthy();
                 expectedHints.forEach(function (expectedHint) {
                     expect(_indexOf(hintList, expectedHint)).not.toBe(-1);
                 });
@@ -224,7 +224,7 @@ define(function (require, exports, module) {
                 currIndex;
             
             _waitForHints(hintObj, function (hintList) {
-                expect(hintList).not.toBeNull();
+                expect(hintList).toBeTruthy();
                 expectedHints.forEach(function (expectedHint) {
                     currIndex = _indexOf(hintList, expectedHint);
                     expect(currIndex).toBeGreaterThan(prevIndex);
@@ -244,7 +244,7 @@ define(function (require, exports, module) {
          */
         function hintsPresentExact(hintObj, expectedHints) {
             _waitForHints(hintObj, function (hintList) {
-                expect(hintList).not.toBeNull();
+                expect(hintList).toBeTruthy();
                 expect(hintList.length).toBe(expectedHints.length);
                 expectedHints.forEach(function (expectedHint, index) {
                     expect(hintList[index].data("token").value).toBe(expectedHint);
@@ -282,9 +282,9 @@ define(function (require, exports, module) {
         function selectHint(provider, hintObj, hintSelection) {
             var hintList = expectHints(provider);
             _waitForHints(hintObj, function (hintList) {
-                expect(hintList).not.toBeNull();
+                expect(hintList).toBeTruthy();
                 var index = findHint(hintList, hintSelection);
-                expect(hintList[index].data("token")).not.toBeNull();
+                expect(hintList[index].data("token")).toBeTruthy();
                 expect(provider.insertHint(hintList[index])).toBe(false);
             });
         }
diff --git a/src/extensions/default/JavaScriptQuickEdit/unittests.js b/src/extensions/default/JavaScriptQuickEdit/unittests.js
@@ -336,7 +336,7 @@ define(function (require, exports, module) {
                  */
                 function hintsPresentExact(hintObj, expectedHints) {
                     _waitForHints(hintObj, function (hintList) {
-                        expect(hintList).not.toBeNull();
+                        expect(hintList).toBeTruthy();
                         expect(hintList.length).toBe(expectedHints.length);
                         expectedHints.forEach(function (expectedHint, index) {
                             expect(hintList[index].data("token").value).toBe(expectedHint);
diff --git a/src/extensions/default/WebPlatformDocs/unittests.js b/src/extensions/default/WebPlatformDocs/unittests.js
@@ -77,7 +77,7 @@ define(function (require, exports, module) {
             runs(function () {
                 if (promise) {
                     if (expectInline) {
-                        expect(widget).not.toBeNull();
+                        expect(widget).toBeTruthy();
                         expect(widget.$htmlContent.find(".css-prop-summary h1").text()).toBe(expectedProperty);
                     } else {
                         expect(widget).toBeNull();
@@ -221,4 +221,4 @@ define(function (require, exports, module) {
         });
 
     });
-});
+});
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
@@ -235,10 +235,10 @@ define(function (require, exports, module) {
             
             it("should find the first instance of the h2 selector", function () {
                 var selectors = CSSUtils._findAllMatchingSelectorsInText(this.fileContent, "h2");
-                expect(selectors).not.toBe(null);
+                expect(selectors).toBeTruthy();
                 expect(selectors.length).toBeGreaterThan(0);
                 
-                expect(selectors[0]).not.toBe(null);
+                expect(selectors[0]).toBeTruthy();
                 expect(selectors[0].selectorStartLine).toBe(292);
                 expect(selectors[0].declListEndLine).toBe(301);
             });
diff --git a/test/spec/ExtensionInstallation-test.js b/test/spec/ExtensionInstallation-test.js
@@ -179,7 +179,7 @@ define(function (require, exports, module) {
 
             runs(function () {
                 expect(packageData.errors.length).toEqual(0);
-                expect(packageData.disabledReason).not.toBeNull();
+                expect(packageData.disabledReason).toBeTruthy();
                 expect(packageData.name).toEqual("incompatible-version");
                 expect(lastExtensionLoad).toEqual({});
                 NativeFileSystem.resolveNativeFileSystemPath(extensionsRoot + "/disabled/incompatible-version",
@@ -217,4 +217,4 @@ define(function (require, exports, module) {
             });
         });
     });
-});
+});
diff --git a/test/spec/HTMLInstrumentation-test.js b/test/spec/HTMLInstrumentation-test.js
@@ -403,7 +403,7 @@ define(function (require, exports, module) {
         },
         querySelectorAll: function (query) {
             var match = bracketsIdQuery.exec(query);
-            expect(match).not.toBeNull();
+            expect(match).toBeTruthy();
             if (!match) {
                 return [];
             }
diff --git a/test/spec/HTMLSimpleDOM-test.js b/test/spec/HTMLSimpleDOM-test.js
@@ -46,7 +46,7 @@ define(function (require, exports, module) {
         if (expectedErrors) {
             expect(root).toBeNull();
         } else {
-            expect(root).not.toBeNull();
+            expect(root).toBeTruthy();
         }
 
         expect(errors).toEqual(expectedErrors);
@@ -62,12 +62,12 @@ define(function (require, exports, module) {
         describe("Strict HTML parsing", function () {
             it("should parse a document with balanced, void and self-closing tags", function () {
                 var root = build("<p><b>some</b>awesome text</p><p>and <img> another <br/> para</p>", true);
-                expect(root).not.toBeNull();
+                expect(root).toBeTruthy();
             });
             
             it("should parse a document with an implied-close tag followed by a tag that forces it to close", function () {
                 var result = build("<div><p>unclosed para<h1>heading that closes para</h1></div>", true);
-                expect(result).not.toBeNull();
+                expect(result).toBeTruthy();
                 expect(result.tag).toBe("div");
                 expect(result.children[0].tag).toBe("p");
                 expect(result.children[1].tag).toBe("h1");
@@ -185,4 +185,4 @@ define(function (require, exports, module) {
             });
         });
     });
-});
+});
diff --git a/test/spec/InstallExtensionDialog-test.js b/test/spec/InstallExtensionDialog-test.js
@@ -119,7 +119,7 @@ define(function (require, exports, module) {
             }
             
             it("should open the dialog", function () {
-                expect(fields.$dlg[0]).not.toBeNull();
+                expect(fields.$dlg[0]).toBeTruthy();
             });
             
             it("should have the install button disabled when dialog is first open due to empty url field", function () {
diff --git a/test/spec/JSUtils-test.js b/test/spec/JSUtils-test.js
@@ -411,10 +411,10 @@ define(function (require, exports, module) {
 
             it("should find the first instance of the pushStack function", function () {
                 var funcNames = JSUtils.findAllMatchingFunctionsInText(this.fileJsContent, "pushStack");
-                expect(funcNames).not.toBe(null);
+                expect(funcNames).toBeTruthy();
                 expect(funcNames.length).toBeGreaterThan(0);
                 
-                expect(funcNames[0]).not.toBe(null);
+                expect(funcNames[0]).toBeTruthy();
                 expect(funcNames[0].lineStart).toBe(243);
                 expect(funcNames[0].lineEnd).toBe(267);
             });
diff --git a/test/spec/LanguageManager-test.js b/test/spec/LanguageManager-test.js
@@ -98,10 +98,10 @@ define(function (require, exports, module) {
                     coffee = LanguageManager.getLanguage("coffeescript");
                 
                 // check basic language support
-                expect(html).not.toBeNull();
-                expect(LanguageManager.getLanguage("css")).not.toBeNull();
-                expect(LanguageManager.getLanguage("javascript")).not.toBeNull();
-                expect(LanguageManager.getLanguage("json")).not.toBeNull();
+                expect(html).toBeTruthy();
+                expect(LanguageManager.getLanguage("css")).toBeTruthy();
+                expect(LanguageManager.getLanguage("javascript")).toBeTruthy();
+                expect(LanguageManager.getLanguage("json")).toBeTruthy();
                 
                 // check html mode
                 var def = {
@@ -132,7 +132,7 @@ define(function (require, exports, module) {
             it("should map identifiers to languages", function () {
                 var html = LanguageManager.getLanguage("html");
                 
-                expect(html).not.toBe(null);
+                expect(html).toBeTruthy();
                 expect(LanguageManager.getLanguage("DoesNotExist")).toBe(undefined);
             });
             
diff --git a/test/spec/Menu-test.js b/test/spec/Menu-test.js
@@ -256,7 +256,7 @@ define(function (require, exports, module) {
 
                     var menuCountOriginal = $listItems.length;
                     var menu = Menus.addMenu("Custom1", "menu-unittest1");
-                    expect(menu).not.toBeNull();
+                    expect(menu).toBeTruthy();
                     expect(menu).toBeDefined();
 
                     $listItems = getTopMenus(); // refresh
@@ -272,7 +272,7 @@ define(function (require, exports, module) {
 
                     var menuCountOriginal = $listItems.length;
                     var menu = Menus.addMenu("Custom2", "menu-unittest2", Menus.FIRST);
-                    expect(menu).not.toBeNull();
+                    expect(menu).toBeTruthy();
                     expect(menu).toBeDefined();
 
                     $listItems = getTopMenus();
@@ -289,7 +289,7 @@ define(function (require, exports, module) {
                     var menuCountOriginal = $listItems.length;
                     var menu = Menus.addMenu("CustomFirst", "menu-unittest3-first", Menus.FIRST);
                     menu = Menus.addMenu("CustomAfter", "menu-unittest3-after", Menus.AFTER, "menu-unittest3-first");
-                    expect(menu).not.toBeNull();
+                    expect(menu).toBeTruthy();
                     expect(menu).toBeDefined();
 
                     $listItems = getTopMenus();
@@ -307,7 +307,7 @@ define(function (require, exports, module) {
                     var menuCountOriginal = $listItems.length;
                     var menu = Menus.addMenu("CustomLast", "menu-unittest3-last", Menus.LAST);
                     menu = Menus.addMenu("CustomBefore", "menu-unittest3-before", Menus.BEFORE, "menu-unittest3-last");
-                    expect(menu).not.toBeNull();
+                    expect(menu).toBeTruthy();
                     expect(menu).toBeDefined();
 
                     $listItems = getTopMenus();
@@ -324,7 +324,7 @@ define(function (require, exports, module) {
 
                     var menuCountOriginal = $listItems.length;
                     var menu = Menus.addMenu("Custom3", "menu-unittest4", Menus.AFTER, "NONEXISTANT");
-                    expect(menu).not.toBeNull();
+                    expect(menu).toBeTruthy();
                     expect(menu).toBeDefined();
 
                     $listItems = getTopMenus();
@@ -340,7 +340,7 @@ define(function (require, exports, module) {
 
                     var menuCountOriginal = $listItems.length;
                     var menu1 = Menus.addMenu("Custom5", "menu-unittest5");
-                    expect(menu1).not.toBeNull();
+                    expect(menu1).toBeTruthy();
 
                     var menu2 = null;
 
@@ -368,7 +368,7 @@ define(function (require, exports, module) {
                     // add new menu item to empty menu
                     CommandManager.register("Brackets Test Command Custom 0", "Menu-test.command00", function () {});
                     var menuItem = menu.addMenuItem("Menu-test.command00");
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -383,7 +383,7 @@ define(function (require, exports, module) {
                     // add new menu item in first position of menu
                     CommandManager.register("Brackets Test Command Custom 1", "Menu-test.command01", function () {});
                     menuItem = menu.addMenuItem("Menu-test.command01", "Ctrl-Alt-1", Menus.FIRST);
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -394,7 +394,7 @@ define(function (require, exports, module) {
                     // add new menu item in last position of menu
                     CommandManager.register("Brackets Test Command Custom 2", "Menu-test.command02", function () {});
                     menuItem = menu.addMenuItem("Menu-test.command02", Menus.LAST);
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -405,7 +405,7 @@ define(function (require, exports, module) {
                     // add new menu item in position after reference command
                     CommandManager.register("Brackets Test Command Custom 3", "Menu-test.command03", function () {});
                     menuItem = menu.addMenuItem("Menu-test.command03", "Ctrl-Alt-3", Menus.AFTER, "Menu-test.command01");
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -416,7 +416,7 @@ define(function (require, exports, module) {
                     // add new menu item in position before reference command
                     CommandManager.register("Brackets Test Command Custom 4", "Menu-test.command04", function () {});
                     menuItem = menu.addMenuItem("Menu-test.command04", "Ctrl-Alt-4", Menus.BEFORE, "Menu-test.command01");
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -499,7 +499,7 @@ define(function (require, exports, module) {
                     // reference command doesn't exist
                     CommandManager.register("Brackets Test Command Custom 21", "Menu-test.command21", function () {});
                     var menuItem = menu.addMenuItem("Menu-test.command21", "Ctrl-Alt-2", Menus.BEFORE, "NONEXISTANT");
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     var $listItems = testWindow.$(listSelector).children();
@@ -514,7 +514,7 @@ define(function (require, exports, module) {
 
                     CommandManager.register("Brackets Test Command Custom 23", "Menu-test.command23", function () {});
                     menuItem = menu.addMenuItem("Menu-test.command23", "Ctrl-Alt-3", Menus.BEFORE, "Menu-test.command22");
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -527,7 +527,7 @@ define(function (require, exports, module) {
                     CommandManager.register("Brackets Test Command Custom 25", "Menu-test.command25", function () {});
 
                     menuItem = menu.addMenuItem("Menu-test.command24", "Ctrl-Alt-1", Menus.BEFORE, "Menu-test.command25");
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = testWindow.$(listSelector).children();
@@ -584,7 +584,7 @@ define(function (require, exports, module) {
 
                     // Re-use commands that are already registered
                     var menuItem = menu.addMenuItem(commandId);
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     expect(typeof (commandId)).toBe("string");
@@ -609,7 +609,7 @@ define(function (require, exports, module) {
 
                     // Re-use commands that are already registered
                     var menuItem = menu.addMenuItem(commandId);
-                    expect(menuItem).not.toBeNull();
+                    expect(menuItem).toBeTruthy();
                     expect(menuItem).toBeDefined();
 
                     $listItems = menuDOMChildren(menuItemId);
@@ -693,7 +693,7 @@ define(function (require, exports, module) {
 
                     // checked state
                     var cmd = CommandManager.register("Brackets Test Command Custom 40", "Menu-test.command40", function () {});
-                    expect(cmd).not.toBeNull();
+                    expect(cmd).toBeTruthy();
                     expect(cmd).toBeDefined();
 
                     var menu = Menus.addMenu("Synchronizing Menu", "menuitem-unittest4");
diff --git a/test/spec/NativeFileSystem-test.js b/test/spec/NativeFileSystem-test.js

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ define(function (require, exports, module) {`
`80`	`80`	`function expectHints(provider, implicitChar) {`
`81`	`81`	`expect(provider.hasHints(testEditor, implicitChar)).toBe(true);`
`82`	`82`	`var hintsObj = provider.getHints();`
`83`		`- expect(hintsObj).not.toBeNull();`
	`83`	`+ expect(hintsObj).toBeTruthy();`
`84`	`84`	`return hintsObj.hints; // return just the array of hints`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ define(function (require, exports, module) {`
`72`	`72`	`function expectHints(provider) {`
`73`	`73`	`expect(provider.hasHints(testEditor, null)).toBe(true);`
`74`	`74`	`var hintsObj = provider.getHints();`
`75`		`- expect(hintsObj).not.toBeNull();`
	`75`	`+ expect(hintsObj).toBeTruthy();`
`76`	`76`	`return hintsObj.hints; // return just the array of hints`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ define(function (require, exports, module) {`
`52`	`52`	`function expectHints(provider) {`
`53`	`53`	`expect(provider.hasHints(testEditorAndDoc.editor, null)).toBe(true);`
`54`	`54`	`var hintsObj = provider.getHints(null);`
`55`		`- expect(hintsObj).not.toBeNull();`
	`55`	`+ expect(hintsObj).toBeTruthy();`
`56`	`56`	`return hintsObj.hints; // return just the array of hints`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ define(function (require, exports, module) {`
`403`	`403`	`},`
`404`	`404`	`querySelectorAll: function (query) {`
`405`	`405`	`var match = bracketsIdQuery.exec(query);`
`406`		`- expect(match).not.toBeNull();`
	`406`	`+ expect(match).toBeTruthy();`
`407`	`407`	`if (!match) {`
`408`	`408`	`return [];`
`409`	`409`	`}`