Make a few tests pass on windows, make test failure messages more hel…

…pful Refs #4844
VSCodeVim · May 17, 2020 · c204f51 · c204f51
1 parent 1ea49a4
commit c204f51
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/test/cmd_line/tabCompletion.test.ts b/test/cmd_line/tabCompletion.test.ts
@@ -266,7 +266,7 @@ suite('cmd_line tabComplete', () => {
       await modeHandler.handleKeyEvent('<tab>');
       statusBarAfterTab = StatusBar.getText().trim();
       await modeHandler.handleKeyEvent('<Esc>');
-      assert.strictEqual(statusBarAfterTab, `:e ././${baseName}|`, `${failMsg} (w ././)`);
+      assert.strictEqual(statusBarAfterTab, `:e .${sep}.${sep}${baseName}|`, `${failMsg} (w ././)`);
 
       // With full path excluding the last space portion
       cmd = `:e ${fullPathExcludeSpace}`.split('');

diff --git a/test/configuration/validators/neovimValidator.test.ts b/test/configuration/validators/neovimValidator.test.ts
@@ -9,11 +9,16 @@ suite('Neovim Validator', () => {
     configuration.enableNeovim = true;
     configuration.neovimPath = '';
 
+    const oldPath = process.env.PATH?.slice();
+    process.env.PATH = "";
+
     // test
     const validator = new NeovimValidator();
     const actual = await validator.validate(configuration);
     validator.disable(configuration);
 
+    process.env.PATH = oldPath;
+
     // assert
     assert.strictEqual(actual.numErrors, 1);
     assert.strictEqual(actual.hasError, true);

diff --git a/test/testSimplifier.ts b/test/testSimplifier.ts
@@ -276,13 +276,12 @@ async function testIt(modeHandler: ModeHandler, testObj: ITestObject): Promise<v
   assertEqualLines(lines);
 
   // Check final cursor position
-  const actualPosition = Position.FromVSCodePosition(TextEditor.getSelection().start);
+  const actualPosition = TextEditor.getSelection().start;
   const expectedPosition = helper.endPosition;
-  assert.strictEqual(actualPosition.line, expectedPosition.line, 'Cursor LINE position is wrong.');
-  assert.strictEqual(
-    actualPosition.character,
-    expectedPosition.character,
-    'Cursor CHARACTER position is wrong.'
+  assert.deepStrictEqual(
+    { line: actualPosition.line, character: actualPosition.character },
+    { line: expectedPosition.line, character: expectedPosition.character },
+    'Cursor position is wrong.'
   );
 
   // endMode: check end mode is correct if given

diff --git a/test/testUtils.ts b/test/testUtils.ts
@@ -77,17 +77,11 @@ export async function WaitForEditorsToClose(numExpectedEditors: number = 0): Pro
 }
 
 export function assertEqualLines(expectedLines: string[]) {
-  for (let i = 0; i < expectedLines.length; i++) {
-    const expected = expectedLines[i];
-    const actual = TextEditor.readLineAt(i);
-    assert.strictEqual(
-      actual,
-      expected,
-      `Content does not match; Expected=${expected}. Actual=${actual}.`
-    );
-  }
-
-  assert.strictEqual(TextEditor.getLineCount(), expectedLines.length, 'Line count does not match.');
+  assert.strictEqual(
+    TextEditor.getText(),
+    expectedLines.join(os.EOL),
+    'Document content does not match.'
+  );
 }
 
 export function assertStatusBarEqual(