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

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

Issue 243753002: Analysis server context ID is now specified by the client. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 8 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/domain_server_test.dart
diff --git a/pkg/analysis_server/test/domain_server_test.dart b/pkg/analysis_server/test/domain_server_test.dart
index 388960618645f93dcc52ad37bb0a10e8e311401f..cb63f617b0ac3f7d2e2962771ee595ffcbc197e8 100644
--- a/pkg/analysis_server/test/domain_server_test.dart
+++ b/pkg/analysis_server/test/domain_server_test.dart
@@ -29,24 +29,40 @@ class ServerDomainHandlerTest {
Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
+ createRequest.setParameter(ServerDomainHandler.CONTEXT_ID_PARAM, 'ctx');
Response response = handler.handleRequest(createRequest);
- String contextId = response.getResult(ServerDomainHandler.CONTEXT_ID_RESULT);
- expect(contextId, isNotNull);
+ expect(response.id, equals('0'));
+ expect(response.error, isNull);
+ expect(response.result, isEmpty);
+ }
+
+ static void createContext_alreadyExists() {
+ AnalysisServer server = new AnalysisServer(new MockServerChannel());
+ ServerDomainHandler handler = new ServerDomainHandler(server);
+
+ Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
+ createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
+ createRequest.setParameter(ServerDomainHandler.CONTEXT_ID_PARAM, 'ctx');
+ Response response = handler.handleRequest(createRequest);
+ expect(response.error, isNull);
+ response = handler.handleRequest(createRequest);
+ expect(response.error, isNotNull);
}
static void deleteContext_alreadyDeleted() {
AnalysisServer server = new AnalysisServer(new MockServerChannel());
ServerDomainHandler handler = new ServerDomainHandler(server);
+ String contextId = 'ctx';
Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
- Response response = handler.handleRequest(createRequest);
- String contextId = response.getResult(ServerDomainHandler.CONTEXT_ID_RESULT);
+ createRequest.setParameter(ServerDomainHandler.CONTEXT_ID_PARAM, contextId);
+ handler.handleRequest(createRequest);
Request deleteRequest = new Request('0', ServerDomainHandler.DELETE_CONTEXT_METHOD);
deleteRequest.setParameter(ServerDomainHandler.CONTEXT_ID_PARAM, contextId);
- response = handler.handleRequest(deleteRequest);
- response = handler.handleRequest(deleteRequest);
+ handler.handleRequest(deleteRequest);
+ Response response = handler.handleRequest(deleteRequest);
expect(response.id, equals('0'));
expect(response.error, isNotNull);
}
@@ -66,14 +82,15 @@ class ServerDomainHandlerTest {
AnalysisServer server = new AnalysisServer(new MockServerChannel());
ServerDomainHandler handler = new ServerDomainHandler(server);
+ String contextId = 'ctx';
Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
- Response response = handler.createContext(createRequest);
- String contextId = response.getResult(ServerDomainHandler.CONTEXT_ID_RESULT);
+ createRequest.setParameter(ServerDomainHandler.CONTEXT_ID_PARAM, contextId);
+ handler.createContext(createRequest);
Request deleteRequest = new Request('0', ServerDomainHandler.DELETE_CONTEXT_METHOD);
deleteRequest.setParameter(ServerDomainHandler.CONTEXT_ID_PARAM, contextId);
- response = handler.handleRequest(deleteRequest);
+ Response response = handler.handleRequest(deleteRequest);
expect(response.toJson(), equals({
Response.ID: '0',
Response.ERROR: null

Powered by Google App Engine
This is Rietveld 408576698