cyber: fix service discovery manager tests fail

cyber/service_discovery/specific_manager/channel_manager_test.cc

@@ -111,12 +111,12 @@ TEST_F(ChannelManagerTest, get_proto_desc) {
   transport::Identity id_0;
   role_attr.set_id(id_0.HashValue());
   role_attr.set_proto_desc("");
-  EXPECT_TRUE(channel_manager_.Join(role_attr, RoleType::ROLE_WRITER));
+  EXPECT_FALSE(channel_manager_.Join(role_attr, RoleType::ROLE_WRITER));
 
   channel_manager_.GetProtoDesc("wasd", &proto_desc);
   EXPECT_EQ(proto_desc, "");
 
-  EXPECT_TRUE(channel_manager_.Leave(role_attr, RoleType::ROLE_WRITER));
+  EXPECT_FALSE(channel_manager_.Leave(role_attr, RoleType::ROLE_WRITER));
 
   // add a writer with real proto desc
   role_attr.set_node_name("proto");
@@ -131,14 +131,14 @@ TEST_F(ChannelManagerTest, get_proto_desc) {
   message::GetDescriptorString<proto::Chatter>(
       message::MessageType<proto::Chatter>(), &tmp);
   role_attr.set_proto_desc(tmp);
-  EXPECT_TRUE(channel_manager_.Join(role_attr, RoleType::ROLE_WRITER));
+  EXPECT_FALSE(channel_manager_.Join(role_attr, RoleType::ROLE_WRITER));
 
   proto_desc = guard;
   EXPECT_TRUE(channel_manager_.HasWriter("jkl"));
   channel_manager_.GetProtoDesc("jkl", &proto_desc);
   EXPECT_NE(proto_desc, guard);
 
-  EXPECT_TRUE(channel_manager_.Leave(role_attr, RoleType::ROLE_WRITER));
+  EXPECT_FALSE(channel_manager_.Leave(role_attr, RoleType::ROLE_WRITER));
 }
 
 TEST_F(ChannelManagerTest, has_writer) {
@@ -216,13 +216,13 @@ TEST_F(ChannelManagerTest, get_readers_attr) {
   EXPECT_EQ(readers.size(), 1);
 
   RoleAttributes role_attr(readers[0]);
-  EXPECT_TRUE(channel_manager_.Leave(role_attr, RoleType::ROLE_READER));
+  EXPECT_FALSE(channel_manager_.Leave(role_attr, RoleType::ROLE_READER));
 
   readers.clear();
   channel_manager_.GetReadersOfChannel("channel_0", &readers);
   EXPECT_EQ(readers.size(), 0);
 
-  EXPECT_TRUE(channel_manager_.Join(role_attr, RoleType::ROLE_READER));
+  EXPECT_FALSE(channel_manager_.Join(role_attr, RoleType::ROLE_READER));
   readers.clear();
   channel_manager_.GetReadersOfChannel("channel_0", &readers);
   EXPECT_EQ(readers.size(), 1);
@@ -266,7 +266,7 @@ TEST_F(ChannelManagerTest, change) {
 
   transport::Identity id;
   role_attr.set_id(id.HashValue());
-  EXPECT_TRUE(channel_manager_.Join(role_attr, RoleType::ROLE_WRITER));
+  EXPECT_FALSE(channel_manager_.Join(role_attr, RoleType::ROLE_WRITER));
 
   EXPECT_TRUE(channel_manager_.HasWriter("channel_0"));
 }

cyber/service_discovery/specific_manager/node_manager_test.cc

@@ -54,13 +54,13 @@ TEST_F(NodeManagerTest, node_change) {
   role_attr.set_node_id(node_id);
 
   EXPECT_FALSE(node_manager_->Join(role_attr, RoleType::ROLE_WRITER));
-  EXPECT_TRUE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
 
   EXPECT_TRUE(node_manager_->HasNode("node"));
 
   // node leave
   EXPECT_FALSE(node_manager_->Leave(role_attr, RoleType::ROLE_WRITER));
-  EXPECT_TRUE(node_manager_->Leave(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Leave(role_attr, RoleType::ROLE_NODE));
 
   EXPECT_FALSE(node_manager_->HasNode("node"));
 }
@@ -73,7 +73,7 @@ TEST_F(NodeManagerTest, topo_module_leave) {
   uint64_t node_id = common::GlobalData::RegisterNode("node");
   role_attr.set_node_id(node_id);
 
-  EXPECT_TRUE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
   EXPECT_TRUE(node_manager_->HasNode("node"));
 }
 
@@ -89,13 +89,13 @@ TEST_F(NodeManagerTest, add_and_remove_change_listener) {
   uint64_t node_id = common::GlobalData::RegisterNode("node");
   role_attr.set_node_id(node_id);
 
-  EXPECT_TRUE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
   EXPECT_TRUE(recv_flag);
 
   node_manager_->RemoveChangeListener(conn);
 
   recv_flag = false;
-  EXPECT_TRUE(node_manager_->Leave(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Leave(role_attr, RoleType::ROLE_NODE));
   EXPECT_FALSE(recv_flag);
 }
 
@@ -107,7 +107,7 @@ TEST_F(NodeManagerTest, has_node) {
   uint64_t node_id = common::GlobalData::RegisterNode("node");
   role_attr.set_node_id(node_id);
 
-  EXPECT_TRUE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
 
   EXPECT_TRUE(node_manager_->HasNode("node"));
   EXPECT_FALSE(node_manager_->HasNode("node11"));
@@ -121,7 +121,7 @@ TEST_F(NodeManagerTest, get_nodes) {
   uint64_t node_id = common::GlobalData::RegisterNode("node_1");
   role_attr.set_node_id(node_id);
 
-  EXPECT_TRUE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
+  EXPECT_FALSE(node_manager_->Join(role_attr, RoleType::ROLE_NODE));
 
   std::vector<RoleAttributes> attr_nodes;
   node_manager_->GetNodes(&attr_nodes);

cyber/service_discovery/specific_manager/service_manager_test.cc

@@ -55,12 +55,12 @@ TEST_F(ServiceManagerTest, server_operation) {
   role_attr.set_service_name("service");
   uint64_t service_id = common::GlobalData::RegisterService("service");
   role_attr.set_service_id(service_id);
-  EXPECT_TRUE(service_manager_->Join(role_attr, RoleType::ROLE_SERVER));
+  EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_SERVER));
   EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_NODE));
   EXPECT_TRUE(service_manager_->HasService("service"));
   EXPECT_FALSE(service_manager_->HasService("client"));
   // repeated call
-  EXPECT_TRUE(service_manager_->Join(role_attr, RoleType::ROLE_SERVER));
+  EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_SERVER));
 
   // get servers
   std::vector<RoleAttributes> servers;
@@ -69,7 +69,7 @@ TEST_F(ServiceManagerTest, server_operation) {
   EXPECT_EQ(servers.size(), 1);
 
   // leave
-  EXPECT_TRUE(service_manager_->Leave(role_attr, RoleType::ROLE_SERVER));
+  EXPECT_FALSE(service_manager_->Leave(role_attr, RoleType::ROLE_SERVER));
   EXPECT_FALSE(service_manager_->HasService("service"));
 
   servers.clear();
@@ -89,9 +89,9 @@ TEST_F(ServiceManagerTest, client_operation) {
   role_attr.set_service_name("service");
   uint64_t service_id = common::GlobalData::RegisterService("service");
   role_attr.set_service_id(service_id);
-  EXPECT_TRUE(service_manager_->Join(role_attr, RoleType::ROLE_CLIENT));
+  EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_CLIENT));
   // repeated call
-  EXPECT_TRUE(service_manager_->Join(role_attr, RoleType::ROLE_CLIENT));
+  EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_CLIENT));
 
   // get clients
   std::vector<RoleAttributes> clients;
@@ -100,7 +100,7 @@ TEST_F(ServiceManagerTest, client_operation) {
   EXPECT_EQ(clients.size(), 2);
 
   // leave
-  EXPECT_TRUE(service_manager_->Leave(role_attr, RoleType::ROLE_CLIENT));
+  EXPECT_FALSE(service_manager_->Leave(role_attr, RoleType::ROLE_CLIENT));
 
   clients.clear();
   EXPECT_TRUE(clients.empty());
@@ -118,8 +118,8 @@ TEST_F(ServiceManagerTest, topo_module_leave) {
   role_attr.set_service_name("service");
   uint64_t service_id = common::GlobalData::RegisterService("service");
   role_attr.set_service_id(service_id);
-  EXPECT_TRUE(service_manager_->Join(role_attr, RoleType::ROLE_SERVER));
-  EXPECT_TRUE(service_manager_->Join(role_attr, RoleType::ROLE_CLIENT));
+  EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_SERVER));
+  EXPECT_FALSE(service_manager_->Join(role_attr, RoleType::ROLE_CLIENT));
 
   EXPECT_TRUE(service_manager_->HasService("service"));
 }