use resolvePath to handel relative references correctelly

mhegazy · mhegazy · commit d9112f5e989e · 2015-09-13T23:35:22.000-07:00
diff --git a/src/harness/loggedIO.ts b/src/harness/loggedIO.ts
@@ -270,7 +270,7 @@ module Playback {
     }
 
     function findResultByPath<T>(wrapper: { resolvePath(s: string): string }, logArray: { path: string; result?: T }[], expectedPath: string, defaultValue?: T): T {
-        let normalizedName = ts.normalizeSlashes(expectedPath).toLowerCase();
+        let normalizedName = ts.normalizePath(expectedPath).toLowerCase();
         // Try to find the result through normal fileName
         for (let i = 0; i < logArray.length; i++) {
             if (ts.normalizeSlashes(logArray[i].path).toLowerCase() === normalizedName) {
@@ -286,6 +286,7 @@ module Playback {
                 }
             }
         }
+
         // If we got here, we didn't find a match
         if (defaultValue === undefined) {
             throw new Error("No matching result in log array for path: " + expectedPath);

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ module Playback {`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`function findResultByPath<T>(wrapper: { resolvePath(s: string): string }, logArray: { path: string; result?: T }[], expectedPath: string, defaultValue?: T): T {`
`273`		`- let normalizedName = ts.normalizeSlashes(expectedPath).toLowerCase();`
	`273`	`+ let normalizedName = ts.normalizePath(expectedPath).toLowerCase();`
`274`	`274`	`// Try to find the result through normal fileName`
`275`	`275`	`for (let i = 0; i < logArray.length; i++) {`
`276`	`276`	`if (ts.normalizeSlashes(logArray[i].path).toLowerCase() === normalizedName) {`
`@@ -286,6 +286,7 @@ module Playback {`
`286`	`286`	`}`
`287`	`287`	`}`
`288`	`288`	`}`
	`289`	`+`
`289`	`290`	`// If we got here, we didn't find a match`
`290`	`291`	`if (defaultValue === undefined) {`
`291`	`292`	`throw new Error("No matching result in log array for path: " + expectedPath);`