[mojo-edk] Simplify multiprocess pipe bootstrap

mojo/edk/system/ports/ports_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <map>
 #include <queue>
@@ skipping 672 matching lines @@
   EXPECT_TRUE(node0.CanShutdownCleanly(false));
   EXPECT_TRUE(node1.CanShutdownCleanly(false));
 }
 
 TEST_F(PortsTest, SendUninitialized) {
   NodeName node0_name(0, 1);
   TestNodeDelegate node0_delegate(node0_name);
   Node node0(node0_name, &node0_delegate);
   node_map[0] = &node0;
 
-  NodeName node1_name(1, 1);
-  TestNodeDelegate node1_delegate(node1_name);
-  Node node1(node1_name, &node1_delegate);
-  node_map[1] = &node1;
-
-  // Begin to setup a pipe between node0 and node1, but don't initialize either
-  // endpoint.
-  PortRef x0, x1;
+  PortRef x0;
   EXPECT_EQ(OK, node0.CreateUninitializedPort(&x0));
-  EXPECT_EQ(OK, node1.CreateUninitializedPort(&x1));
-
-  node0_delegate.set_save_messages(true);
-  node1_delegate.set_save_messages(true);
-
-  // Send a message on each port and expect neither to arrive yet.
-
   EXPECT_EQ(ERROR_PORT_STATE_UNEXPECTED,
             SendStringMessage(&node0, x0, "oops"));
-  EXPECT_EQ(ERROR_PORT_STATE_UNEXPECTED,
-            SendStringMessage(&node1, x1, "oh well"));
-
   EXPECT_EQ(OK, node0.ClosePort(x0));
-  EXPECT_EQ(OK, node1.ClosePort(x1));
-
   EXPECT_TRUE(node0.CanShutdownCleanly(false));
-  EXPECT_TRUE(node1.CanShutdownCleanly(false));
 }
 
 TEST_F(PortsTest, SendFailure) {
   NodeName node0_name(0, 1);
   TestNodeDelegate node0_delegate(node0_name);
   Node node0(node0_name, &node0_delegate);
   node_map[0] = &node0;
 
   node0_delegate.set_save_messages(true);
 
@@ skipping 332 matching lines @@
   EXPECT_FALSE(status.has_messages);
   EXPECT_TRUE(status.peer_closed);
 
   node0.ClosePort(E);
 
   PumpTasks();
 
   EXPECT_TRUE(node0.CanShutdownCleanly(false));
 }
 
+TEST_F(PortsTest, MergePorts1) {

[darin (slow to review), 2016/02/05 17:46:45]

any other cases worth testing here? like error cases?

[Ken Rockot(use gerrit already), 2016/02/05 19:43:05]

several new tests added

+  NodeName node0_name(0, 1);
+  TestNodeDelegate node0_delegate(node0_name);
+  Node node0(node0_name, &node0_delegate);
+  node_map[0] = &node0;
+
+  NodeName node1_name(1, 1);
+  TestNodeDelegate node1_delegate(node1_name);
+  Node node1(node1_name, &node1_delegate);
+  node_map[1] = &node1;
+
+  // Setup two independent port pairs, A-B on node0 and C-D on node1.
+  PortRef A, B, C, D;
+  EXPECT_EQ(OK, node0.CreatePortPair(&A, &B));
+  EXPECT_EQ(OK, node1.CreatePortPair(&C, &D));
+
+  node0_delegate.set_read_messages(false);
+  node1_delegate.set_save_messages(true);
+
+  // Write a message on A.
+  EXPECT_EQ(OK, SendStringMessage(&node0, A, "hey"));
+
+  PumpTasks();
+
+  // Initiate a merge between B and C.
+  EXPECT_EQ(OK, node0.MergePorts(B, node1_name, C.name()));
+
+  PumpTasks();
+
+  // Expect only two receiving ports to be left after pumping tasks.
+  EXPECT_TRUE(node0.CanShutdownCleanly(true));
+  EXPECT_TRUE(node1.CanShutdownCleanly(true));
+
+  // Expect D to have received the message sent on A.
+  ScopedMessage message;
+  ASSERT_TRUE(node1_delegate.GetSavedMessage(&message));
+  EXPECT_EQ(0, strcmp("hey", ToString(message)));
+
+  EXPECT_EQ(OK, node0.ClosePort(A));
+  EXPECT_EQ(OK, node1.ClosePort(D));
+
+  // No more ports should be open.
+  EXPECT_TRUE(node0.CanShutdownCleanly(false));
+  EXPECT_TRUE(node1.CanShutdownCleanly(false));
+}
+
 }  // namespace test
 }  // namespace ports
 }  // namespace edk
 }  // namespace mojo