Skip to content

Commit

Permalink
Baseline config tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@sheetalkamat
sheetalkamat committed Oct 4, 2022
1 parent fc5e72b commit dfd16f5
Show file tree
Hide file tree
Showing 231 changed files with 1,518 additions and 1,128 deletions.
1,107 changes: 147 additions & 960 deletions src/testRunner/unittests/config/commandLineParsing.ts
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/testRunner/unittests/config/initializeTSConfig.ts
View file
Expand Up @@ -4,7 +4,7 @@ namespace ts {
describe(name, () => {
const commandLine = parseCommandLine(commandLinesArgs);
const initResult = generateTSConfig(commandLine.options, commandLine.fileNames, "\n");
const outputFileName = `tsConfig/${name.replace(/[^a-z0-9\-. ]/ig, "")}/tsconfig.json`;
const outputFileName = `config/initTSConfig/${name.replace(/[^a-z0-9\-. ]/ig, "")}/tsconfig.json`;

it(`Correct output for ${outputFileName}`, () => {
Harness.Baseline.runBaseline(outputFileName, initResult, { PrintDiff: true });
Expand Down
2 changes: 1 addition & 1 deletion src/testRunner/unittests/config/showConfig.ts
View file
Expand Up @@ -2,7 +2,7 @@ namespace ts {
describe("unittests:: config:: showConfig", () => {
function showTSConfigCorrectly(name: string, commandLinesArgs: string[], configJson?: object) {
describe(name, () => {
const outputFileName = `showConfig/${name.replace(/[^a-z0-9\-./ ]/ig, "")}/tsconfig.json`;
const outputFileName = `config/showConfig/${name.replace(/[^a-z0-9\-./ ]/ig, "")}/tsconfig.json`;

it(`Correct output for ${outputFileName}`, () => {
const cwd = `/${name}`;
Expand Down
286 changes: 120 additions & 166 deletions src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts
View file
Expand Up @@ -42,190 +42,144 @@ namespace ts {

interface VerifyWatchOptions {
json: object;
expectedOptions: WatchOptions | undefined;
additionalFiles?: vfs.FileSet;
existingWatchOptions?: WatchOptions | undefined;
expectedErrors?: (sourceFile?: SourceFile) => Diagnostic[];
}

function verifyWatchOptions(scenario: () => VerifyWatchOptions[]) {
it("with json api", () => {
for (const { json, expectedOptions, additionalFiles, existingWatchOptions, expectedErrors } of scenario()) {
const parsed = getParsedCommandJson(json, additionalFiles, existingWatchOptions);
assert.deepEqual(parsed.watchOptions, expectedOptions, `With ${JSON.stringify(json)}`);
if (length(parsed.errors)) {
assert.deepEqual(parsed.errors, expectedErrors?.());
function verifyWatchOptions(subScenario: string, scenario: () => VerifyWatchOptions[]) {
describe(subScenario, () => {
it("with json api", () => {
const baseline: string[] = [];
for (const { json, additionalFiles, existingWatchOptions } of scenario()) {
addToBaseLine(baseline, json, getParsedCommandJson(json, additionalFiles, existingWatchOptions));
}
else {
assert.equal(0, length(expectedErrors?.()), `Expected no errors`);
}
}
});
runBaseline(`${subScenario} with json api`, baseline);
});

it("with json source file api", () => {
for (const { json, expectedOptions, additionalFiles, existingWatchOptions, expectedErrors } of scenario()) {
const parsed = getParsedCommandJsonNode(json, additionalFiles, existingWatchOptions);
assert.deepEqual(parsed.watchOptions, expectedOptions);
if (length(parsed.errors)) {
assert.deepEqual(parsed.errors, expectedErrors?.(parsed.options.configFile));
}
else {
assert.equal(0, length(expectedErrors?.(parsed.options.configFile)), `Expected no errors`);
it("with json source file api", () => {
const baseline: string[] = [];
for (const { json, additionalFiles, existingWatchOptions, } of scenario()) {
addToBaseLine(baseline, json, getParsedCommandJsonNode(json, additionalFiles, existingWatchOptions));
}
}
runBaseline(`${subScenario} with jsonSourceFile api`, baseline);
});
});
function addToBaseLine(baseline: string[], json: object, parsed: ParsedCommandLine) {
baseline.push(`Input:: ${JSON.stringify(json, /*replacer*/ undefined, " ")}`);
baseline.push(`Result: WatchOptions::`);
baseline.push(JSON.stringify(parsed.watchOptions, /*replacer*/ undefined, " "));
baseline.push(`Result: Errors::`);
baseline.push(formatDiagnosticsWithColorAndContext(parsed.errors, {
getCurrentDirectory: () => "/",
getCanonicalFileName: identity,
getNewLine: () => "\n"
}));
}
function runBaseline(subScenario: string, baseline: readonly string[]) {
Harness.Baseline.runBaseline(`config/tsconfigParsingWatchOptions/${subScenario}.js`, baseline.join("\n"));
}
}

describe("no watchOptions specified option", () => {
verifyWatchOptions(() => [{
json: {},
expectedOptions: undefined
}]);
});
verifyWatchOptions("no watchOptions specified option", () => [{
json: {},
}]);

describe("empty watchOptions specified option", () => {
verifyWatchOptions(() => [{
json: { watchOptions: {} },
expectedOptions: undefined
}]);
});
verifyWatchOptions("empty watchOptions specified option", () => [{
json: { watchOptions: {} },
}]);

describe("extending config file", () => {
describe("when extending config file without watchOptions", () => {
verifyWatchOptions(() => [
{
json: {
extends: "./base.json",
watchOptions: { watchFile: "UseFsEvents" }
},
expectedOptions: { watchFile: WatchFileKind.UseFsEvents },
additionalFiles: { "/base.json": "{}" }
},
{
json: { extends: "./base.json", },
expectedOptions: undefined,
additionalFiles: { "/base.json": "{}" }
}
]);
});
verifyWatchOptions("when extending config file without watchOptions", () => [
{
json: {
extends: "./base.json",
watchOptions: { watchFile: "UseFsEvents" }
},
additionalFiles: { "/base.json": "{}" }
},
{
json: { extends: "./base.json", },
additionalFiles: { "/base.json": "{}" }
}
]);

describe("when extending config file with watchOptions", () => {
verifyWatchOptions(() => [
{
json: {
extends: "./base.json",
watchOptions: {
watchFile: "UseFsEvents",
}
},
expectedOptions: {
watchFile: WatchFileKind.UseFsEvents,
watchDirectory: WatchDirectoryKind.FixedPollingInterval
},
additionalFiles: {
"/base.json": JSON.stringify({
watchOptions: {
watchFile: "UseFsEventsOnParentDirectory",
watchDirectory: "FixedPollingInterval"
}
})
}
},
{
json: {
extends: "./base.json",
},
expectedOptions: {
watchFile: WatchFileKind.UseFsEventsOnParentDirectory,
watchDirectory: WatchDirectoryKind.FixedPollingInterval
},
additionalFiles: {
"/base.json": JSON.stringify({
watchOptions: {
watchFile: "UseFsEventsOnParentDirectory",
watchDirectory: "FixedPollingInterval"
}
})
}
verifyWatchOptions("when extending config file with watchOptions", () => [
{
json: {
extends: "./base.json",
watchOptions: {
watchFile: "UseFsEvents",
}
]);
});
});

describe("different options", () => {
verifyWatchOptions(() => [
{
json: { watchOptions: { watchFile: "UseFsEvents" } },
expectedOptions: { watchFile: WatchFileKind.UseFsEvents }
},
{
json: { watchOptions: { watchDirectory: "UseFsEvents" } },
expectedOptions: { watchDirectory: WatchDirectoryKind.UseFsEvents }
},
{
json: { watchOptions: { fallbackPolling: "DynamicPriority" } },
expectedOptions: { fallbackPolling: PollingWatchKind.DynamicPriority }
},
{
json: { watchOptions: { synchronousWatchDirectory: true } },
expectedOptions: { synchronousWatchDirectory: true }
},
{
json: { watchOptions: { excludeDirectories: ["**/temp"] } },
expectedOptions: { excludeDirectories: ["/**/temp"] }
},
{
json: { watchOptions: { excludeFiles: ["**/temp/*.ts"] } },
expectedOptions: { excludeFiles: ["/**/temp/*.ts"] }
},
{
json: { watchOptions: { excludeDirectories: ["**/../*"] } },
expectedOptions: { excludeDirectories: [] },
expectedErrors: sourceFile => [
{
messageText: `File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '**/../*'.`,
category: Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0.category,
code: Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0.code,
file: sourceFile,
start: sourceFile && sourceFile.text.indexOf(`"**/../*"`),
length: sourceFile && `"**/../*"`.length,
reportsDeprecated: undefined,
reportsUnnecessary: undefined
additionalFiles: {
"/base.json": JSON.stringify({
watchOptions: {
watchFile: "UseFsEventsOnParentDirectory",
watchDirectory: "FixedPollingInterval"
}
]
})
}
},
{
json: {
extends: "./base.json",
},
{
json: { watchOptions: { excludeFiles: ["**/../*"] } },
expectedOptions: { excludeFiles: [] },
expectedErrors: sourceFile => [
{
messageText: `File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '**/../*'.`,
category: Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0.category,
code: Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0.code,
file: sourceFile,
start: sourceFile && sourceFile.text.indexOf(`"**/../*"`),
length: sourceFile && `"**/../*"`.length,
reportsDeprecated: undefined,
reportsUnnecessary: undefined
additionalFiles: {
"/base.json": JSON.stringify({
watchOptions: {
watchFile: "UseFsEventsOnParentDirectory",
watchDirectory: "FixedPollingInterval"
}
]
},
]);
});
})
}
}
]);

describe("watch options extending passed in watch options", () => {
verifyWatchOptions(() => [
{
json: { watchOptions: { watchFile: "UseFsEvents" } },
expectedOptions: { watchFile: WatchFileKind.UseFsEvents, watchDirectory: WatchDirectoryKind.FixedPollingInterval },
existingWatchOptions: { watchDirectory: WatchDirectoryKind.FixedPollingInterval }
},
{
json: {},
expectedOptions: { watchDirectory: WatchDirectoryKind.FixedPollingInterval },
existingWatchOptions: { watchDirectory: WatchDirectoryKind.FixedPollingInterval }
},
]);
});
verifyWatchOptions("different options", () => [
{
json: { watchOptions: { watchFile: "UseFsEvents" } },
},
{
json: { watchOptions: { watchDirectory: "UseFsEvents" } },
},
{
json: { watchOptions: { fallbackPolling: "DynamicPriority" } },
},
{
json: { watchOptions: { synchronousWatchDirectory: true } },
},
{
json: { watchOptions: { excludeDirectories: ["**/temp"] } },
},
{
json: { watchOptions: { excludeFiles: ["**/temp/*.ts"] } },
},
{
json: { watchOptions: { excludeDirectories: ["**/../*"] } },
},
{
json: { watchOptions: { excludeFiles: ["**/../*"] } },
},
{
json: { watchOptions: { watchFactory: "somefactory" } },
},
{
json: { watchOptions: { watchFactory: { name: "somefactory", myconfig: "somethingelse" } } },
},
{
json: { watchOptions: { watchFactory: "somefactory/../malicious" } },
},
{
json: { watchOptions: { watchFactory: { name: "somefactory/../malicious" } } },
},
]);

verifyWatchOptions("watch options extending passed in watch options", () => [
{
json: { watchOptions: { watchFile: "UseFsEvents" } },
},
{
json: {},
},
]);
});
}
12 changes: 12 additions & 0 deletions ...ce/config/commandLineParsing/parseBuildOptions/--clean and --force together is invalid.js
View file
@@ -0,0 +1,12 @@
--clean --force
buildOptions::
{
"clean": true,
"force": true
}
WatchOptions::

Projects::
.
Errors::
error TS6370: Options 'clean' and 'force' cannot be combined.
12 changes: 12 additions & 0 deletions .../config/commandLineParsing/parseBuildOptions/--clean and --verbose together is invalid.js
View file
@@ -0,0 +1,12 @@
--clean --verbose
buildOptions::
{
"clean": true,
"verbose": true
}
WatchOptions::

Projects::
.
Errors::
error TS6370: Options 'clean' and 'verbose' cannot be combined.
12 changes: 12 additions & 0 deletions ...ce/config/commandLineParsing/parseBuildOptions/--clean and --watch together is invalid.js
View file
@@ -0,0 +1,12 @@
--clean --watch
buildOptions::
{
"clean": true,
"watch": true
}
WatchOptions::

Projects::
.
Errors::
error TS6370: Options 'clean' and 'watch' cannot be combined.
12 changes: 12 additions & 0 deletions ...ence/config/commandLineParsing/parseBuildOptions/--watch and --dry together is invalid.js
View file
@@ -0,0 +1,12 @@
--watch --dry
buildOptions::
{
"watch": true,
"dry": true
}
WatchOptions::

Projects::
.
Errors::
error TS6370: Options 'watch' and 'dry' cannot be combined.
11 changes: 11 additions & 0 deletions ...mmandLineParsing/parseBuildOptions/Parse multiple flags with input projects at the end.js
View file
@@ -0,0 +1,11 @@
--force --verbose src tests
buildOptions::
{
"force": true,
"verbose": true
}
WatchOptions::

Projects::
src,tests
Errors::

0 comments on commit dfd16f5

Please sign in to comment.