Skip to content

Commit 4798fda

Browse files
JordanBoltonMNJordanBoltonMN
authored
Rename test files (#391)
* initial commit * tests run w/o issues * reverting accidental commit * slight change
1 parent e866a2d commit 4798fda

30 files changed

+76
-78
lines changed

‎src/test/testUtils/testHelperUtils.ts‎ renamed to ‎src/test/helperUtils.ts‎

File renamed without changes.

‎src/test/libraryTest/common/cancellationToken.ts‎ renamed to ‎src/test/libraryTest/common/cancellationToken.test.ts‎

File renamed without changes.

‎src/test/libraryTest/common/stringUtils.ts‎ renamed to ‎src/test/libraryTest/common/stringUtils.test.ts‎

File renamed without changes.

‎src/test/libraryTest/lexer/error.ts‎ renamed to ‎src/test/libraryTest/lexer/lexError.test.ts‎

File renamed without changes.

‎src/test/libraryTest/lexer/incremental.ts‎ renamed to ‎src/test/libraryTest/lexer/lexIncremental.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import "mocha";
55
import { expect } from "chai";
66

77
import { Lexer, ResultUtils } from "../../..";
8-
import { assertGetLexOk } from "./common";
8+
import { assertGetLexOk } from "../../testUtils/lexTestUtils";
99

1010
const LINE_TERMINATOR: string = `\n`;
1111

‎src/test/libraryTest/lexer/multilineTokens.ts‎ renamed to ‎src/test/libraryTest/lexer/lexMultilineTokens.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
assertGetLineTokenMatch,
1313
assertGetSnapshotAbridgedComments,
1414
assertGetSnapshotAbridgedTokens,
15-
} from "./common";
15+
} from "../../testUtils/lexTestUtils";
1616
import { Language } from "../../..";
1717

1818
const LINE_TERMINATOR: string = "\n";

‎src/test/libraryTest/lexer/simple.ts‎ renamed to ‎src/test/libraryTest/lexer/lexSimple.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import "mocha";
55
import { expect } from "chai";
66

7-
import { assertGetSnapshotAbridgedTokens } from "./common";
7+
import { assertGetSnapshotAbridgedTokens } from "../../testUtils/lexTestUtils";
88
import { Language } from "../../..";
99

