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

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

Issue 532333002: Merge analysis server's mocks.dart and mocks2.dart into one file. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | pkg/analysis_server/test/computer/error_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ce1ac9c46a350dba77b19d4cf75335aa9d2f5967..b138eb661693fe13b1ab81b4a2fd329e8b0ee178 100644
--- a/pkg/analysis_server/test/analysis_server_test.dart
+++ b/pkg/analysis_server/test/analysis_server_test.dart
@@ -14,7 +14,7 @@ import 'mock_sdk.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/java_engine.dart';
import 'package:analyzer/src/generated/source.dart';
-import 'package:mock/mock.dart';
+import 'package:typed_mock/typed_mock.dart';
import 'package:unittest/unittest.dart';
import 'mocks.dart';
@@ -23,17 +23,16 @@ main() {
group('AnalysisServer', () {
test('server.status notifications', () {
AnalysisServerTestHelper helper = new AnalysisServerTestHelper();
- MockAnalysisContext context = new MockAnalysisContext();
- MockSource source = new MockSource();
- source.when(callsTo('get fullName')).alwaysReturn('foo.dart');
- source.when(callsTo('get isInSystemLibrary')).alwaysReturn(false);
+ MockAnalysisContext context = new MockAnalysisContext('context');
+ MockSource source = new MockSource('source');
+ when(source.fullName).thenReturn('foo.dart');
+ when(source.isInSystemLibrary).thenReturn(false);
ChangeNoticeImpl notice = new ChangeNoticeImpl(source);
notice.setErrors([], new LineInfo([0]));
AnalysisResult firstResult = new AnalysisResult([notice], 0, '', 0);
AnalysisResult lastResult = new AnalysisResult(null, 1, '', 1);
- context.when(callsTo("performAnalysisTask"))
- ..thenReturn(firstResult, 3)
- ..thenReturn(lastResult);
+ when(context.performAnalysisTask).thenReturnList(
+ [firstResult, firstResult, firstResult, lastResult]);
helper.server.serverServices.add(ServerService.STATUS);
helper.server.schedulePerformAnalysisOperation(context);
// Pump the event queue to make sure the server has finished any
« no previous file with comments | « no previous file | pkg/analysis_server/test/computer/error_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698