Follow up on https://dart-review.googlesource.com/c/sdk/+/151343, assertOrder() now accepts the order with current.relevance > previous.relevance instead of current.relevance >= previous.relevance, additional tests use assertOrder([]).

Change-Id: I7f7c27d2e3205cc4b556e0fbb1b238a743d281ec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151323
Commit-Queue: Jaime Wren <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: jwren

pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart

@@ -8,7 +8,7 @@ import 'package:analysis_server/src/provisional/completion/dart/completion_dart.
 import 'package:analysis_server/src/services/completion/completion_core.dart';
 import 'package:analysis_server/src/services/completion/completion_performance.dart';
 import 'package:analysis_server/src/services/completion/dart/completion_manager.dart'
-    show DartCompletionManager, DartCompletionRequestImpl;
+    show DartCompletionRequestImpl;
 import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
 import 'package:analysis_server/src/services/completion/dart/utilities.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';

pkg/analysis_server/test/services/completion/dart/relevance/bool_assignment_relevance_test.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
-import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'completion_relevance.dart';
@@ -35,10 +34,7 @@ foo() {
         element: ElementKind.CONSTRUCTOR,
         kind: CompletionSuggestionKind.INVOCATION);
 
-    expect(
-        trueSuggestion.relevance, greaterThan(boolFromEnvironment.relevance));
-    expect(
-        falseSuggestion.relevance, greaterThan(boolFromEnvironment.relevance));
+    assertOrder([trueSuggestion, falseSuggestion, boolFromEnvironment]);
   }
 
   Future<void> test_boolLiterals_local() async {
@@ -60,7 +56,6 @@ foo() {
         element: ElementKind.LOCAL_VARIABLE,
         kind: CompletionSuggestionKind.INVOCATION);
 
-    expect(trueSuggestion.relevance, greaterThan(bLocalVar.relevance));
-    expect(falseSuggestion.relevance, greaterThan(bLocalVar.relevance));
+    assertOrder([trueSuggestion, falseSuggestion, bLocalVar]);
   }
 }

pkg/analysis_server/test/services/completion/dart/relevance/completion_relevance.dart

@@ -25,28 +25,24 @@ class CompletionRelevanceTest extends AbstractCompletionDriverTest {
     var length = suggestions.length;
     expect(length, greaterThan(1),
         reason: 'Test must specify more than one suggestion');
-    var inOrder = true;
     var previous = suggestions[0];
     for (var i = 1; i < length; i++) {
       var current = suggestions[i];
-      if (current.relevance >= previous.relevance) {
-        inOrder = false;
+      if (current.relevance > previous.relevance) {
+        suggestions.sort((first, second) => second.relevance - first.relevance);
+        var buffer = StringBuffer();
+        buffer.writeln('Actual sort order does not match expected order.');
+        buffer.writeln('To accept the actual sort order, use:');
+        buffer.writeln();
+        buffer.writeln('    assertOrder([');
+        for (var suggestion in suggestions) {
+          var completion = suggestion.completion;
+          buffer.writeln("      suggestionWith(completion: '$completion'),");
+        }
+        buffer.writeln('    ]);');
+        fail(buffer.toString());
       }
       previous = current;
     }
-    if (!inOrder) {
-      suggestions.sort((first, second) => second.relevance - first.relevance);
-      var buffer = StringBuffer();
-      buffer.writeln('Actual sort order does not match expected order.');
-      buffer.writeln('To accept the actual sort order, use:');
-      buffer.writeln();
-      buffer.writeln('    assertOrder([');
-      for (var suggestion in suggestions) {
-        var completion = suggestion.completion;
-        buffer.writeln("      suggestionWith(completion: '$completion'),");
-      }
-      buffer.writeln('    ]);');
-      fail(buffer.toString());
-    }
   }
 }