Discard pending notifications on the same source change.

pkg/analysis_server/test/operation/operation_queue_test.dart

Index: pkg/analysis_server/test/operation/operation_queue_test.dart
diff --git a/pkg/analysis_server/test/operation/operation_queue_test.dart b/pkg/analysis_server/test/operation/operation_queue_test.dart
index 0a4f13e4903867b5d6ac9be0c5cbce10f9d82605..2fd710098a00a9c4f51a9d8ea9699527b5f106c1 100644
--- a/pkg/analysis_server/test/operation/operation_queue_test.dart
+++ b/pkg/analysis_server/test/operation/operation_queue_test.dart
@@ -9,108 +9,17 @@ import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/operation/operation_analysis.dart';
 import 'package:analysis_server/src/operation/operation_queue.dart';
 import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:typed_mock/typed_mock.dart';
 import 'package:unittest/unittest.dart';
+
 import '../mocks.dart';
-import 'package:analyzer/src/generated/source.dart';
+import '../reflective_tests.dart';
+
 
 main() {
   groupSep = ' | ';
-
-  group('ServerOperationQueue', () {
-    ServerOperationQueue queue;
-
-    setUp(() {
-      queue = new ServerOperationQueue();
-    });
-
-    test('clear', () {
-      var operationA = mockOperation(ServerOperationPriority.ANALYSIS);
-      var operationB = mockOperation(ServerOperationPriority.ANALYSIS_CONTINUE);
-      queue.add(operationA);
-      queue.add(operationB);
-      // there are some operations
-      expect(queue.isEmpty, false);
-      // clear - no operations
-      queue.clear();
-      expect(queue.isEmpty, true);
-    });
-
-    group('isEmpty', () {
-      test('true', () {
-        expect(queue.isEmpty, isTrue);
-      });
-
-      test('false', () {
-        var operation = mockOperation(ServerOperationPriority.ANALYSIS);
-        queue.add(operation);
-        expect(queue.isEmpty, isFalse);
-      });
-    });
-
-    group('take', () {
-      test('empty', () {
-        expect(queue.take(), isNull);
-      });
-
-      test('use operation priorities', () {
-        var operationA = mockOperation(ServerOperationPriority.ANALYSIS);
-        var operationB =
-            mockOperation(ServerOperationPriority.ANALYSIS_CONTINUE);
-        var operationC =
-            mockOperation(ServerOperationPriority.PRIORITY_ANALYSIS);
-        queue.add(operationA);
-        queue.add(operationB);
-        queue.add(operationC);
-        expect(queue.take(), operationC);
-        expect(queue.take(), operationB);
-        expect(queue.take(), operationA);
-        expect(queue.take(), isNull);
-      });
-
-      test('continue analysis first', () {
-        var analysisContext = new AnalysisContextMock();
-        var operationA = new PerformAnalysisOperation(analysisContext, false);
-        var operationB = new PerformAnalysisOperation(analysisContext, true);
-        queue.add(operationA);
-        queue.add(operationB);
-        expect(queue.take(), operationB);
-        expect(queue.take(), operationA);
-        expect(queue.take(), isNull);
-      });
-
-      test('priority context first', () {
-        var prioritySource = new MockSource();
-        var analysisContextA = new AnalysisContextMock();
-        var analysisContextB = new AnalysisContextMock();
-        analysisContextB.prioritySources = [prioritySource];
-        var operationA = new PerformAnalysisOperation(analysisContextA, false);
-        var operationB = new PerformAnalysisOperation(analysisContextB, false);
-        queue.add(operationA);
-        queue.add(operationB);
-        expect(queue.take(), operationB);
-        expect(queue.take(), operationA);
-        expect(queue.take(), isNull);
-      });
-
-      test('reschedule', () {
-        var prioritySource = new MockSource();
-        var analysisContextA = new AnalysisContextMock();
-        var analysisContextB = new AnalysisContextMock();
-        var operationA = new PerformAnalysisOperation(analysisContextA, false);
-        var operationB = new PerformAnalysisOperation(analysisContextB, false);
-        queue.add(operationA);
-        queue.add(operationB);
-        // update priority sources and reschedule
-        analysisContextB.prioritySources = [prioritySource];
-        queue.reschedule();
-        // verify order
-        expect(queue.take(), operationB);
-        expect(queue.take(), operationA);
-        expect(queue.take(), isNull);
-      });
-    });
-  });
+  runReflectiveTests(ServerOperationQueueTest);
 }
 
 
