Remove the reply port form the native isolate handler

runtime/vm/dart_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/builtin.h"
 #include "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
@@ skipping 5718 matching lines @@
   url = NewString("lib.dart");
   source = NewString(kLibraryChars);
   Dart_LoadLibrary(url, source);
 
   result = Dart_Invoke(result, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 }
 
 
 void NewNativePort_send123(Dart_Port dest_port_id,
-                           Dart_Port reply_port_id,
                            Dart_CObject *message) {
-  // Gets a null message.
+  // Gets a send port message.
   EXPECT_NOTNULL(message);
-  EXPECT_EQ(Dart_CObject_kNull, message->type);
+  EXPECT_EQ(Dart_CObject_kArray, message->type);
+  EXPECT_EQ(Dart_CObject_kSendPort, message->value.as_array.values[0]->type);
 
   // Post integer value.
   Dart_CObject* response =
       reinterpret_cast<Dart_CObject*>(Dart_ScopeAllocate(sizeof(Dart_CObject)));
   response->type = Dart_CObject_kInt32;
   response->value.as_int32 = 123;
-  Dart_PostCObject(reply_port_id, response);
+  Dart_PostCObject(
+      message->value.as_array.values[0]->value.as_send_port, response);
 }
 
 
 void NewNativePort_send321(Dart_Port dest_port_id,
-                           Dart_Port reply_port_id,
                            Dart_CObject* message) {
   // Gets a null message.
   EXPECT_NOTNULL(message);
-  EXPECT_EQ(Dart_CObject_kNull, message->type);
+  EXPECT_EQ(Dart_CObject_kSendPort, message->value.as_array.values[0]->type);
 
   // Post integer value.
   Dart_CObject* response =
       reinterpret_cast<Dart_CObject*>(Dart_ScopeAllocate(sizeof(Dart_CObject)));
   response->type = Dart_CObject_kInt32;
   response->value.as_int32 = 321;
-  Dart_PostCObject(reply_port_id, response);
+  Dart_PostCObject(
+      message->value.as_array.values[0]->value.as_send_port, response);
 }
 
 
 UNIT_TEST_CASE(NewNativePort) {
   // Create a port with a bogus handler.
   Dart_Port error_port = Dart_NewNativePort("Foo", NULL, true);
   EXPECT_EQ(ILLEGAL_PORT, error_port);
 
   // Create the port w/o a current isolate, just to make sure that works.
   Dart_Port port_id1 =
       Dart_NewNativePort("Port123", NewNativePort_send123, true);
 
   TestIsolateScope __test_isolate__;
   const char* kScriptChars =
       "import 'dart:isolate';\n"
       "void callPort(SendPort port) {\n"
       "  var receivePort = new ReceivePort();\n"
-      "  port.send(null, receivePort.toSendPort());\n"
+      "  var replyPort = receivePort.toSendPort();\n"

[floitsch, 2013/10/25 18:04:58]

This will have to be merged with the isolate API.

[Søren Gjesse, 2013/10/29 07:42:57]

Done.

+      "  port.send([replyPort]);\n"
       "  receivePort.receive((message, _) {\n"
       "    receivePort.close();\n"
       "    throw new Exception(message);\n"
       "  });\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Dart_EnterScope();
 
   // Create a port w/ a current isolate, to make sure that works too.
   Dart_Port port_id2 =
@@ skipping 1565 matching lines @@
                                    NewString("main"),
                                    0,
                                    NULL);
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(8, value);
 }
 
 }  // namespace dart