Merge pull request microsoft#1482 from Microsoft/typingHighFidelity

Move test helpers into the harness Utils module.

Author: CyrusNajmabadi

Jakefile

@@ -485,7 +485,7 @@ function deleteTemporaryProjectOutput() {
  }
 }
 
-var testTimeout = 5000;
+var testTimeout = 20000;
 desc("Runs the tests using the built run.js file. Syntax is jake runtests. Optional parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]'.");
 task("runtests", ["tests", builtLocalDirectory], function() {
  cleanTestDirs();

src/harness/fourslash.ts

@@ -290,6 +290,64 @@ module Utils {
  return o;
  }
  }
+
+ export function assertStructuralEquals(node1: ts.Node, node2: ts.Node) {
+ if (node1 === node2) {
+ return;
+ }
+
+ assert(node1, "node1");
+ assert(node2, "node2");
+ assert.equal(node1.pos, node2.pos, "node1.pos !== node2.pos");
+ assert.equal(node1.end, node2.end, "node1.end !== node2.end");
+ assert.equal(node1.kind, node2.kind, "node1.kind !== node2.kind");
+ assert.equal(node1.flags, node2.flags, "node1.flags !== node2.flags");
+
+ // call this on both nodes to ensure all propagated flags have been set (and thus can be 
+ // compared).
+ assert.equal(ts.containsParseError(node1), ts.containsParseError(node2));
+ assert.equal(node1.parserContextFlags, node2.parserContextFlags, "node1.parserContextFlags !== node2.parserContextFlags");
+
+ ts.forEachChild(node1,
+ child1 => {
+ var childName = findChildName(node1, child1);
+ var child2: ts.Node = (<any>node2)[childName];
+
+ assertStructuralEquals(child1, child2);
+ },
+ (array1: ts.NodeArray<ts.Node>) => {
+ var childName = findChildName(node1, array1);
+ var array2: ts.NodeArray<ts.Node> = (<any>node2)[childName];
+
+ assertArrayStructuralEquals(array1, array2);
+ });
+ }
+
+ function assertArrayStructuralEquals(array1: ts.NodeArray<ts.Node>, array2: ts.NodeArray<ts.Node>) {
+ if (array1 === array2) {
+ return;
+ }
+
+ assert(array1, "array1");
+ assert(array2, "array2");
+ assert.equal(array1.pos, array2.pos, "array1.pos !== array2.pos");
+ assert.equal(array1.end, array2.end, "array1.end !== array2.end");
+ assert.equal(array1.length, array2.length, "array1.length !== array2.length");
+
+ for (var i = 0, n = array1.length; i < n; i++) {
+ assertStructuralEquals(array1[i], array2[i]);
+ }
+ }
+
+ function findChildName(parent: any, child: any) {
+ for (var name in parent) {
+ if (parent.hasOwnProperty(name) && parent[name] === child) {
+ return name;
+ }
+ }
+
+ throw new Error("Could not find child in parent");
+ }
 }
 
 module Harness.Path {
@@ -772,7 +830,7 @@ module Harness {
  writeFile,
  getCanonicalFileName,
  useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
- getNewLine: ()=> ts.sys.newLine
+ getNewLine: () => ts.sys.newLine
  };
  }
 
@@ -814,7 +872,7 @@ module Harness {
  }
 
  public emitAll(ioHost?: IEmitterIOHost) {
- this.compileFiles(this.inputFiles, [], (result) => {
+ this.compileFiles(this.inputFiles, [],(result) => {
  result.files.forEach(file => {
  ioHost.writeFile(file.fileName, file.code, false);
  });
@@ -824,7 +882,7 @@ module Harness {
  result.sourceMaps.forEach(file => {
  ioHost.writeFile(file.fileName, file.code, false);
  });
- }, () => { }, this.compileOptions);
+ },() => { }, this.compileOptions);
  }
 
  public compileFiles(inputFiles: { unitName: string; content: string }[],
@@ -962,7 +1020,7 @@ module Harness {
  break;
 
  case 'includebuiltfile':
- inputFiles.push({ unitName: setting.value, content: IO.readFile(libFolder + setting.value)});
+ inputFiles.push({ unitName: setting.value, content: IO.readFile(libFolder + setting.value) });
  break;
 
  default:
@@ -1071,7 +1129,7 @@ module Harness {
  return ts.removeFileExtension(sourceFileName) + ".d.ts";
  }
  });
- 
+
  return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined);
  }
 
@@ -1584,4 +1642,4 @@ module Harness {
 }
 
 // TODO: not sure why Utils.evalFile isn't working with this, eventually will concat it like old compiler instead of eval
-eval(Harness.tcServicesFile);
+eval(Harness.tcServicesFile);

src/harness/harness.ts

@@ -9,7 +9,6 @@
 //// }
 
 edit.disableFormatting();
-diagnostics.setEditValidation(IncrementalEditValidation.SyntacticOnly);
 
 goTo.marker('check');
 verify.quickInfoIs('module Mod');

tests/cases/fourslash/addMemberToInterface.ts

@@ -1,20 +1,18 @@
-/// <reference path="fourslash.ts" />
-
+/// <reference path="fourslash.ts" />
+
 ////module A {
 //// /*var*/
 ////}
 ////module /*check*/A {
 //// var p;
-////}
-
-diagnostics.setEditValidation(IncrementalEditValidation.SyntacticOnly);
-
-goTo.marker('check');
-verify.quickInfoExists();
-
-goTo.marker('var');
-edit.insert('var o;');
-
-goTo.marker('check');
-verify.quickInfoExists();
-
+////}
+
+goTo.marker('check');
+verify.quickInfoExists();
+
+goTo.marker('var');
+edit.insert('var o;');
+
+goTo.marker('check');
+verify.quickInfoExists();
+

tests/cases/fourslash/addMemberToModule.ts

@@ -23,8 +23,6 @@
 ////second.start();
 ////second.stop();
 
-diagnostics.setEditValidation(IncrementalEditValidation.None);
-
 goTo.file("findAllRefsOnDefinition-import.ts");
 goTo.marker("1");
 
@@ -38,4 +36,3 @@ verifyOperationIsCancelled(() => verify.referencesCountIs(0) );
 cancellation.resetCancelled();
 goTo.marker("1"); 
 verify.referencesCountIs(2);
-

tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts

@@ -26,8 +26,6 @@
 // this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
 edit.insert('');
 
-diagnostics.setTypingFidelity(TypingFidelity.High);
-
 goTo.marker('1');
 verify.completionListContains('foo');
 verify.completionListContains('foo2');

tests/cases/fourslash/cloduleAsBaseClass.ts

@@ -30,7 +30,6 @@
 
 // this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
 edit.insert('');
-diagnostics.setTypingFidelity(TypingFidelity.High);
 
 goTo.marker('1');
 verify.completionListContains('foo');

tests/cases/fourslash/cloduleAsBaseClass2.ts

@@ -3,9 +3,6 @@
 //// var f4 = <T>(x: T/**/ ) => {
 //// }
 
-// Turn off edit validation. We don't want semantic diagnostics to run until we explicit call it.
-fs.diagnostics.setEditValidation(IncrementalEditValidation.None);
-
 fs.goTo.marker();
 
 // Replace the "T" type with the non-existent type 'V'.

tests/cases/fourslash/completionBeforeSemanticDiagnosticsInArrowFunction1.ts

@@ -2,7 +2,6 @@
 
 ////var x = Object.create(/**/
 
-diagnostics.setEditValidation(IncrementalEditValidation.None);
 goTo.marker();
 verify.not.completionListIsEmpty();
 edit.insert("nu");