Finish the TableRangePrettyfier tests.

Author: darkriszty

src/tableRangePrettyfier.ts

@@ -27,15 +27,15 @@ export class TableRangePrettyfier implements vscode.DocumentRangeFormattingEditP
                 table = this._tableFactory.create(selection);
                 if (table == null) {
                     message = "Mismatching table column sizes.";
-                }
-                else {
+                } else {
                     const formattedTable = table.prettyPrint();
                     result.push(new vscode.TextEdit(range, formattedTable));
                 }
 
             }
             catch (ex) {
                 this._logger.logError(ex);
+                console.error("Error: \n\n" + ex);
             }
 
             if (!!message)

test/mockVsCodeClasses.ts

@@ -1,4 +1,5 @@
 import * as vscode from 'vscode';
+import * as os from "os";
 
 export class MockMarkdownTextDocument implements vscode.TextDocument {
     private _lines: string[];
@@ -49,10 +50,12 @@ export class MockMarkdownTextDocument implements vscode.TextDocument {
 
             if (isFirstRow)
                 buffer = line.substring(range.start.character);
-            if (isFirstRow && isLastRow)
+            else if (isFirstRow && isLastRow)
                 break;
-            if (isLastRow)
+            else
                 buffer += line.substring(0, range.end.character);
+            if (!isLastRow)
+                buffer += os.EOL;
         }
         return buffer;
     }

test/tableRangePrettyfier.test.ts

@@ -20,20 +20,91 @@ suite("TableRangePrettyfier tests", () => {
 
         assert.equal(textEdits.length, 0);
     });
-/*
+
     test("provideDocumentRangeFormattingEdits() table factory called with invalid table then logInfo() called", () => {
-        const tableText = "hello world";
+        const tableText = `
+hello | world
+-|-
+new | line
+`;
         const mockTableFactory: TypeMoq.IMock<ITableFactory> = TypeMoq.Mock.ofType<ITableFactory>();
         const mockLogger: TypeMoq.IMock<ILogger> = TypeMoq.Mock.ofType<ILogger>();
-        mockTableFactory.setup(t => t.create(tableText)).returns(null).verifiable(Times.once());
-        mockLogger.setup(t => t.logInfo(It.isAnyString())).verifiable(Times.once());
         const trp = new TableRangePrettyfier(mockTableFactory.object, mockLogger.object);
+
         const textDoc = new mockVsCode.MockMarkdownTextDocument(tableText);
+        const range = textDoc.getRangeForLines(1, 4);
+        mockTableFactory
+            .setup(t => t.create(textDoc.getText(range)))
+            .returns(() => null)
+            .verifiable(Times.once());
+        mockLogger
+            .setup(t => t.logInfo(It.isAnyString()))
+            .verifiable(Times.once());
 
-        const textEdits = trp.provideDocumentRangeFormattingEdits(textDoc, textDoc.getFullRange(), null, null);
+        const textEdits = trp.provideDocumentRangeFormattingEdits(textDoc, range, null, null);
+
+        mockTableFactory.verifyAll();
+        mockLogger.verifyAll();
+    });
+
+    test("provideDocumentRangeFormattingEdits() table prettyPrint() called and logInfo() not called", () => {
+        const tableText = `
+hello | world
+-|-
+new | line
+`;
+        const mockTableFactory: TypeMoq.IMock<ITableFactory> = TypeMoq.Mock.ofType<ITableFactory>();
+        const mockLogger: TypeMoq.IMock<ILogger> = TypeMoq.Mock.ofType<ILogger>();
+        const mockTable: TypeMoq.IMock<ITable> = TypeMoq.Mock.ofType<ITable>();
+        const trp = new TableRangePrettyfier(mockTableFactory.object, mockLogger.object);
+
+        const textDoc = new mockVsCode.MockMarkdownTextDocument(tableText);
+        const range = textDoc.getRangeForLines(1, 4);
 
+        mockTable
+            .setup(t => t.prettyPrint())
+            .verifiable(Times.once());
+        mockTableFactory
+            .setup(t => t.create(textDoc.getText(range)))
+            .returns(() => mockTable.object)
+            .verifiable(Times.once());
+        mockLogger
+            .setup(t => t.logInfo(It.isAnyString()))
+            .verifiable(Times.never());
+
+        const textEdits = trp.provideDocumentRangeFormattingEdits(textDoc, range, null, null);
+
+        mockTable.verifyAll();
         mockTableFactory.verifyAll();
         mockLogger.verifyAll();
     });
-*/
+
+    test("provideDocumentRangeFormattingEdits() the result of the prettyPrint() is returned", () => {
+        const tableText = `
+hello | world
+-|-
+new | line
+`;
+        const mockTableFactory: TypeMoq.IMock<ITableFactory> = TypeMoq.Mock.ofType<ITableFactory>();
+        const mockLogger: TypeMoq.IMock<ILogger> = TypeMoq.Mock.ofType<ILogger>();
+        const mockTable: TypeMoq.IMock<ITable> = TypeMoq.Mock.ofType<ITable>();
+        const trp = new TableRangePrettyfier(mockTableFactory.object, mockLogger.object);
+
+        const textDoc = new mockVsCode.MockMarkdownTextDocument(tableText);
+        const range = textDoc.getRangeForLines(1, 4);
+
+        mockTable
+            .setup(t => t.prettyPrint())
+            .returns(() => "foo bar");
+        mockTableFactory
+            .setup(t => t.create(textDoc.getText(range)))
+            .returns(() => mockTable.object)
+        mockLogger.setup(t => t.logInfo(It.isAnyString()));
+
+        const textEdits = trp.provideDocumentRangeFormattingEdits(textDoc, range, null, null);
+
+        assert.equal(textEdits.length, 1);
+        assert.equal(textEdits[0].newText, "foo bar");
+    });
+
 });