| Index: runtime/vm/service_test.cc
|
| diff --git a/runtime/vm/service_test.cc b/runtime/vm/service_test.cc
|
| index 5071bce7869475e7f8b6570f2f10f5e0098e4d22..c272b4c1951c66fce40c1c4f2fceb3d0ee1388c2 100644
|
| --- a/runtime/vm/service_test.cc
|
| +++ b/runtime/vm/service_test.cc
|
| @@ -571,23 +571,27 @@ TEST_CASE(Service_Address) {
|
| }
|
|
|
|
|
| -static const char* alpha_callback(
|
| +static bool alpha_callback(
|
| const char* name,
|
| const char** option_keys,
|
| const char** option_values,
|
| intptr_t num_options,
|
| - void* user_data) {
|
| - return strdup("alpha");
|
| + void* user_data,
|
| + const char** result) {
|
| + *result = strdup("alpha");
|
| + return true;
|
| }
|
|
|
|
|
| -static const char* beta_callback(
|
| +static bool beta_callback(
|
| const char* name,
|
| const char** option_keys,
|
| const char** option_values,
|
| intptr_t num_options,
|
| - void* user_data) {
|
| - return strdup("beta");
|
| + void* user_data,
|
| + const char** result) {
|
| + *result = strdup("beta");
|
| + return false;
|
| }
|
|
|
|
|
| @@ -626,7 +630,7 @@ TEST_CASE(Service_EmbedderRootHandler) {
|
| service_msg = Eval(lib, "[0, port, 1, 'beta', [], []]");
|
| Service::HandleRootMessage(service_msg);
|
| EXPECT_EQ(MessageHandler::kOK, handler.HandleNextMessage());
|
| - EXPECT_STREQ("{\"jsonrpc\":\"2.0\", \"result\":beta,\"id\":1}",
|
| + EXPECT_STREQ("{\"jsonrpc\":\"2.0\", \"error\":beta,\"id\":1}",
|
| handler.msg());
|
| }
|
|
|
| @@ -666,7 +670,7 @@ TEST_CASE(Service_EmbedderIsolateHandler) {
|
| service_msg = Eval(lib, "[0, port, '0', 'beta', [], []]");
|
| Service::HandleIsolateMessage(isolate, service_msg);
|
| EXPECT_EQ(MessageHandler::kOK, handler.HandleNextMessage());
|
| - EXPECT_STREQ("{\"jsonrpc\":\"2.0\", \"result\":beta,\"id\":\"0\"}",
|
| + EXPECT_STREQ("{\"jsonrpc\":\"2.0\", \"error\":beta,\"id\":\"0\"}",
|
| handler.msg());
|
| }
|
|
|
|
|