@@ -118,7 +27,7 @@ main() {
  *  Return a [ServerOperation] mock with the given priority.
  */
 ServerOperation mockOperation(ServerOperationPriority priority) {
-  ServerOperation operation = new ServerOperationMock();
+  ServerOperation operation = new _ServerOperationMock();
   when(operation.priority).thenReturn(priority);
   return operation;
 }
@@ -130,15 +39,144 @@ class AnalysisContextMock extends TypedMock implements InternalAnalysisContext {
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
+
 class AnalysisServerMock extends TypedMock implements AnalysisServer {
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
+
 class ServerContextManagerMock extends TypedMock implements ServerContextManager
     {
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
-class ServerOperationMock extends TypedMock implements ServerOperation {
+
+@reflectiveTest
+class ServerOperationQueueTest {
+  ServerOperationQueue queue = new ServerOperationQueue();
+
+  void test_clear() {
+    var operationA = mockOperation(ServerOperationPriority.ANALYSIS);
+    var operationB = mockOperation(ServerOperationPriority.ANALYSIS_CONTINUE);
+    queue.add(operationA);
+    queue.add(operationB);
+    // there are some operations
+    expect(queue.isEmpty, false);
+    // clear - no operations
+    queue.clear();
+    expect(queue.isEmpty, true);
+  }
+
+  void test_isEmpty_false() {
+    var operation = mockOperation(ServerOperationPriority.ANALYSIS);
+    queue.add(operation);
+    expect(queue.isEmpty, isFalse);
+  }
+
+  void test_isEmpty_true() {
+    expect(queue.isEmpty, isTrue);
+  }
+
+  void test_reschedule() {
+    var prioritySource = new MockSource();
+    var analysisContextA = new AnalysisContextMock();
+    var analysisContextB = new AnalysisContextMock();
+    var operationA = new PerformAnalysisOperation(analysisContextA, false);
+    var operationB = new PerformAnalysisOperation(analysisContextB, false);
+    queue.add(operationA);
+    queue.add(operationB);
+    // update priority sources and reschedule
+    analysisContextB.prioritySources = [prioritySource];
+    queue.reschedule();
+    // verify order
+    expect(queue.take(), operationB);
+    expect(queue.take(), operationA);
+    expect(queue.take(), isNull);
+  }
+
+  void test_sourceAboutToChange() {
+    Source sourceA = new _SourceMock();
+    Source sourceB = new _SourceMock();
+    var opA1 = new _SourceSensitiveOperationMock(sourceA);
+    var opA2 = new _SourceSensitiveOperationMock(sourceA);
+    var opB1 = new _SourceSensitiveOperationMock(sourceB);
+    var opB2 = new _SourceSensitiveOperationMock(sourceB);
+    queue.add(opA1);
+    queue.add(opB1);
+    queue.add(opA2);
+    queue.add(opB2);
+    queue.sourceAboutToChange(sourceA);
+    expect(queue.take(), same(opB1));
+    expect(queue.take(), same(opB2));
+  }
+
+  void test_take_continueAnalysisFirst() {
+    var analysisContext = new AnalysisContextMock();
+    var operationA = new PerformAnalysisOperation(analysisContext, false);
+    var operationB = new PerformAnalysisOperation(analysisContext, true);
+    queue.add(operationA);
+    queue.add(operationB);
+    expect(queue.take(), operationB);
+    expect(queue.take(), operationA);
+    expect(queue.take(), isNull);
+  }
+
+  void test_take_empty() {
+    expect(queue.take(), isNull);
+  }
+
+  void test_take_priorityContextFirst() {
+    var prioritySource = new MockSource();
+    var analysisContextA = new AnalysisContextMock();
+    var analysisContextB = new AnalysisContextMock();
+    analysisContextB.prioritySources = [prioritySource];
+    var operationA = new PerformAnalysisOperation(analysisContextA, false);
+    var operationB = new PerformAnalysisOperation(analysisContextB, false);
+    queue.add(operationA);
+    queue.add(operationB);
+    expect(queue.take(), operationB);
+    expect(queue.take(), operationA);
+    expect(queue.take(), isNull);
+  }
+
+  void test_take_useOperationPriorities() {
+    var operationA = mockOperation(ServerOperationPriority.ANALYSIS);
+    var operationB = mockOperation(ServerOperationPriority.ANALYSIS_CONTINUE);
+    var operationC = mockOperation(ServerOperationPriority.PRIORITY_ANALYSIS);
+    queue.add(operationA);
+    queue.add(operationB);
+    queue.add(operationC);
+    expect(queue.take(), operationC);
+    expect(queue.take(), operationB);
+    expect(queue.take(), operationA);
+    expect(queue.take(), isNull);
+  }
+}
+
+
+class _ServerOperationMock extends TypedMock implements ServerOperation {
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
+
+class _SourceMock extends TypedMock implements Source {
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _SourceSensitiveOperationMock extends TypedMock implements
+    SourceSensitiveOperation {
+  final Source source;
+
+  _SourceSensitiveOperationMock(this.source);
+
+  @override
+  ServerOperationPriority get priority {
+    return ServerOperationPriority.ANALYSIS_NOTIFICATION;
+  }
+
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+
+  @override
+  bool shouldBeDiscardedOnSourceChange(Source source) {
+    return source == this.source;
+  }
+}