Fix UT

test/brpc_server_unittest.cpp

@@ -358,7 +358,7 @@ TEST_F(ServerTest, only_allow_protocols_in_enabled_protocols) {
     test::EchoService_Stub stub(&chan);
     stub.Echo(&cntl, &req, &res, NULL);
     ASSERT_TRUE(cntl.Failed());
-    ASSERT_TRUE(cntl.ErrorText().find("Got EOF of fd") != std::string::npos);
+    ASSERT_TRUE(cntl.ErrorText().find("Got EOF of {id=") != std::string::npos);
     
     ASSERT_EQ(0, server.Stop(0));
     ASSERT_EQ(0, server.Join());

test/brpc_socket_map_unittest.cpp

@@ -77,7 +77,7 @@ TEST_F(SocketMapTest, idle_timeout) {
     brpc::SocketUniquePtr main_ptr;
     brpc::SocketUniquePtr ptr;
     ASSERT_EQ(0, brpc::Socket::Address(main_id, &main_ptr));
-    ASSERT_EQ(0, brpc::Socket::GetPooledSocket(main_ptr.get(), &ptr));
+    ASSERT_EQ(0, main_ptr->GetPooledSocket(&ptr));
     ASSERT_TRUE(main_ptr.get());
     main_ptr.reset();
     id = ptr->id();
@@ -88,7 +88,7 @@ TEST_F(SocketMapTest, idle_timeout) {
     // which destroyed the Socket. As a result `GetSocketFromPool'
     // should return a new one
     ASSERT_EQ(0, brpc::Socket::Address(main_id, &main_ptr));
-    ASSERT_EQ(0, brpc::Socket::GetPooledSocket(main_ptr.get(), &ptr));
+    ASSERT_EQ(0, main_ptr->GetPooledSocket(&ptr));
     ASSERT_TRUE(main_ptr.get());
     main_ptr.reset();
     ASSERT_NE(id, ptr->id());
@@ -107,7 +107,7 @@ TEST_F(SocketMapTest, max_pool_size) {
     for (int i = 0; i < TOTALSIZE; ++i) {
         brpc::SocketUniquePtr main_ptr;
         ASSERT_EQ(0, brpc::Socket::Address(main_id, &main_ptr));
-        ASSERT_EQ(0, brpc::Socket::GetPooledSocket(main_ptr.get(), &ptrs[i]));
+        ASSERT_EQ(0, main_ptr->GetPooledSocket(&ptrs[i]));
         ASSERT_TRUE(main_ptr.get());
         main_ptr.reset();
     }

test/brpc_socket_unittest.cpp

@@ -502,7 +502,7 @@ TEST_F(SocketTest, not_health_check_when_nref_hits_0) {
         ASSERT_EQ(wait_id.value, data.id.value);
         ASSERT_EQ(ECONNREFUSED, data.error_code);
         ASSERT_TRUE(butil::StringPiece(data.error_text).starts_with(
-                        "Fail to connect SocketId="));
+                        "Fail to connect socket="));
 #else
         ASSERT_EQ(-1, s->Write(&src));
         ASSERT_EQ(ECONNREFUSED, errno);
@@ -582,7 +582,7 @@ TEST_F(SocketTest, health_check) {
     ASSERT_EQ(wait_id.value, data.id.value);
     ASSERT_EQ(ECONNREFUSED, data.error_code);
     ASSERT_TRUE(butil::StringPiece(data.error_text).starts_with(
-                    "Fail to connect SocketId="));
+                    "Fail to connect socket="));
     if (use_my_message) {
         ASSERT_TRUE(appended_msg);
     }