Clean up tests

darkriszty · darkriszty · commit cd2d22d92b80 · 2018-09-15T14:16:23.000+03:00
diff --git a/test/systemTests/tableRangePrettyfierFactory.ts b/test/systemTests/tableRangePrettyfierFactory.ts
@@ -2,7 +2,6 @@ import * as assert from 'assert';
 import * as vscode from "vscode";
 import * as fs from 'fs';
 import * as path from 'path';
-import { Mock } from "typemoq";
 import { TableRangePrettyfier } from "../../src/extension/tableRangePrettyfier";
 import { TableFactory } from "../../src/modelFactory/tableFactory";
 import { AlignmentFactory } from "../../src/modelFactory/alignmentFactory";
diff --git a/test/unitTests/diagnostics/selectionBasedLogToogler.test.ts b/test/unitTests/diagnostics/selectionBasedLogToogler.test.ts
@@ -1,6 +1,4 @@
-import * as assert from "assert";
-import * as vscode from "vscode";
-import { IMock, Mock, It, Times } from "typemoq";
+import { IMock, Mock, Times } from "typemoq";
 import { SelectionBasedLogToogler } from "../../../src/diagnostics/selectionBasedLogToogler";
 import { MarkdownTextDocumentStub } from "../../stubs/markdownTextDocumentStub";
 import { ILogger } from "../../../src/diagnostics/logger";
