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 467a1703ad963d29300e6d8a4c147ee68b125b15..0be617714cfdc00e119da31bd568bd6b09934794 100644 |
--- a/pkg/analysis_server/test/analysis_server_test.dart |
+++ b/pkg/analysis_server/test/analysis_server_test.dart |
@@ -27,9 +27,10 @@ import 'package:unittest/unittest.dart'; |
import 'mock_sdk.dart'; |
import 'mocks.dart'; |
+import 'utils.dart'; |
main() { |
- groupSep = ' | '; |
+ initializeTestEnvironment(); |
defineReflectiveTests(AnalysisServerTest); |
} |
@@ -53,12 +54,16 @@ class AnalysisServerTest { |
// bar.dart. |
resourceProvider.newFolder('/foo'); |
resourceProvider.newFolder('/bar'); |
- File foo = resourceProvider.newFile('/foo/foo.dart', ''' |
+ File foo = resourceProvider.newFile( |
+ '/foo/foo.dart', |
+ ''' |
libary foo; |
import "../bar/bar.dart"; |
'''); |
Source fooSource = foo.createSource(); |
- File bar = resourceProvider.newFile('/bar/bar.dart', ''' |
+ File bar = resourceProvider.newFile( |
+ '/bar/bar.dart', |
+ ''' |
library bar; |
import "../foo/foo.dart"; |
'''); |
@@ -121,9 +126,16 @@ import "../foo/foo.dart"; |
ExtensionManager manager = new ExtensionManager(); |
ServerPlugin serverPlugin = new ServerPlugin(); |
manager.processPlugins([serverPlugin]); |
- server = new AnalysisServer(channel, resourceProvider, packageMapProvider, |
- null, serverPlugin, new AnalysisServerOptions(), new MockSdk(), |
- InstrumentationService.NULL_SERVICE, rethrowExceptions: true); |
+ server = new AnalysisServer( |
+ channel, |
+ resourceProvider, |
+ packageMapProvider, |
+ null, |
+ serverPlugin, |
+ new AnalysisServerOptions(), |
+ new MockSdk(), |
+ InstrumentationService.NULL_SERVICE, |
+ rethrowExceptions: true); |
} |
Future test_contextDisposed() { |
@@ -405,8 +417,8 @@ import "../foo/foo.dart"; |
void test_rethrowExceptions() { |
Exception exceptionToThrow = new Exception('test exception'); |
- MockServerOperation operation = new MockServerOperation( |
- ServerOperationPriority.ANALYSIS, (_) { |
+ MockServerOperation operation = |
+ new MockServerOperation(ServerOperationPriority.ANALYSIS, (_) { |
throw exceptionToThrow; |
}); |
server.operationQueue.add(operation); |