| 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 24a630632d258efff2767224858be79369fc34fd..57a2e1d94948942cadc0e0d16e5b076414413037 100644
|
| --- a/pkg/analysis_server/test/analysis_server_test.dart
|
| +++ b/pkg/analysis_server/test/analysis_server_test.dart
|
| @@ -4,31 +4,19 @@
|
|
|
| library test.analysis_server;
|
|
|
| -import 'package:analyzer/src/generated/engine.dart';
|
| -import 'package:analyzer/src/generated/java_engine.dart';
|
| -import 'package:analyzer/src/generated/source.dart';
|
| +import 'package:analyzer/file_system/physical_file_system.dart';
|
| import 'package:analysis_server/src/analysis_server.dart';
|
| import 'package:analysis_server/src/constants.dart';
|
| import 'package:analysis_server/src/domain_server.dart';
|
| +import 'package:analysis_server/src/operation/operation.dart';
|
| import 'package:analysis_server/src/protocol.dart';
|
| -import 'package:analysis_server/src/resource.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:unittest/unittest.dart';
|
|
|
| import 'mocks.dart';
|
| -import 'package:analysis_server/src/operation/operation.dart';
|
| -
|
| -class AnalysisServerTestHelper {
|
| - MockServerChannel channel;
|
| - AnalysisServer server;
|
| -
|
| - AnalysisServerTestHelper({bool rethrowExceptions: true}) {
|
| - channel = new MockServerChannel();
|
| - server = new AnalysisServer(channel, PhysicalResourceProvider.INSTANCE,
|
| - new MockPackageMapProvider(), null,
|
| - rethrowExceptions: rethrowExceptions);
|
| - }
|
| -}
|
|
|
| main() {
|
| group('AnalysisServer', () {
|
| @@ -115,6 +103,18 @@ main() {
|
| });
|
| }
|
|
|
| +class AnalysisServerTestHelper {
|
| + MockServerChannel channel;
|
| + AnalysisServer server;
|
| +
|
| + AnalysisServerTestHelper({bool rethrowExceptions: true}) {
|
| + channel = new MockServerChannel();
|
| + server = new AnalysisServer(channel, PhysicalResourceProvider.INSTANCE,
|
| + new MockPackageMapProvider(), null,
|
| + rethrowExceptions: rethrowExceptions);
|
| + }
|
| +}
|
| +
|
| class EchoHandler implements RequestHandler {
|
| @override
|
| Response handleRequest(Request request) {
|
|
|