Skip to content

Commit 470a4ef

Browse files
darkrisztydarkriszty
committed
Replace deprecated assert.equal with assert.strictEqual
1 parent bc30181 commit 470a4ef

29 files changed

Lines changed: 251 additions & 251 deletions

‎test/assertExtensions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import * as assert from "assert";
22

33
export class assertExt {
44
public static isNotNull(object: any): void {
5-
assert.equal(object != null, true);
5+
assert.strictEqual(object != null, true);
66
}
77
}

‎test/systemTests/vsPrettyfierFromFile.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ export class VsPrettyfierFromFile {
4949
const expectedLines = expected.split(/\r\n|\r|\n/);
5050
const actualLines = actual.split(/\r\n|\r|\n/);
5151

52-
assert.equal(actualLines.length, expectedLines.length);
52+
assert.strictEqual(actualLines.length, expectedLines.length);
5353
for (let i = 0; i < actualLines.length; i++)
54-
assert.equal(actualLines[i], expectedLines[i]);
54+
assert.strictEqual(actualLines[i], expectedLines[i]);
5555
}
5656

5757
private formatFile(doc: vscode.TextDocument): vscode.TextEdit[] {

‎test/unitTests/modelFactory/alignmentFactory.test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ suite("AlignmentFactory tests", () => {
1616
const sut = createFactory();
1717

1818
const alignments = sut.createAlignments(separatorCells);
19-
assert.equal(alignments.length, 3);
20-
assert.equal(alignments[0], Alignment.NotSet);
21-
assert.equal(alignments[1], Alignment.NotSet);
22-
assert.equal(alignments[2], Alignment.NotSet);
19+
assert.strictEqual(alignments.length, 3);
20+
assert.strictEqual(alignments[0], Alignment.NotSet);
21+
assert.strictEqual(alignments[1], Alignment.NotSet);
22+
assert.strictEqual(alignments[2], Alignment.NotSet);
2323
});
2424

2525
test("createAlignments() with separators having mixed alignments returns expected alignments", () => {
2626
const separatorCells: string[] = [":---:", ":-", ":---", "----", "-:", ":-:"];
2727
const sut = createFactory();
2828

2929
const alignments = sut.createAlignments(separatorCells);
30-
assert.equal(alignments.length, 6);
31-
assert.equal(alignments[0], Alignment.Center);
32-
assert.equal(alignments[1], Alignment.Left);
33-
assert.equal(alignments[2], Alignment.Left);
34-
assert.equal(alignments[3], Alignment.NotSet);
35-
assert.equal(alignments[4], Alignment.Right);
36-
assert.equal(alignments[5], Alignment.Center);
30+
assert.strictEqual(alignments.length, 6);
31+
assert.strictEqual(alignments[0], Alignment.Center);
32+
assert.strictEqual(alignments[1], Alignment.Left);
33+
assert.strictEqual(alignments[2], Alignment.Left);
34+
assert.strictEqual(alignments[3], Alignment.NotSet);
35+
assert.strictEqual(alignments[4], Alignment.Right);
36+
assert.strictEqual(alignments[5], Alignment.Center);
3737
});
3838

3939
function createFactory(): AlignmentFactory {

‎test/unitTests/modelFactory/selectionInterpreter.test.ts‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ suite("SelectionInterpreter tests", () => {
99

1010
const rows = sut.allRows(text);
1111

12-
assert.equal(rows.length, 2);
13-
assert.equal(rows[0].length, 1);
14-
assert.equal(rows[1].length, 1);
15-
assert.equal(rows[0][0], "line1");
16-
assert.equal(rows[1][0], "line2");
12+
assert.strictEqual(rows.length, 2);
13+
assert.strictEqual(rows[0].length, 1);
14+
assert.strictEqual(rows[1].length, 1);
15+
assert.strictEqual(rows[0][0], "line1");
16+
assert.strictEqual(rows[1][0], "line2");
1717
});
1818

1919
test("allRows() splits text by linux-style line endings", () => {
@@ -22,11 +22,11 @@ suite("SelectionInterpreter tests", () => {
2222

2323
const rows = sut.allRows(text);
2424

25-
assert.equal(rows.length, 2);
26-
assert.equal(rows[0].length, 1);
27-
assert.equal(rows[1].length, 1);
28-
assert.equal(rows[0][0], "foo");
29-
assert.equal(rows[1][0], "bar");
25+
assert.strictEqual(rows.length, 2);
26+
assert.strictEqual(rows[0].length, 1);
27+
assert.strictEqual(rows[1].length, 1);
28+
assert.strictEqual(rows[0][0], "foo");
29+
assert.strictEqual(rows[1][0], "bar");
3030
});
3131

3232
test("allRows() splits each line by | cell separator", () => {
@@ -35,13 +35,13 @@ suite("SelectionInterpreter tests", () => {
3535

3636
const rows = sut.allRows(text);
3737

38-
assert.equal(rows.length, 2);
39-
assert.equal(rows[0].length, 2);
40-
assert.equal(rows[1].length, 2);
41-
assert.equal(rows[0][0], "h1");
42-
assert.equal(rows[0][1], "h2");
43-
assert.equal(rows[1][0], "v1");
44-
assert.equal(rows[1][1], "v2");
38+
assert.strictEqual(rows.length, 2);
39+
assert.strictEqual(rows[0].length, 2);
40+
assert.strictEqual(rows[1].length, 2);
41+
assert.strictEqual(rows[0][0], "h1");
42+
assert.strictEqual(rows[0][1], "h2");
43+
assert.strictEqual(rows[1][0], "v1");
44+
assert.strictEqual(rows[1][1], "v2");
4545
});
4646

4747
test("allRows() line starting and ending with pipe is correctly splitted", () => {
@@ -50,14 +50,14 @@ suite("SelectionInterpreter tests", () => {
5050

5151
const rows = sut.allRows(text);
5252

53-
assert.equal(rows.length, 1);
54-
assert.equal(rows[0].length, 6);
55-
assert.equal(rows[0][0], "");
56-
assert.equal(rows[0][1], "h1");
57-
assert.equal(rows[0][2], "h2");
58-
assert.equal(rows[0][3], "h3");
59-
assert.equal(rows[0][4], "h4");
60-
assert.equal(rows[0][5], "");
53+
assert.strictEqual(rows.length, 1);
54+
assert.strictEqual(rows[0].length, 6);
55+
assert.strictEqual(rows[0][0], "");
56+
assert.strictEqual(rows[0][1], "h1");
57+
assert.strictEqual(rows[0][2], "h2");
58+
assert.strictEqual(rows[0][3], "h3");
59+
assert.strictEqual(rows[0][4], "h4");
60+
assert.strictEqual(rows[0][5], "");
6161
});
6262

6363
test("allRows() doesn't consider \\| as separator", () => {
@@ -66,13 +66,13 @@ suite("SelectionInterpreter tests", () => {
6666

6767
const rows = sut.allRows(text);
6868

69-
assert.equal(rows.length, 2);
70-
assert.equal(rows[0].length, 2);
71-
assert.equal(rows[1].length, 2);
72-
assert.equal(rows[0][0], "h1");
73-
assert.equal(rows[0][1], "h2\\|still\\|h2");
74-
assert.equal(rows[1][0], "v1");
75-
assert.equal(rows[1][1], "v2");
69+
assert.strictEqual(rows.length, 2);
70+
assert.strictEqual(rows[0].length, 2);
71+
assert.strictEqual(rows[1].length, 2);
72+
assert.strictEqual(rows[0][0], "h1");
73+
assert.strictEqual(rows[0][1], "h2\\|still\\|h2");
74+
assert.strictEqual(rows[1][0], "v1");
75+
assert.strictEqual(rows[1][1], "v2");
7676
});
7777

7878
test("allRows() doesn't consider separator that's in a `code block` #1", () => {
@@ -81,9 +81,9 @@ suite("SelectionInterpreter tests", () => {
8181

8282
const rows = sut.allRows(text);
8383

84-
assert.equal(rows.length, 1);
85-
assert.equal(rows[0].length, 1);
86-
assert.equal(rows[0][0], "`h1|h2|h3`");
84+
assert.strictEqual(rows.length, 1);
85+
assert.strictEqual(rows[0].length, 1);
86+
assert.strictEqual(rows[0][0], "`h1|h2|h3`");
8787
});
8888

8989
test("allRows() doesn't consider separator that's in a `code block` #2", () => {
@@ -92,11 +92,11 @@ suite("SelectionInterpreter tests", () => {
9292

9393
const rows = sut.allRows(text);
9494

95-
assert.equal(rows.length, 1);
96-
assert.equal(rows[0].length, 3);
97-
assert.equal(rows[0][0], "h1");
98-
assert.equal(rows[0][1], "h2`|still|h2`");
99-
assert.equal(rows[0][2], "h3");
95+
assert.strictEqual(rows.length, 1);
96+
assert.strictEqual(rows[0].length, 3);
97+
assert.strictEqual(rows[0][0], "h1");
98+
assert.strictEqual(rows[0][1], "h2`|still|h2`");
99+
assert.strictEqual(rows[0][2], "h3");
100100
});
101101

102102
test("allRows() doesn't consider separator that's in a `code block` #3", () => {
@@ -105,11 +105,11 @@ suite("SelectionInterpreter tests", () => {
105105

106106
const rows = sut.allRows(text);
107107

108-
assert.equal(rows.length, 1);
109-
assert.equal(rows[0].length, 3);
110-
assert.equal(rows[0][0], "`h1|h1`");
111-
assert.equal(rows[0][1], "h2");
112-
assert.equal(rows[0][2], "h3`|h3`");
108+
assert.strictEqual(rows.length, 1);
109+
assert.strictEqual(rows[0].length, 3);
110+
assert.strictEqual(rows[0][0], "`h1|h1`");
111+
assert.strictEqual(rows[0][1], "h2");
112+
assert.strictEqual(rows[0][2], "h3`|h3`");
113113
});
114114

115115
test("separator() returns the first row", () => {
@@ -118,9 +118,9 @@ suite("SelectionInterpreter tests", () => {
118118

119119
const separator = sut.separator(text);
120120

121-
assert.equal(separator.length, 2);
122-
assert.equal(separator[0], ":-");
123-
assert.equal(separator[1], "-");
121+
assert.strictEqual(separator.length, 2);
122+
assert.strictEqual(separator[0], ":-");
123+
assert.strictEqual(separator[1], "-");
124124
});
125125

126126
test("allRows() in strict mode returns empty lines", () => {
@@ -129,12 +129,12 @@ suite("SelectionInterpreter tests", () => {
129129

130130
const rows = sut.allRows(text);
131131

132-
assert.equal(rows.length, 3);
133-
assert.equal(rows[0].length, 1);
134-
assert.equal(rows[1].length, 1);
135-
assert.equal(rows[2].length, 0);
136-
assert.equal(rows[0][0], "line1");
137-
assert.equal(rows[1][0], "line2");
132+
assert.strictEqual(rows.length, 3);
133+
assert.strictEqual(rows[0].length, 1);
134+
assert.strictEqual(rows[1].length, 1);
135+
assert.strictEqual(rows[2].length, 0);
136+
assert.strictEqual(rows[0][0], "line1");
137+
assert.strictEqual(rows[1][0], "line2");
138138
});
139139

140140
test("allRows() in non-strict mode skips empty lines", () => {
@@ -143,11 +143,11 @@ suite("SelectionInterpreter tests", () => {
143143

144144
const rows = sut.allRows(text);
145145

146-
assert.equal(rows.length, 2);
147-
assert.equal(rows[0].length, 1);
148-
assert.equal(rows[1].length, 1);
149-
assert.equal(rows[0][0], "line1");
150-
assert.equal(rows[1][0], "line2");
146+
assert.strictEqual(rows.length, 2);
147+
assert.strictEqual(rows[0].length, 1);
148+
assert.strictEqual(rows[1].length, 1);
149+
assert.strictEqual(rows[0][0], "line1");
150+
assert.strictEqual(rows[1][0], "line2");
151151
});
152152

153153
function createSut(strict: boolean = false): SelectionInterpreter {

‎test/unitTests/modelFactory/tableFactory.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ suite("TableFactory tests", () => {
3939
const rows: Row[] = sut.getModel(document, new Range(2, 4)).rows;
4040

4141
assertExt.isNotNull(rows);
42-
assert.equal(rows.length, 2);
43-
assert.equal(rows.every(r => r.cells.length == 4), true);
42+
assert.strictEqual(rows.length, 2);
43+
assert.strictEqual(rows.every(r => r.cells.length == 4), true);
4444
});
4545

4646
test("getModel() removes separator row and returns expected cells", () => {
@@ -58,16 +58,16 @@ suite("TableFactory tests", () => {
5858
const rows: Row[] = sut.getModel(document, document.fullRange).rows;
5959

6060
assertExt.isNotNull(rows);
61-
assert.equal(rows.length, 2);
62-
assert.equal(rows.every(r => r.cells.length == 4), true);
63-
assert.equal(rows[0].cells[0].getValue(), " c1 ");
64-
assert.equal(rows[0].cells[1].getValue(), " c2 ");
65-
assert.equal(rows[0].cells[2].getValue(), " ");
66-
assert.equal(rows[0].cells[3].getValue(), " c4");
67-
assert.equal(rows[1].cells[0].getValue(), " a ");
68-
assert.equal(rows[1].cells[1].getValue(), " b ");
69-
assert.equal(rows[1].cells[2].getValue(), "");
70-
assert.equal(rows[1].cells[3].getValue(), " d");
61+
assert.strictEqual(rows.length, 2);
62+
assert.strictEqual(rows.every(r => r.cells.length == 4), true);
63+
assert.strictEqual(rows[0].cells[0].getValue(), " c1 ");
64+
assert.strictEqual(rows[0].cells[1].getValue(), " c2 ");
65+
assert.strictEqual(rows[0].cells[2].getValue(), " ");
66+
assert.strictEqual(rows[0].cells[3].getValue(), " c4");
67+
assert.strictEqual(rows[1].cells[0].getValue(), " a ");
68+
assert.strictEqual(rows[1].cells[1].getValue(), " b ");
69+
assert.strictEqual(rows[1].cells[2].getValue(), "");
70+
assert.strictEqual(rows[1].cells[3].getValue(), " d");
7171
});
7272

7373
test("getModel() calls alignmentFactory to create alignments for the table columns", () => {
@@ -85,7 +85,7 @@ suite("TableFactory tests", () => {
8585
const sut = createFactory();
8686

8787
const actualAlignments: Alignment[] = sut.getModel(document, document.fullRange).alignments;
88-
assert.equal(expectedAlignmets.length == actualAlignments.length && expectedAlignmets.every((l,i) => l === actualAlignments[i]), true);
88+
assert.strictEqual(expectedAlignmets.length == actualAlignments.length && expectedAlignmets.every((l,i) => l === actualAlignments[i]), true);
8989
_alignmentFactoryMock.verifyAll();
9090
});
9191

@@ -104,7 +104,7 @@ suite("TableFactory tests", () => {
104104
const result = sut.getModel(document, document.fullRange);
105105

106106
_transformer.verify(_ => _.process(It.isAny()), Times.once());
107-
assert.equal(result, transformedTable);
107+
assert.strictEqual(result, transformedTable);
108108
});
109109

110110
test("getModel() calls selection interpreter to split lines for each line (incl. separator)", () => {

0 commit comments

Comments
 (0)