diff --git a/test/unitTests/extension/extension.test.ts b/test/unitTests/extension/extension.test.ts
@@ -11,7 +11,7 @@ suite("Extension Tests", () => {
     test("Extension gets activated", () => {
          vscode.extensions.getExtension(_extensionName)
             .activate()
-            .then((publicApi) => {
+            .then(() => {
                     assert.ok(true);
                 }, rejectReason => {
                     assert.fail(0, 1, `Extension not activated. Reason: ${rejectReason}`, null);
diff --git a/test/unitTests/extension/tableRangePrettyfier.test.ts b/test/unitTests/extension/tableRangePrettyfier.test.ts
@@ -1,17 +1,12 @@
 import * as assert from "assert";
-import * as vscode from "vscode";
-import * as typeMock from "typemoq";
 import { IMock, Mock, It, Times } from "typemoq";
 import { TableRangePrettyfier } from "../../../src/extension/tableRangePrettyfier";
 import { TableFactory } from "../../../src/modelFactory/tableFactory";
 import { TableValidator } from "../../../src/modelFactory/tableValidator";
 import { TableViewModelFactory } from "../../../src/viewModelFactories/tableViewModelFactory";
 import { TableStringWriter } from "../../../src/writers/tableStringWriter";
 import { ILogger } from "../../../src/diagnostics/logger";
-import { Table } from "../../../src/models/table";
-import { Alignment } from "../../../src/models/alignment";
 import { MarkdownTextDocumentStub } from "../../stubs/markdownTextDocumentStub";
-import { CancellationTokenSource } from "vscode";
 import { TableViewModel } from "../../../src/viewModels/tableViewModel";
 
 suite("TableRangePrettyfier tests", () => {
@@ -76,7 +71,6 @@ suite("TableRangePrettyfier tests", () => {
     test("provideDocumentRangeFormattingEdits() result contains table writer output", () => {
         const sut = createSut();
         const document = makeDocument("hello world");
-        const viewModel = new TableViewModel();
         _tableValidator.setup(_ => _.isValid(It.isAny())).returns(() => true);
         _writer.setup(_ => _.writeTable(It.isAny())).returns(() => "foo bar");
 
diff --git a/test/unitTests/modelFactory/alignmentFactory.test.ts b/test/unitTests/modelFactory/alignmentFactory.test.ts
@@ -1,5 +1,4 @@
 import * as assert from 'assert';
-import { assertExt } from "../../assertExtensions";
 import { AlignmentFactory } from "../../../src/modelFactory/alignmentFactory";
 import { Alignment } from "../../../src/models/alignment";
 
diff --git a/test/unitTests/modelFactory/tableFactory.test.ts b/test/unitTests/modelFactory/tableFactory.test.ts
@@ -3,7 +3,6 @@ import { IMock, Mock, It, Times } from "typemoq";
 import { Alignment } from "../../../src/models/alignment";
 import { TableFactory } from "../../../src/modelFactory/tableFactory";
 import { AlignmentFactory } from "../../../src/modelFactory/alignmentFactory";
-import { TableValidator } from "../../../src/modelFactory/tableValidator";
 import { assertExt } from "../../assertExtensions";
 import { Transformer } from '../../../src/modelFactory/transformers/transformer';
 import { SelectionInterpreter } from '../../../src/modelFactory/selectionInterpreter';
diff --git a/test/unitTests/modelFactory/tableValidator.test.ts b/test/unitTests/modelFactory/tableValidator.test.ts
@@ -1,8 +1,6 @@
 import * as assert from 'assert';
 import { IMock, Mock, It, Times } from 'typemoq';
-import { Table } from "../../../src/models/table";
 import { TableValidator } from "../../../src/modelFactory/tableValidator";
-import { Alignment } from "../../../src/models/alignment";
 import { SelectionInterpreter } from '../../../src/modelFactory/selectionInterpreter';
 
 suite("TableValidator tests", () => {
@@ -153,7 +151,6 @@ suite("TableValidator tests", () => {
             .verifiable(Times.once());
         const sut = createSut(selectionInterpreter.object);
 
-        const isValid: boolean = sut.isValid("test");
 
         selectionInterpreter.verifyAll();
     });
diff --git a/test/unitTests/padCalculation/center/firstColumnPadCalculator.test.ts b/test/unitTests/padCalculation/center/firstColumnPadCalculator.test.ts
@@ -1,11 +1,7 @@
 import * as assert from 'assert';
-import { assertExt } from "../../../assertExtensions";
-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 { PadCalculator } from '../../../../src/padCalculation/padCalculator';
-import { PadCalculatorSelector } from '../../../../src/padCalculation/padCalculatorSelector';
 import { FirstColumnPadCalculator } from '../../../../src/padCalculation/center/firstColumnPadCalculator';
 
 suite("CenterAlign - FirstColumnPadCalculator tests", () => {
@@ -158,7 +154,7 @@ suite("CenterAlign - FirstColumnPadCalculator tests", () => {
     }
 
     function tableFor(rows: string[][]) {
-        const alignments: Alignment[] = rows[0].map(r => Alignment.Center);
+        const alignments: Alignment[] = rows[0].map(() => Alignment.Center);
         let table = new Table(rows.map(row => row.map(c  => new Cell(c))), alignments);
         return table;
     }
diff --git a/test/unitTests/padCalculation/contentPadCalculator.test.ts b/test/unitTests/padCalculation/contentPadCalculator.test.ts
@@ -1,5 +1,4 @@
 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';
@@ -52,7 +51,7 @@ suite("ContentPadCalculator tests", () => {
     });
 
     function tableFor(rows: string[][]) {
-        const alignments: Alignment[] = rows[0].map(r => Alignment.Left);
+        const alignments: Alignment[] = rows[0].map(() => Alignment.Left);
         let table = new Table(rows.map(row => row.map(c  => new Cell(c))), alignments);
         return table;
     }
diff --git a/test/unitTests/viewModelFactories/rowViewModelFactory.test.ts b/test/unitTests/viewModelFactories/rowViewModelFactory.test.ts
@@ -6,7 +6,7 @@ import { RowViewModelFactory } from '../../../src/viewModelFactories/rowViewMode
 import { Table } from '../../../src/models/table';
 import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
-import { AlignmentMarkerStrategy, IAlignmentMarker, NotSetAlignmentMarker } from '../../../src/viewModelFactories/alignmentMarking';
+import { AlignmentMarkerStrategy, IAlignmentMarker } from '../../../src/viewModelFactories/alignmentMarking';
 import { RowViewModel } from '../../../src/viewModels/rowViewModel';
 
 suite("RowViewModelFactory.buildRow() tests", () => {
@@ -21,7 +21,6 @@ suite("RowViewModelFactory.buildRow() tests", () => {
         const row = 1;
         const table = threeColumnTable();
 
-        const rowViewModel = sut.buildRow(row, table);
 
         _contentPadCalculator.verify(_ => _.getLeftPadding(table, row, 0), Times.once());
         _contentPadCalculator.verify(_ => _.getLeftPadding(table, row, 1), Times.once());
@@ -103,7 +102,6 @@ suite("RowViewModelFactory.buildSeparator() tests", () => {
             new RowViewModel(["abcd", "efgh", "xyz"])
         ];
 
-        const separator = sut.buildSeparator(rows, table);
 
         alignmentStrategy.verifyAll();
         alignmentMarker.verifyAll();
@@ -125,7 +123,7 @@ function threeColumnTableWithEmptyMiddleColumn(alignment: Alignment = Alignment.
 }
 
 function tableFor(rows: string[][], alignment: Alignment) {
-    const alignments: Alignment[] = rows[0].map(r => alignment);
+    const alignments: Alignment[] = rows[0].map(() => alignment);
     let table = new Table(rows.map(row => row.map(c  => new Cell(c))), alignments);
     return table;
 }
diff --git a/test/unitTests/viewModelFactories/tableViewModelFactory.test.ts b/test/unitTests/viewModelFactories/tableViewModelFactory.test.ts
@@ -3,11 +3,9 @@ import { assertExt } from "../../assertExtensions";
 import { IMock, Mock, It, Times } from "typemoq";
 import { Table } from "../../../src/models/table";
 import { Alignment } from "../../../src/models/alignment";
-import { TableValidator } from "../../../src/modelFactory/tableValidator";
 import { TableViewModel } from "../../../src/viewModels/tableViewModel";
 import { RowViewModel } from "../../../src/viewModels/rowViewModel";
 import { RowViewModelFactory } from "../../../src/viewModelFactories/rowViewModelFactory";
-import { ContentPadCalculator } from "../../../src/padCalculation/contentPadCalculator";
 import { TableViewModelFactory } from "../../../src/viewModelFactories/tableViewModelFactory";
 import { Cell } from "../../../src/models/cell";
 
@@ -71,8 +69,6 @@ suite("TableViewModelFactory tests", () => {
             ["v3", "v4"],
         ]);
         table.hasLeftBorder = true;
-        const expectedSeparator = new RowViewModel([]);
-        const expectedRow = new RowViewModel([]);
 
         const tableVm = createViewModelFactory().build(table);
 
@@ -86,8 +82,6 @@ suite("TableViewModelFactory tests", () => {
             ["v1", "v2"],
             ["v3", "v4"],
         ]);
-        const expectedSeparator = new RowViewModel([]);
-        const expectedRow = new RowViewModel([]);
 
         const tableVm = createViewModelFactory().build(table);
 
@@ -102,8 +96,6 @@ suite("TableViewModelFactory tests", () => {
             ["v3", "v4"],
         ]);
         table.hasRightBorder = true;
-        const expectedSeparator = new RowViewModel([]);
-        const expectedRow = new RowViewModel([]);
 
         const tableVm = createViewModelFactory().build(table);
 
@@ -117,8 +109,6 @@ suite("TableViewModelFactory tests", () => {
             ["v1", "v2"],
             ["v3", "v4"],
         ]);
-        const expectedSeparator = new RowViewModel([]);
-        const expectedRow = new RowViewModel([]);
 
         const tableVm = createViewModelFactory().build(table);
 
@@ -127,17 +117,11 @@ suite("TableViewModelFactory tests", () => {
     });
 
     function tableFor(rows: string[][]) {
-        const alignments: Alignment[] = rows[0].map(r => Alignment.Left);
+        const alignments: Alignment[] = rows[0].map(() => Alignment.Left);
         let table = new Table(rows.map(row => row.map(c  => new Cell(c))), alignments);
         return table;
     }
     
-    function assertViewModelPropertiesSet(viewModel: TableViewModel) {
-        assertExt.isNotNull(viewModel);
-        assertExt.isNotNull(viewModel.header);
-        assertExt.isNotNull(viewModel.separator);
-        assertExt.isNotNull(viewModel.rows);
-    }
 
     function createViewModelFactory(): TableViewModelFactory {
         return new TableViewModelFactory(_rowVmb.object);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as assert from 'assert';`
`2`		`-import { assertExt } from "../../assertExtensions";`
`3`	`2`	`import { AlignmentFactory } from "../../../src/modelFactory/alignmentFactory";`
`4`	`3`	`import { Alignment } from "../../../src/models/alignment";`
`5`	`4`