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

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

Issue 2622493003: Rewrite DiagnosticDomainTest using @reflectiveTest. (Closed)
Patch Set: Created 3 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/domain_diagnostic_test.dart
diff --git a/pkg/analysis_server/test/domain_diagnostic_test.dart b/pkg/analysis_server/test/domain_diagnostic_test.dart
index 18420458b24664680cd8b9cb2920b6dd4502c9f9..a7608a6b837d855130603dc54d022c55b95bc953 100644
--- a/pkg/analysis_server/test/domain_diagnostic_test.dart
+++ b/pkg/analysis_server/test/domain_diagnostic_test.dart
@@ -5,86 +5,78 @@
library test.domain.diagnostic;
import 'package:analysis_server/plugin/protocol/protocol.dart';
-import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/domain_diagnostic.dart';
-import 'package:analysis_server/src/plugin/server_plugin.dart';
-import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:analyzer/instrumentation/instrumentation.dart';
-import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/sdk.dart';
-import 'package:plugin/manager.dart';
-import 'package:plugin/plugin.dart';
import 'package:test/test.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
-import 'mock_sdk.dart';
-import 'mocks.dart';
+import 'analysis_abstract.dart';
main() {
- AnalysisServer server;
- DiagnosticDomainHandler handler;
- MemoryResourceProvider resourceProvider;
+ defineReflectiveSuite(() {
+ defineReflectiveTests(DiagnosticDomainTest);
+ defineReflectiveTests(DiagnosticDomainTest_Driver);
+ });
+}
+
+@reflectiveTest
+class DiagnosticDomainTest extends AbstractAnalysisTest {
+ @override
+ void setUp() {
+ super.setUp();
+ handler = new DiagnosticDomainHandler(server);
+ server.handlers = [handler];
+ }
+
+ test_getDiagnostics() async {
+ String file = '/project/bin/test.dart';
+ resourceProvider.newFile('/project/pubspec.yaml', 'name: project');
+ resourceProvider.newFile(file, 'main() {}');
+
+ server.setAnalysisRoots('0', ['/project/'], [], {});
+
+ await server.onAnalysisComplete;
+
+ var request = new DiagnosticGetDiagnosticsParams().toRequest('0');
+ var response = handler.handleRequest(request);
+ var result = new DiagnosticGetDiagnosticsResult.fromResponse(response);
+
+ expect(result.contexts, hasLength(1));
- void processRequiredPlugins(ServerPlugin serverPlugin) {
- List<Plugin> plugins = <Plugin>[];
- plugins.addAll(AnalysisEngine.instance.requiredPlugins);
- plugins.add(serverPlugin);
+ ContextData context = result.contexts[0];
+ expect(context.name, '/project');
+ expect(context.explicitFileCount, 1); /* test.dart */
- ExtensionManager manager = new ExtensionManager();
- manager.processPlugins(plugins);
+ // dart:core dart:async dart:math dart:_internal
+ expect(context.implicitFileCount, 4);
+ expect(context.workItemQueueLength, isNotNull);
}
- setUp(() {
- ServerPlugin serverPlugin = new ServerPlugin();
- processRequiredPlugins(serverPlugin);
- //
- // Create the server
- //
- var serverChannel = new MockServerChannel();
- resourceProvider = new MemoryResourceProvider();
- // Create an SDK in the mock file system.
- new MockSdk(resourceProvider: resourceProvider);
- server = new AnalysisServer(
- serverChannel,
- resourceProvider,
- new MockPackageMapProvider(),
- null,
- serverPlugin,
- new AnalysisServerOptions(),
- new DartSdkManager('/', false),
- InstrumentationService.NULL_SERVICE);
- handler = new DiagnosticDomainHandler(server);
- });
+ test_getDiagnostics_noRoot() async {
+ var request = new DiagnosticGetDiagnosticsParams().toRequest('0');
+ var response = handler.handleRequest(request);
+ var result = new DiagnosticGetDiagnosticsResult.fromResponse(response);
+ expect(result.contexts, isEmpty);
+ }
+}
- group('DiagnosticDomainHandler', () {
- test('getDiagnostics', () async {
- String file = '/project/bin/test.dart';
- resourceProvider.newFile('/project/pubspec.yaml', 'name: project');
- resourceProvider.newFile(file, 'main() {}');
-
- server.setAnalysisRoots('0', ['/project/'], [], {});
-
- await server.onAnalysisComplete;
-
- var request = new DiagnosticGetDiagnosticsParams().toRequest('0');
- var response = handler.handleRequest(request);
-
- int fileCount = 1 /* test.dart */;
-
- Map json = response.toJson()[Response.RESULT];
- expect(json['contexts'], hasLength(1));
- var context = json['contexts'][0];
- expect(context['name'], '/project');
- expect(context['explicitFileCount'], fileCount);
- // dart:core dart:async dart:math dart:_internal
- expect(context['implicitFileCount'], 4);
- expect(context['workItemQueueLength'], isNotNull);
- });
-
- test('getDiagnostics - (no root)', () async {
- var request = new DiagnosticGetDiagnosticsParams().toRequest('0');
- var response = handler.handleRequest(request);
- Map json = response.toJson()[Response.RESULT];
- expect(json['contexts'], hasLength(0));
- });
- });
+@reflectiveTest
+class DiagnosticDomainTest_Driver extends DiagnosticDomainTest {
+ @override
+ void setUp() {
+ enableNewAnalysisDriver = true;
+ generateSummaryFiles = true;
+ super.setUp();
+ }
+
+ @failingTest
+ @override
+ test_getDiagnostics() {
+ return super.test_getDiagnostics();
+ }
+
+ @failingTest
+ @override
+ test_getDiagnostics_noRoot() {
+ return super.test_getDiagnostics_noRoot();
+ }
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698