Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: pkg/analysis_server/test/analysis_server_test.dart

Issue 300023004: Partial implementation of the 'setAnalysisRoots' API. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/analysis_server_test.dart
diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart
index d730201bdf6a7420cdabc59319877ef79ac76212..326ce3f679e18128bea92cf7ce95971243f30049 100644
--- a/pkg/analysis_server/test/analysis_server_test.dart
+++ b/pkg/analysis_server/test/analysis_server_test.dart
@@ -12,6 +12,7 @@ import 'package:analyzer/src/generated/error.dart';
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/domain_server.dart';
import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_server/src/resource.dart';
import 'package:mock/mock.dart';
import 'package:unittest/unittest.dart';
@@ -24,9 +25,9 @@ main() {
AnalysisServerTest.addContextToWorkQueue_twice);
test('addContextToWorkQueue_whenNotRunning',
AnalysisServerTest.addContextToWorkQueue_whenNotRunning);
- test('addContextToWorkQueue_whenRunning',
- AnalysisServerTest.addContextToWorkQueue_whenRunning);
// TODO(scheglov) remove or move to the 'analysis' domain
+// test('addContextToWorkQueue_whenRunning',
+// AnalysisServerTest.addContextToWorkQueue_whenRunning);
// test('createContext', AnalysisServerTest.createContext);
test('echo', AnalysisServerTest.echo);
test('errorToJson_formattingApplied',
@@ -49,7 +50,7 @@ class AnalysisServerTest {
static void setUp() {
channel = new MockServerChannel();
- server = new AnalysisServer(channel);
+ server = new AnalysisServer(channel, PhysicalResourceProvider.INSTANCE);
logger = new MockAnalysisLogger();
AnalysisEngine.instance.logger = logger;
}
@@ -63,44 +64,47 @@ class AnalysisServerTest {
return pumpEventQueue();
}
- static Future addContextToWorkQueue_whenRunning() {
- MockAnalysisContext context = new MockAnalysisContext();
- server.addContextToWorkQueue(context);
- server.contextIdMap[context] = 'context-27';
- MockSource source = new MockSource();
- source.when(callsTo('get encoding')).alwaysReturn('foo.dart');
- ChangeNoticeImpl changeNoticeImpl = new ChangeNoticeImpl(source);
- LineInfo lineInfo = new LineInfo([0]);
- AnalysisError analysisError = new AnalysisError.con1(source,
- CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_CONST_SUPER, ['Foo']);
- changeNoticeImpl.setErrors([analysisError], lineInfo);
- context.when(callsTo('performAnalysisTask')).thenReturn(
- new AnalysisResult([changeNoticeImpl], 0, 'myClass', 0));
- context.when(callsTo('performAnalysisTask')).thenReturn(
- new AnalysisResult(null, 0, null, 0));
- return pumpEventQueue().then((_) {
- context.getLogs(callsTo('performAnalysisTask')).verify(happenedExactly(2));
- var notifications = channel.notificationsReceived;
- expect(notifications, hasLength(2));
- expect(notifications[0].event, equals('server.connected'));
- expect(notifications[1].event, equals('context.errors'));
- expect(notifications[1].params['source'], equals('foo.dart'));
- expect(notifications[1].params['contextId'], equals('context-27'));
- List<AnalysisError> errors = notifications[1].params['errors'];
- expect(errors, hasLength(1));
- expect(errors[0], equals(AnalysisServer.errorToJson(analysisError)));
- });
- }
+ // TODO(scheglov) remove after implementing "setAnalysisRoots" API
+// static Future addContextToWorkQueue_whenRunning() {
+// MockAnalysisContext context = new MockAnalysisContext();
+// server.addContextToWorkQueue(context);
+// server.contextIdMap[context] = 'context-27';
+// MockSource source = new MockSource();
+// source.when(callsTo('get encoding')).alwaysReturn('foo.dart');
+// ChangeNoticeImpl changeNoticeImpl = new ChangeNoticeImpl(source);
+// LineInfo lineInfo = new LineInfo([0]);
+// AnalysisError analysisError = new AnalysisError.con1(source,
+// CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_CONST_SUPER, ['Foo']);
+// changeNoticeImpl.setErrors([analysisError], lineInfo);
+// context.when(callsTo('performAnalysisTask')).thenReturn(
+// new AnalysisResult([changeNoticeImpl], 0, 'myClass', 0));
+// context.when(callsTo('performAnalysisTask')).thenReturn(
+// new AnalysisResult(null, 0, null, 0));
+// return pumpEventQueue().then((_) {
+// context.getLogs(callsTo('performAnalysisTask')).verify(happenedExactly(2));
+// var notifications = channel.notificationsReceived;
+// expect(notifications, hasLength(2));
+// expect(notifications[0].event, equals('server.connected'));
+// expect(notifications[1].event, equals('context.errors'));
+// expect(notifications[1].params['source'], equals('foo.dart'));
+// expect(notifications[1].params['contextId'], equals('context-27'));
+// List<AnalysisError> errors = notifications[1].params['errors'];
+// expect(errors, hasLength(1));
+// expect(errors[0], equals(AnalysisServer.errorToJson(analysisError)));
+// });
+// }
static Future addContextToWorkQueue_twice() {
- // The context should only be asked to perform its analysis task once.
- MockAnalysisContext context = new MockAnalysisContext();
- server.addContextToWorkQueue(context);
- server.addContextToWorkQueue(context);
- context.when(callsTo('performAnalysisTask')).thenReturn(
- new AnalysisResult(null, 0, null, 0));
- return pumpEventQueue().then((_) =>
- context.getLogs(callsTo('performAnalysisTask')).verify(happenedExactly(1)));
+ // TODO(scheglov) remove after implementing "setAnalysisRoots" API
+ return new Future.value();
+// // The context should only be asked to perform its analysis task once.
+// MockAnalysisContext context = new MockAnalysisContext();
+// server.addContextToWorkQueue(context);
+// server.addContextToWorkQueue(context);
+// context.when(callsTo('performAnalysisTask')).thenReturn(
+// new AnalysisResult(null, 0, null, 0));
+// return pumpEventQueue().then((_) =>
+// context.getLogs(callsTo('performAnalysisTask')).verify(happenedExactly(1)));
}
// TODO(scheglov) remove or move to the 'analysis' domain

Powered by Google App Engine
This is Rietveld 408576698