Merge pull request microsoft#15142 from Microsoft/newLine

Andy · web-flow · commit 12df0324ee81 · 2017-04-11T14:40:09.000-07:00
Don't access `sys.newLine` inside unit tests
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -895,7 +895,7 @@ namespace ts {
      * @param fileNames array of filenames to be generated into tsconfig.json
      */
     /* @internal */
-    export function generateTSConfig(options: CompilerOptions, fileNames: string[]): string {
+    export function generateTSConfig(options: CompilerOptions, fileNames: string[], newLine: string): string {
         const compilerOptions = extend(options, defaultInitCompilerOptions);
         const configurations: { compilerOptions: MapLike<CompilerOptionsValue>; files?: string[] } = {
             compilerOptions: serializeCompilerOptions(compilerOptions)
@@ -1053,7 +1053,7 @@ namespace ts {
             }
             result.push(`}`);
 
-            return result.join(sys.newLine);
+            return result.join(newLine);
         }
     }
 
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -739,7 +739,7 @@ namespace ts {
             reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file), /* host */ undefined);
         }
         else {
-            sys.writeFile(file, generateTSConfig(options, fileNames));
+            sys.writeFile(file, generateTSConfig(options, fileNames, sys.newLine));
             reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file), /* host */ undefined);
         }
 
diff --git a/src/harness/unittests/initializeTSConfig.ts b/src/harness/unittests/initializeTSConfig.ts
@@ -6,22 +6,11 @@ namespace ts {
         function initTSConfigCorrectly(name: string, commandLinesArgs: string[]) {
             describe(name, () => {
                 const commandLine = parseCommandLine(commandLinesArgs);
-                const initResult = generateTSConfig(commandLine.options, commandLine.fileNames);
+                const initResult = generateTSConfig(commandLine.options, commandLine.fileNames, "\n");
                 const outputFileName = `tsConfig/${name.replace(/[^a-z0-9\-. ]/ig, "")}/tsconfig.json`;
 
                 it(`Correct output for ${outputFileName}`, () => {
-                    Harness.Baseline.runBaseline(outputFileName, () => {
-                        if (initResult) {
-                            // normalize line endings
-                            return initResult.replace(new RegExp(sys.newLine, "g"), "\n");
-                        }
-                        else {
-                            // This can happen if compiler recieve invalid compiler-options
-                            /* tslint:disable:no-null-keyword */
-                            return null;
-                            /* tslint:enable:no-null-keyword */
-                        }
-                    });
+                    Harness.Baseline.runBaseline(outputFileName, () => initResult);
                 });
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ namespace ts {`
`895`	`895`	`* @param fileNames array of filenames to be generated into tsconfig.json`
`896`	`896`	`*/`
`897`	`897`	`/* @internal */`
`898`		`- export function generateTSConfig(options: CompilerOptions, fileNames: string[]): string {`
	`898`	`+ export function generateTSConfig(options: CompilerOptions, fileNames: string[], newLine: string): string {`
`899`	`899`	`const compilerOptions = extend(options, defaultInitCompilerOptions);`
`900`	`900`	`const configurations: { compilerOptions: MapLike<CompilerOptionsValue>; files?: string[] } = {`
`901`	`901`	`compilerOptions: serializeCompilerOptions(compilerOptions)`
`@@ -1053,7 +1053,7 @@ namespace ts {`
`1053`	`1053`	`}`
`1054`	`1054`	result.push(`}`);
`1055`	`1055`
`1056`		`- return result.join(sys.newLine);`
	`1056`	`+ return result.join(newLine);`
`1057`	`1057`	`}`
`1058`	`1058`	`}`
`1059`	`1059`
Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@ namespace ts {`
`739`	`739`	`reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file), /* host */ undefined);`
`740`	`740`	`}`
`741`	`741`	`else {`
`742`		`- sys.writeFile(file, generateTSConfig(options, fileNames));`
	`742`	`+ sys.writeFile(file, generateTSConfig(options, fileNames, sys.newLine));`
`743`	`743`	`reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file), /* host */ undefined);`
`744`	`744`	`}`
`745`	`745`