Normalize paths in mock timestamp map.

pkg/watcher/test/utils.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library watcher.test.utils;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
@@ skipping 30 matching lines @@
 }
 
 /// Creates the sandbox directory the other functions in this library use and
 /// ensures it's deleted when the test ends.
 ///
 /// This should usually be called by [setUp].
 void createSandbox() {
   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;
     }
 
     _mockFileModificationTimes = null;
     mockGetModificationTime(null);
   }, "delete sandbox");
 }
 
@@ skipping 58 matching lines @@
 
   schedule(() {
     var fullPath = p.join(_sandboxDir, path);
 
     // Create any needed subdirectories.
     var dir = new Directory(p.dirname(fullPath));
     if (!dir.existsSync()) {
       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]}");
     }
   });
 }
 
 /// Schedules deleting a file in the sandbox at [path].
 void deleteFile(String path) {
   schedule(() {
     new File(p.join(_sandboxDir, path)).deleteSync();
   });
 }
 
 /// Schedules renaming a file in the sandbox from [from] to [to].
 ///
 /// If [contents] is omitted, creates an empty file.
 void renameFile(String from, String to) {
   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]}");
   });
 }
 
 /// A [Matcher] for [WatchEvent]s.
 class _ChangeMatcher extends BaseMatcher {
   /// The expected change.
   final ChangeType type;
 
   /// The expected path.
   final String path;
 
   _ChangeMatcher(this.type, this.path);
 
   Description describe(Description description) {
     description.add("$type $path");
   }
 
   bool matches(item, Map matchState) =>
       item is WatchEvent && item.type == type && item.path == path;
 }