Clean up test_runner Command subclass hash/equality.

tools/testing/dart/utils.dart

 // Copyright (c) 2013, 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 utils;
 
 import 'dart:io';
 import 'dart:math' show min;
 import 'dart:convert';
 
@@ skipping 200 matching lines @@
         'safarimobilesim': const {
           'macos': '/Applications/Xcode.app/Contents/Developer/Platforms/'
                    'iPhoneSimulator.platform/Developer/Applications/'
                    'iPhone Simulator.app/Contents/MacOS/iPhone Simulator'
         },
         'ie9': const {
           'windows': 'C:\\Program Files\\Internet Explorer\\iexplore.exe'
         },
         'ie10': const {
           'windows': 'C:\\Program Files\\Internet Explorer\\iexplore.exe'
-        }, 
+        },
         'ie11': const {
           'windows': 'C:\\Program Files\\Internet Explorer\\iexplore.exe'
         }};
     browserLocations['ff'] = browserLocations['firefox'];
 
     assert(browserLocations[browserName] != null);
     location = browserLocations[browserName][Platform.operatingSystem];
     if (location != null) {
       return location;
     } else {
@@ skipping 11 matching lines @@
   return argument;
 }
 
 class HashCodeBuilder {
   int _value = 0;
 
   void add(Object object) {
     _value = ((_value * 31) ^ object.hashCode)  & 0x3FFFFFFF;
   }
 
   void addJson(Object object) {

[Bill Hesse, 2014/10/09 12:03:50]

This class is only used for test_runner.dart hashcode/equality for Command
subclasses, so we want to allow URIs and to hash equal maps identically.

-    if (object == null || object is num || object is String) {
+    if (object == null || object is num || object is String || object is Uri) {
       add(object);
     } else if (object is List) {
       object.forEach(addJson);
     } else if (object is Map) {
-      object.forEach((k, v) { addJson(k); addJson(value); });
+      for (var key in object.keys.toList()..sort()) {
+        addJson(key);
+        addJson(object[key]);
+      }
     } else {
       throw new Exception("Can't build hashcode for non json-like object "
           "(${object.runtimeType})");
     }
   }
 
   int get value => _value;
 }
 
 bool deepJsonCompare(Object a, Object b) {
@@ skipping 28 matching lines @@
 
 class UniqueObject {
   static int _nextId = 1;
   final int _hashCode;
 
   int get hashCode => _hashCode;
   operator==(other) => other is UniqueObject && _hashCode == other._hashCode;
 
   UniqueObject() : _hashCode = ++_nextId;
 }