commit 56a381d77526b03b96f7e1d8dcf673f5c6f135f1
author rnystrom@google.com <rnystrom@google.com> Fri Jul 12 23:47:49 2013 +0000
committer rnystrom@google.com <rnystrom@google.com> Fri Jul 12 23:47:49 2013 +0000
tree 8c0d064e352346f6d6ef09280339f0a094dcbb96
parent f07eca145bf2697399131d99b60e1bcbd4ab2cbe

Normalize paths in mock timestamp map.

Makes sure separators are consistent on Windows.

Review URL: https://codereview.chromium.org//18430006

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart/pkg/watcher@24984 260f80e4-7a28-3924-810f-c04153c831b5

pkgs/watcher/test/utils.dart

diff --git a/pkgs/watcher/test/utils.dart b/pkgs/watcher/test/utils.dart
index d822e1f..7471716 100644
--- a/pkgs/watcher/test/utils.dart
+++ b/pkgs/watcher/test/utils.dart
@@ -48,27 +48,19 @@
   var dir = new Directory("").createTempSync();
   _sandboxDir = dir.path;
 
-  // TODO(rnystrom): Temporary while debugging the Windows bot.
-  print("create mock modtime map for $_sandboxDir");
-
   _mockFileModificationTimes = new Map<String, int>();
   mockGetModificationTime((path) {
-    path = p.relative(path, from: _sandboxDir);
+    path = p.normalize(p.relative(path, from: _sandboxDir));
 
     // Make sure we got a path in the sandbox.
     assert(p.isRelative(path)  && !path.startsWith(".."));
 
-    // TODO(rnystrom): Temporary while debugging the Windows bot.
-    print("get mock modtime for $path = ${_mockFileModificationTimes[path]}");
     return new DateTime.fromMillisecondsSinceEpoch(
         _mockFileModificationTimes[path]);
   });
 
   // Delete the sandbox when done.
   currentSchedule.onComplete.schedule(() {
-    // TODO(rnystrom): Temporary while debugging the Windows bot.
-    print("delete mock modtime map for $_sandboxDir");
-
     if (_sandboxDir != null) {
       new Directory(_sandboxDir).deleteSync(recursive: true);
       _sandboxDir = null;
@@ -147,17 +139,15 @@
       dir.createSync(recursive: true);
     }
 
-    // TODO(rnystrom): Temporary while debugging the Windows bot.
-    print("write $path");
-
     new File(fullPath).writeAsStringSync(contents);
 
     // Manually update the mock modification time for the file.
     if (updateModified) {
+      // Make sure we always use the same separator on Windows.
+      path = p.normalize(path);
+
       var milliseconds = _mockFileModificationTimes.putIfAbsent(path, () => 0);
       _mockFileModificationTimes[path]++;
-      // TODO(rnystrom): Temporary while debugging the Windows bot.
-      print("  update modtime to ${_mockFileModificationTimes[path]}");
     }
   });
 }
@@ -176,14 +166,12 @@
   schedule(() {
     new File(p.join(_sandboxDir, from)).renameSync(p.join(_sandboxDir, to));
 
-    // TODO(rnystrom): Temporary while debugging the Windows bot.
-    print("rename $from -> $to");
+    // Make sure we always use the same separator on Windows.
+    to = p.normalize(to);
 
     // Manually update the mock modification time for the file.
     var milliseconds = _mockFileModificationTimes.putIfAbsent(to, () => 0);
     _mockFileModificationTimes[to]++;
-    // TODO(rnystrom): Temporary while debugging the Windows bot.
-    print("  update modtime to ${_mockFileModificationTimes[to]}");
   });
 }