[analyzer] Fix analysis_context_collection_test on Windows (2nd try)

This fixes some randomeness caused by HashSet which seemingly triggered
different sorting on Windows than in Linux.

Change-Id: I54fffdbd2e056ec87958533aeafc327164808046
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435861
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Jens Johansen <[email protected]>

Author: jensjoha

pkg/analyzer/lib/src/dart/analysis/context_locator.dart

@@ -2,8 +2,6 @@
 // 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.
 
-import 'dart:collection';
-
 import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart'
@@ -840,7 +838,7 @@ class ContextLocatorImpl {
   /// Return a list of paths that contains all of the unique elements from the
   /// given list of [paths], sorted such that shorter paths are first.
   List<String> _uniqueSortedPaths(List<String> paths) {
-    Set<String> uniquePaths = HashSet<String>.from(paths);
+    Set<String> uniquePaths = Set<String>.from(paths);
     List<String> sortedPaths = uniquePaths.toList();
     sortedPaths.sort((a, b) => a.length - b.length);
     return sortedPaths;

pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart

@@ -1148,21 +1148,21 @@ contexts
         uri: package:package2/package2.dart
         analysisOptions_1
         workspacePackage_0_1
-  /home/packages/package2
+  /home/packages/package1
     packagesFile: /home/.dart_tool/package_config.json
     workspace: workspace_1
     analyzedFiles
-      /home/packages/package2/lib/package2.dart
-        uri: package:package2/package2.dart
-        analysisOptions_1
+      /home/packages/package1/lib/package1.dart
+        uri: package:package1/package1.dart
+        analysisOptions_0
         workspacePackage_1_0
-  /home/packages/package1
+  /home/packages/package2
     packagesFile: /home/.dart_tool/package_config.json
     workspace: workspace_2
     analyzedFiles
-      /home/packages/package1/lib/package1.dart
-        uri: package:package1/package1.dart
-        analysisOptions_0
+      /home/packages/package2/lib/package2.dart
+        uri: package:package2/package2.dart
+        analysisOptions_1
         workspacePackage_2_0
 analysisOptions
   analysisOptions_0: /home/packages/package1/analysis_options.yaml
@@ -1181,13 +1181,13 @@ workspaces
     root: /home
     pubPackages
       workspacePackage_1_0: PubPackage
-        root: /home/packages/package2
+        root: /home/packages/package1
         sdkVersionConstraint: ^3.6.0
   workspace_2: PackageConfigWorkspace
     root: /home
     pubPackages
       workspacePackage_2_0: PubPackage
-        root: /home/packages/package1
+        root: /home/packages/package2
         sdkVersionConstraint: ^3.6.0
 ''');
   }
@@ -1213,26 +1213,26 @@ contexts
     packagesFile: /home/.dart_tool/package_config.json
     workspace: workspace_0
     analyzedFiles
-      /home/packages/package2/lib/package2.dart
-        uri: package:package2/package2.dart
-        analysisOptions_0
-        workspacePackage_0_0
       /home/packages/package1/lib/package1.dart
         uri: package:package1/package1.dart
+        analysisOptions_0
+        workspacePackage_0_0
+      /home/packages/package2/lib/package2.dart
+        uri: package:package2/package2.dart
         analysisOptions_1
         workspacePackage_0_1
 analysisOptions
-  analysisOptions_0: /home/packages/package2/analysis_options.yaml
-  analysisOptions_1: /home/packages/package1/analysis_options.yaml
+  analysisOptions_0: /home/packages/package1/analysis_options.yaml
+  analysisOptions_1: /home/packages/package2/analysis_options.yaml
 workspaces
   workspace_0: PackageConfigWorkspace
     root: /home
     pubPackages
       workspacePackage_0_0: PubPackage
-        root: /home/packages/package2
+        root: /home/packages/package1
         sdkVersionConstraint: ^3.6.0
       workspacePackage_0_1: PubPackage
-        root: /home/packages/package1
+        root: /home/packages/package2
         sdkVersionConstraint: ^3.6.0
 ''');
   }