Merge pull request #668 from Microsoft/harnessMessageConsistency2

Changed Harness Output

Author: DanielRosenwasser

src/harness/compilerRunner.ts

@@ -156,10 +156,7 @@ class CompilerBaselineRunner extends RunnerBase {
                 return file.writeByteOrderMark ? "\u00EF\u00BB\u00BF" : "";
             }
 
-            function getErrorBaseline(toBeCompiled: { unitName: string; content: string }[],
-                otherFiles: { unitName: string; content: string }[],
-                result: Harness.Compiler.CompilerResult
-                ) {
+            function getErrorBaseline(toBeCompiled: { unitName: string; content: string }[], otherFiles: { unitName: string; content: string }[], result: Harness.Compiler.CompilerResult) {
                 return Harness.Compiler.getErrorBaseline(toBeCompiled.concat(otherFiles), result.errors);
             }
 
@@ -168,7 +165,7 @@ class CompilerBaselineRunner extends RunnerBase {
                 if (this.errors) {
                     Harness.Baseline.runBaseline('Correct errors for ' + fileName, justName.replace(/\.ts$/, '.errors.txt'), (): string => {
                         if (result.errors.length === 0) return null;
-
+                        
                         return getErrorBaseline(toBeCompiled, otherFiles, result);
                     });
                 }

src/harness/harness.ts

@@ -807,9 +807,7 @@ module Harness {
             return errorOutput;
         }
 
-        export function getErrorBaseline(inputFiles: { unitName: string; content: string }[],
-            diagnostics: HarnessDiagnostic[]
-            ) {
+        export function getErrorBaseline(inputFiles: { unitName: string; content: string }[], diagnostics: HarnessDiagnostic[]) {
 
             var outputLines: string[] = [];
             // Count up all the errors we find so we don't miss any
@@ -820,13 +818,13 @@ module Harness {
                     .split('\n')
                     .map(s => s.length > 0 && s.charAt(s.length - 1) === '\r' ? s.substr(0, s.length - 1) : s)
                     .filter(s => s.length > 0)
-                    .map(s => '!!! ' + s);
+                    .map(s => '!!! ' + error.category + " TS" + error.code + ": " + s);
                 errLines.forEach(e => outputLines.push(e));
 
                 totalErrorsReported++;
             }
 
-            // Report glovbal errors:
+            // Report global errors
             var globalErrors = diagnostics.filter(err => !err.filename);
             globalErrors.forEach(err => outputErrorText(err));
 
@@ -896,7 +894,8 @@ module Harness {
             // Verify we didn't miss any errors in total
             assert.equal(totalErrorsReported, diagnostics.length, 'total number of errors');
 
-            return outputLines.join('\r\n');
+            return minimalDiagnosticsToString(diagnostics) +
+                sys.newLine + sys.newLine + outputLines.join('\r\n');
         }
 
         /* TODO: Delete?
@@ -917,7 +916,7 @@ module Harness {
         export function recreate(options?: { useMinimalDefaultLib: boolean; noImplicitAny: boolean; }) {
         }
 
-        /** The harness' compiler instance used when tests are actually run. Reseting or changing settings of this compiler instance must be done within a testcase (i.e., describe/it) */
+        /** The harness' compiler instance used when tests are actually run. Reseting or changing settings of this compiler instance must be done within a test case (i.e., describe/it) */
         var harnessCompiler: HarnessCompiler;
 
         /** Returns the singleton harness compiler instance for generating and running tests.

src/harness/projectsRunner.ts

@@ -4,7 +4,7 @@
 // Test case is json of below type in tests/cases/project/
 interface ProjectRunnerTestCase {
     scenario: string;
-    projectRoot: string; // project where it lives - this also is the current dictory when compiling
+    projectRoot: string; // project where it lives - this also is the current directory when compiling
     inputFiles: string[]; // list of input files to be given to program
     out?: string; // --out
     outDir?: string; // --outDir
@@ -22,7 +22,7 @@ interface ProjectRunnerTestCase {
 interface ProjectRunnerTestCaseResolutionInfo extends ProjectRunnerTestCase {
     // Apart from actual test case the results of the resolution
     resolvedInputFiles: string[]; // List of files that were asked to read by compiler
-    emittedFiles: string[]; // List of files that wre emitted by the compiler
+    emittedFiles: string[]; // List of files that were emitted by the compiler
 }
 
 interface BatchCompileProjectTestCaseEmittedFile extends Harness.Compiler.GeneratedFile {
@@ -69,7 +69,7 @@ class ProjectRunner extends RunnerBase {
             testCase = <ProjectRunnerTestCase>JSON.parse(testFileText);
         }
         catch (e) {
-            assert(false, "Testcase: " + testCaseFileName + " doesnt not contain valid json format: " + e.message);
+            assert(false, "Testcase: " + testCaseFileName + " does not contain valid json format: " + e.message);
         }
         var testCaseJustName = testCaseFileName.replace(/^.*[\\\/]/, '').replace(/\.json/, "");
 
@@ -87,7 +87,7 @@ class ProjectRunner extends RunnerBase {
         }
 
         // When test case output goes to tests/baselines/local/projectOutput/testCaseName/moduleKind/
-        // We have these two separate locations because when compairing baselines the baseline verifier will delete the existing file 
+        // We have these two separate locations because when comparing baselines the baseline verifier will delete the existing file 
         // so even if it was created by compiler in that location, the file will be deleted by verified before we can read it
         // so lets keep these two locations separate
         function getProjectOutputFolder(filename: string, moduleKind: ts.ModuleKind) {
@@ -228,7 +228,7 @@ class ProjectRunner extends RunnerBase {
 
                 var diskRelativeName = ts.getRelativePathToDirectoryOrUrl(testCase.projectRoot, diskFileName, getCurrentDirectory(), false);
                 if (ts.isRootedDiskPath(diskRelativeName) || diskRelativeName.substr(0, 3) === "../") {
-                    // If the generated output file recides in the parent folder or is rooted path, 
+                    // If the generated output file resides in the parent folder or is rooted path, 
                     // we need to instead create files that can live in the project reference folder
                     // but make sure extension of these files matches with the filename the compiler asked to write
                     diskRelativeName = "diskFile" + nonSubfolderDiskFiles++ +
@@ -299,13 +299,11 @@ class ProjectRunner extends RunnerBase {
                     return { unitName: sourceFile.filename, content: sourceFile.text };
                 });
             var diagnostics = ts.map(compilerResult.errors, error => Harness.Compiler.getMinimalDiagnostic(error));
-            var errors = Harness.Compiler.minimalDiagnosticsToString(diagnostics);
-            errors += sys.newLine + sys.newLine + Harness.Compiler.getErrorBaseline(inputFiles, diagnostics);
 
-            return errors;
+            return Harness.Compiler.getErrorBaseline(inputFiles, diagnostics);
         }
 
-        describe('Compiling project for ' + testCase.scenario +': testcase ' + testCaseFileName, () => {
+        describe('Compiling project for ' + testCase.scenario + ': testcase ' + testCaseFileName, () => {
             function verifyCompilerResults(compilerResult: BatchCompileProjectTestCaseResult) {
                 function getCompilerResolutionInfo() {
                     var resolutionInfo: ProjectRunnerTestCaseResolutionInfo = {

src/harness/rwcRunner.ts

@@ -152,9 +152,7 @@ module RWC {
                     return null;
                 }
 
-                return Harness.Compiler.minimalDiagnosticsToString(compilerResult.errors) +
-                    sys.newLine + sys.newLine +
-                    Harness.Compiler.getErrorBaseline(inputFiles.concat(otherFiles), compilerResult.errors);
+                return Harness.Compiler.getErrorBaseline(inputFiles.concat(otherFiles), compilerResult.errors);
             }, false, baselineOpts);
         });
 

tests/baselines/reference/ArrowFunction1.errors.txt

@@ -1,6 +1,9 @@
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction1.ts(1,13): error TS1110: Type expected.
+
+
 ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction1.ts (1 errors) ====
     var v = (a: ) => {
                 ~
-!!! Type expected.
+!!! error TS1110: Type expected.
 
     };

tests/baselines/reference/ArrowFunction2.errors.txt

@@ -1,8 +1,12 @@
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts(1,14): error TS1009: Trailing comma not allowed.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts(1,13): error TS2304: Cannot find name 'b'.
+
+
 ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts (2 errors) ====
     var v = (a: b,) => {
                  ~
-!!! Trailing comma not allowed.
+!!! error TS1009: Trailing comma not allowed.
                 ~
-!!! Cannot find name 'b'.
+!!! error TS2304: Cannot find name 'b'.
 
     };

tests/baselines/reference/ArrowFunction3.errors.txt

@@ -1,10 +1,15 @@
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts(1,12): error TS1005: ',' expected.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts(1,14): error TS1005: ';' expected.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts(1,10): error TS2304: Cannot find name 'a'.
+
+
 ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts (3 errors) ====
     var v = (a): => {
                ~
-!!! ',' expected.
+!!! error TS1005: ',' expected.
                  ~~
-!!! ';' expected.
+!!! error TS1005: ';' expected.
              ~
-!!! Cannot find name 'a'.
+!!! error TS2304: Cannot find name 'a'.
 
     };

tests/baselines/reference/ArrowFunctionExpression1.errors.txt

@@ -1,4 +1,7 @@
+tests/cases/compiler/ArrowFunctionExpression1.ts(1,10): error TS2369: A parameter property is only allowed in a constructor implementation.
+
+
 ==== tests/cases/compiler/ArrowFunctionExpression1.ts (1 errors) ====
     var v = (public x: string) => { };
              ~~~~~~~~~~~~~~~~
-!!! A parameter property is only allowed in a constructor implementation.
+!!! error TS2369: A parameter property is only allowed in a constructor implementation.

tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.errors.txt

@@ -1,3 +1,10 @@
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(10,19): error TS2304: Cannot find name 'T'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(20,12): error TS2304: Cannot find name 'T'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(22,23): error TS2304: Cannot find name 'T'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(35,26): error TS2304: Cannot find name 'T'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): error TS2304: Cannot find name 'T'.
+
+
 ==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts (5 errors) ====
     // all expected to be errors
 
@@ -10,7 +17,7 @@
     module clodule1 {
         function f(x: T) { }
                       ~
-!!! Cannot find name 'T'.
+!!! error TS2304: Cannot find name 'T'.
     }
 
     class clodule2<T>{
@@ -22,11 +29,11 @@
     module clodule2 {
         var x: T;
                ~
-!!! Cannot find name 'T'.
+!!! error TS2304: Cannot find name 'T'.
 
         class D<U extends T>{
                           ~
-!!! Cannot find name 'T'.
+!!! error TS2304: Cannot find name 'T'.
             id: string;
             value: U;
         }
@@ -41,7 +48,7 @@
     module clodule3 {
         export var y = { id: T };
                              ~
-!!! Cannot find name 'T'.
+!!! error TS2304: Cannot find name 'T'.
     }
 
     class clodule4<T>{
@@ -54,7 +61,7 @@
         class D {
             name: T;
                   ~
-!!! Cannot find name 'T'.
+!!! error TS2304: Cannot find name 'T'.
         }
     }
 

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt

@@ -1,3 +1,6 @@
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(10,21): error TS2300: Duplicate identifier 'fn'.
+
+
 ==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts (1 errors) ====
     class clodule<T> {
         id: string;
@@ -10,7 +13,7 @@
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): T {
                         ~~
-!!! Duplicate identifier 'fn'.
+!!! error TS2300: Duplicate identifier 'fn'.
             return x;
         }
     }