1010
describe(`Lexer.Simple.TokenKinds`, () => {

‎src/test/libraryTest/parser/customParser.ts‎ renamed to ‎src/test/libraryTest/parser/customParser.test.ts‎

File renamed without changes.

‎src/test/libraryTest/parser/error.ts‎ renamed to ‎src/test/libraryTest/parser/error.test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {
1313
ParseStateUtils,
1414
RecursiveDescentParser,
1515
} from "../../../powerquery-parser/parser";
16+
import { AssertTestUtils } from "../../testUtils";
1617
import { Ast } from "../../../powerquery-parser/language";
17-
import { TestAssertUtils } from "../../testUtils";
1818

1919
const DefaultSettingsWithStrict: Settings = {
2020
...DefaultSettings,
@@ -30,7 +30,7 @@ const DefaultSettingsWithStrict: Settings = {
3030

3131
async function assertGetCsvContinuationError(text: string): Promise<ParseError.ExpectedCsvContinuationError> {
3232
const innerError: ParseError.TInnerParseError = (
33-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
33+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
3434
).innerError;
3535

3636
Assert.isTrue(
@@ -46,7 +46,7 @@ describe("Parser.Error", () => {
4646
const text: string = "(optional x, y) => x";
4747

4848
const innerError: ParseError.TInnerParseError = (
49-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
49+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
5050
).innerError;
5151

5252
expect(innerError instanceof ParseError.RequiredParameterAfterOptionalParameterError).to.equal(
@@ -59,7 +59,7 @@ describe("Parser.Error", () => {
5959
const text: string = "let x = [";
6060

6161
const innerError: ParseError.TInnerParseError = (
62-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
62+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
6363
).innerError;
6464

6565
expect(innerError instanceof ParseError.UnterminatedSequence).to.equal(true, innerError.message);
@@ -74,7 +74,7 @@ describe("Parser.Error", () => {
7474
const text: string = "let x = (1";
7575

7676
const innerError: ParseError.TInnerParseError = (
77-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
77+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
7878
).innerError;
7979

8080
expect(innerError instanceof ParseError.UnterminatedSequence).to.equal(true, innerError.message);
@@ -90,7 +90,7 @@ describe("Parser.Error", () => {
9090
const text: string = "1 1";
9191

9292
const innerError: ParseError.TInnerParseError = (
93-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
93+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
9494
).innerError;
9595

9696
expect(innerError instanceof ParseError.UnusedTokensRemainError).to.equal(true, innerError.message);
@@ -108,7 +108,7 @@ describe("Parser.Error", () => {
108108
const text: string = "a b";
109109

110110
const innerError: ParseError.TInnerParseError = (
111-
await TestAssertUtils.assertGetParseError(customSettings, text)
111+
await AssertTestUtils.assertGetParseError(customSettings, text)
112112
).innerError;
113113

114114
expect(innerError instanceof ParseError.UnusedTokensRemainError).to.equal(true, innerError.message);
@@ -227,7 +227,7 @@ describe("Parser.Error", () => {
227227
const text: string = "let foo = 1 bar = 1 in foo + bar";
228228

229229
const innerError: ParseError.TInnerParseError = (
230-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
230+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
231231
).innerError;
232232

233233
expect(innerError instanceof ParseError.ExpectedClosingTokenKind).to.equal(true, innerError.message);
@@ -237,7 +237,7 @@ describe("Parser.Error", () => {
237237
const text: string = "{1 2}";
238238

239239
const innerError: ParseError.TInnerParseError = (
240-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
240+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
241241
).innerError;
242242

243243
expect(innerError instanceof ParseError.ExpectedClosingTokenKind).to.equal(true, innerError.message);
@@ -247,7 +247,7 @@ describe("Parser.Error", () => {
247247
const text: string = "[foo = 1 bar = 1]";
248248

249249
const innerError: ParseError.TInnerParseError = (
250-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
250+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
251251
).innerError;
252252

253253
expect(innerError instanceof ParseError.ExpectedClosingTokenKind).to.equal(true, innerError.message);
@@ -257,7 +257,7 @@ describe("Parser.Error", () => {
257257
const text: string = "[foo = 1 bar = 2]section baz;";
258258

259259
const innerError: ParseError.TInnerParseError = (
260-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
260+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
261261
).innerError;
262262

263263
expect(innerError instanceof ParseError.ExpectedClosingTokenKind).to.equal(true, innerError.message);
@@ -267,7 +267,7 @@ describe("Parser.Error", () => {
267267
const text: string = "type [foo = number bar = number]";
268268

269269
const innerError: ParseError.TInnerParseError = (
270-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
270+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
271271
).innerError;
272272

273273
expect(innerError instanceof ParseError.ExpectedClosingTokenKind).to.equal(true, innerError.message);
@@ -277,7 +277,7 @@ describe("Parser.Error", () => {
277277
const text: string = "type table [a = 1 b = 2]";
278278

279279
const innerError: ParseError.TInnerParseError = (
280-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
280+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
281281
).innerError;
282282

283283
expect(innerError instanceof ParseError.ExpectedClosingTokenKind).to.equal(true, innerError.message);
@@ -288,7 +288,7 @@ describe("Parser.Error", () => {
288288
const text: string = `try 1 catch (x as number) => 0`;
289289

290290
const innerError: ParseError.TInnerParseError = (
291-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
291+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
292292
).innerError;
293293

294294
expect(innerError instanceof ParseError.InvalidCatchFunctionError).to.equal(true, innerError.message);
@@ -298,7 +298,7 @@ describe("Parser.Error", () => {
298298
const text: string = `try 1 catch (x) as number => 0`;
299299

300300
const innerError: ParseError.TInnerParseError = (
301-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
301+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
302302
).innerError;
303303

304304
expect(innerError instanceof ParseError.InvalidCatchFunctionError).to.equal(true, innerError.message);
@@ -308,7 +308,7 @@ describe("Parser.Error", () => {
308308
const text: string = `try 1 catch (x, y) => 0`;
309309

310310
const innerError: ParseError.TInnerParseError = (
311-
await TestAssertUtils.assertGetParseError(DefaultSettingsWithStrict, text)
311+
await AssertTestUtils.assertGetParseError(DefaultSettingsWithStrict, text)
312312
).innerError;
313313

314314
expect(innerError instanceof ParseError.InvalidCatchFunctionError).to.equal(true, innerError.message);

‎src/test/libraryTest/parser/identifierContextKind.ts‎ renamed to ‎src/test/libraryTest/parser/identifierContextKind.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import "mocha";
55
import { expect } from "chai";
66

77
import { NodeIdMap, NodeIdMapUtils, ParseOk } from "../../../powerquery-parser/parser";
8+
import { AssertTestUtils } from "../../testUtils";
89
import { Ast } from "../../../powerquery-parser/language";
910
import { DefaultSettings } from "../../..";
10-
import { TestAssertUtils } from "../../testUtils";
1111

1212
function assertGetIdentifierByLiteral(parseOk: ParseOk, identifierLiteral: string): Ast.Identifier {
1313
const nodeIdMapCollection: NodeIdMap.Collection = parseOk.state.contextState.nodeIdMapCollection;
@@ -45,14 +45,14 @@ function assertIdentifierIsInContext(
4545

4646
describe("Parser.IdentifierContextKind", () => {
4747
it("let foo = 1 in bar", async () => {
48-
const parseOk: ParseOk = await TestAssertUtils.assertGetParseOk(DefaultSettings, "let foo = 1 in bar");
48+
const parseOk: ParseOk = await AssertTestUtils.assertGetParseOk(DefaultSettings, "let foo = 1 in bar");
4949

5050
assertIdentifierIsInContext(parseOk, "foo", Ast.IdentifierContextKind.Key);
5151
assertIdentifierIsInContext(parseOk, "bar", Ast.IdentifierContextKind.Value);
5252
});
5353

5454
it("let fn = (foo as number) => 1 in 1", async () => {
55-
const parseOk: ParseOk = await TestAssertUtils.assertGetParseOk(
55+
const parseOk: ParseOk = await AssertTestUtils.assertGetParseOk(
5656
DefaultSettings,
5757
"let fn = (foo as number) => 1 in 1",
5858
);
@@ -62,7 +62,7 @@ describe("Parser.IdentifierContextKind", () => {
6262
});
6363

6464
it("let foo = #date in 1", async () => {
65-
const parseOk: ParseOk = await TestAssertUtils.assertGetParseOk(DefaultSettings, "let foo = #date in 1");
65+
const parseOk: ParseOk = await AssertTestUtils.assertGetParseOk(DefaultSettings, "let foo = #date in 1");
6666

6767
assertIdentifierIsInContext(parseOk, "foo", Ast.IdentifierContextKind.Key);
6868
assertIdentifierIsInContext(parseOk, "#date", Ast.IdentifierContextKind.Keyword);

0 commit comments

Comments
 (0)