Add tests for content pad calculator

Author: darkriszty

src/extension/extension.ts

@@ -14,7 +14,7 @@ import { TrimmerTransformer } from '../modelFactory/transformers/trimmerTransfor
 import { BorderTransformer } from '../modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../modelFactory/selectionInterpreter';
 import { SeparatorPadCalculator } from '../padCalculation/separatorPadCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../padCalculation/columnBasedPadCalculatorSelector';
+import { PadCalculatorSelector } from '../padCalculation/padCalculatorSelector';
 
 // This method is called when the extension is activated.
 // The extension is activated the very first time the command is executed.
@@ -31,8 +31,8 @@ export function activate(context: vscode.ExtensionContext): void {
             new TableValidator(new SelectionInterpreter()),
             new TableViewModelFactory(
                 new RowViewModelFactory(
-                    new ContentPadCalculator(new ColumnBasedPadCalculatorSelector(), " "), 
-                    new SeparatorPadCalculator(new ColumnBasedPadCalculatorSelector(), "-")
+                    new ContentPadCalculator(new PadCalculatorSelector(), " "), 
+                    new SeparatorPadCalculator(new PadCalculatorSelector(), "-")
                 )
             ),
             new TableStringWriter(),

src/padCalculation/contentPadCalculator.ts

@@ -1,11 +1,11 @@
 import { PadCalculator } from "./padCalculator";
 import { Table } from "../models/table";
-import { ColumnBasedPadCalculatorSelector } from "./columnBasedPadCalculatorSelector";
+import { PadCalculatorSelector } from "./padCalculatorSelector";
 
 export class ContentPadCalculator implements PadCalculator {
 
     constructor(
-        protected _padCalculatorSelector: ColumnBasedPadCalculatorSelector,
+        protected _padCalculatorSelector: PadCalculatorSelector,
         protected _paddingChar: string) 
     { }
 

…tion/columnBasedPadCalculatorSelector.ts …/padCalculation/padCalculatorSelector.tssrc/padCalculation/columnBasedPadCalculatorSelector.ts renamed to src/padCalculation/padCalculatorSelector.ts src/padCalculation/columnBasedPadCalculatorSelector.ts renamed to src/padCalculation/padCalculatorSelector.ts

@@ -4,7 +4,7 @@ import { FirstColumnPadCalculator } from "./firstColumnPadCalculator";
 import { LastColumnPadCalculator } from "./lastColumnPadCalculator";
 import { MiddleColumnPadCalculator } from "./middleColumnPadCalculator";
 
-export class ColumnBasedPadCalculatorSelector {
+export class PadCalculatorSelector {
     public select(table: Table,  column: number) : BasePadCalculator {
         if (column == 0) return new FirstColumnPadCalculator();
         if (column == table.columnCount - 1) return new LastColumnPadCalculator();

src/padCalculation/separatorPadCalculator.ts

@@ -1,12 +1,12 @@
 import { PadCalculator } from "./padCalculator";
 import { ContentPadCalculator } from "./contentPadCalculator";
 import { Table } from "../models/table";
-import { ColumnBasedPadCalculatorSelector } from "./columnBasedPadCalculatorSelector";
+import { PadCalculatorSelector } from "./padCalculatorSelector";
 
 export class SeparatorPadCalculator extends ContentPadCalculator implements PadCalculator  {
 
     constructor(
-        padCalculatorSelector: ColumnBasedPadCalculatorSelector,
+        padCalculatorSelector: PadCalculatorSelector,
         paddingChar: string) 
     {
         super(padCalculatorSelector, paddingChar);

test/systemTests/tableRangePrettyfierFactory.ts

@@ -18,7 +18,7 @@ import { TrimmerTransformer } from '../../src/modelFactory/transformers/trimmerT
 import { BorderTransformer } from '../../src/modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../../src/modelFactory/selectionInterpreter';
 import { SeparatorPadCalculator } from '../../src/padCalculation/separatorPadCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../../src/padCalculation/columnBasedPadCalculatorSelector';
+import { PadCalculatorSelector } from '../../src/padCalculation/padCalculatorSelector';
 
 export class PrettyfierFromFile {
     private readonly _logger: ILogger;
@@ -61,8 +61,8 @@ export class PrettyfierFromFile {
             ),
             new TableValidator(new SelectionInterpreter()),
             new TableViewModelFactory(new RowViewModelFactory(
-                new ContentPadCalculator(new ColumnBasedPadCalculatorSelector(), " "), 
-                new SeparatorPadCalculator(new ColumnBasedPadCalculatorSelector(), "-")
+                new ContentPadCalculator(new PadCalculatorSelector(), " "), 
+                new SeparatorPadCalculator(new PadCalculatorSelector(), "-")
             )),
             new TableStringWriter(),
             [ this._logger ]

test/unitTests/padCalculation/contentPadCalculator.test.ts

@@ -1,21 +1,63 @@
 import * as assert from 'assert';
 import { assertExt } from "../../assertExtensions";
+import { IMock, Mock, It, Times } from 'typemoq';
 import { ContentPadCalculator } from "../../../src/padCalculation/contentPadCalculator";
 import { Table } from '../../../src/models/table';
 import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
+import { PadCalculatorSelector } from '../../../src/padCalculation/padCalculatorSelector';
+import { BasePadCalculator } from '../../../src/padCalculation/basePadCalculator';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
 
 suite("ContentPadCalculator tests", () => {
 
+    let _selector: IMock<PadCalculatorSelector>;
+    let _mockCalculator: IMock<BasePadCalculator>;
+
+    setup(() => {
+        _selector = Mock.ofType<PadCalculatorSelector>();
+        _mockCalculator = Mock.ofType<BasePadCalculator>();
+    });
+
+    test("getLeftPadding() Uses selector and returns left padding from the pad calculator chosen by the selector", () => {
+        const sut = createCalculator();
+        const table = tableFor([
+            [ "aaaaa", "bbbbb", "ccccc" ],
+            [ "aaaaa", "bbbbb", "ccccc" ]
+        ]);
+        _selector.setup(_ => _.select(table, It.isAny())).returns(() => _mockCalculator.object).verifiable(Times.once());
+        _mockCalculator.setup(_ => _.getLeftPadding(It.isAny(), table, It.isAny())).returns(() => "test").verifiable(Times.once());
+
+        const pad = sut.getLeftPadding(table, 1, 2);
+
+        assert.equal(pad, "test");
+        _selector.verifyAll();
+        _mockCalculator.verifyAll();
+    });
+
+    test("getRightPadding() Uses selector and returns right padding from the pad calculator chosen by the selector", () => {
+        const sut = createCalculator();
+        const table = tableFor([
+            [ "aaaaa", "bbbbb", "ccccc" ],
+            [ "aaaaa", "bbbbb", "ccccc" ]
+        ]);
+        _selector.setup(_ => _.select(table, It.isAny())).returns(() => _mockCalculator.object).verifiable(Times.once());
+        _mockCalculator.setup(_ => _.getRightPadding(It.isAny(), table, 1, 2)).returns(() => "foo bar").verifiable(Times.once());
+
+        const pad = sut.getRightPadding(table, 1, 2);
+
+        assert.equal(pad, "foo bar");
+        _selector.verifyAll();
+        _mockCalculator.verifyAll();
+    });
+
     function tableFor(rows: string[][]) {
         const alignments: Alignment[] = rows[0].map(r => Alignment.Left);
         let table = new Table(rows.map(row => row.map(c  => new Cell(c))), alignments);
         return table;
     }
 
     function createCalculator(): PadCalculator { 
-        return new ContentPadCalculator(new ColumnBasedPadCalculatorSelector(), " "); 
+        return new ContentPadCalculator(_selector.object, " "); 
     }
 });

test/unitTests/padCalculation/firstColumnPadCalculator.test.ts

@@ -5,7 +5,7 @@ import { Table } from '../../../src/models/table';
 import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
+import { PadCalculatorSelector } from '../../../src/padCalculation/padCalculatorSelector';
 import { FirstColumnPadCalculator } from '../../../src/padCalculation/firstColumnPadCalculator';
 
 suite("FirstColumnPadCalculator tests", () => {

test/unitTests/padCalculation/lastColumnPadCalculator.test.ts

@@ -5,7 +5,7 @@ import { Table } from '../../../src/models/table';
 import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
+import { PadCalculatorSelector } from '../../../src/padCalculation/padCalculatorSelector';
 import { LastColumnPadCalculator } from '../../../src/padCalculation/lastColumnPadCalculator';
 
 suite("LastColumnPadCalculator tests", () => {

test/unitTests/padCalculation/middleColumnPadCalculator.test.ts

@@ -5,7 +5,7 @@ import { Table } from '../../../src/models/table';
 import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
+import { PadCalculatorSelector } from '../../../src/padCalculation/padCalculatorSelector';
 import { MiddleColumnPadCalculator } from '../../../src/padCalculation/middleColumnPadCalculator';
 
 suite("MiddleColumnPadCalculator tests", () => {

test/unitTests/padCalculation/separatorPadCalculator.test.ts

@@ -5,7 +5,7 @@ import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
 import { SeparatorPadCalculator } from '../../../src/padCalculation/separatorPadCalculator';
-import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
+import { PadCalculatorSelector } from '../../../src/padCalculation/padCalculatorSelector';
 
 suite("SeparatorPadCalculator tests", () => {
 
@@ -150,6 +150,6 @@ suite("SeparatorPadCalculator tests", () => {
     }
 
     function createCalculator(): PadCalculator { 
-        return new SeparatorPadCalculator(new ColumnBasedPadCalculatorSelector(), "-");
+        return new SeparatorPadCalculator(new PadCalculatorSelector(), "-");
     }
 });