fix LookupServiceTest.testAfterClientShutdown

Author: BewareMyPower

lib/Client.cc

@@ -34,20 +34,16 @@ DECLARE_LOG_OBJECT()
 
 namespace pulsar {
 
-Client::Client(const std::shared_ptr<ClientImpl>& impl) : impl_(impl) {}
+Client::Client(const std::shared_ptr<ClientImpl>& impl) : impl_(impl) { impl_->initialize(); }
 
 Client::Client(const std::string& serviceUrl) : Client(serviceUrl, ClientConfiguration()) {}
 
 Client::Client(const std::string& serviceUrl, const ClientConfiguration& clientConfiguration)
-    : impl_(std::make_shared<ClientImpl>(serviceUrl, clientConfiguration)) {
-    impl_->initialize();
-}
+    : Client(std::make_shared<ClientImpl>(serviceUrl, clientConfiguration)) {}
 
 Client Client::create(std::unique_ptr<ServiceInfoProvider> serviceInfoProvider,
                       const ClientConfiguration& clientConfiguration) {
-    Client client(std::make_shared<ClientImpl>(std::move(serviceInfoProvider), clientConfiguration));
-    client.impl_->initialize();
-    return client;
+    return Client(std::make_shared<ClientImpl>(std::move(serviceInfoProvider), clientConfiguration));
 }
 
 Result Client::createProducer(const std::string& topic, Producer& producer) {

tests/LookupServiceTest.cc

@@ -527,23 +527,24 @@ class MockLookupService : public BinaryProtoLookupService {
 };
 
 TEST(LookupServiceTest, testAfterClientShutdown) {
-    auto client = std::make_shared<ClientImpl>(
+    auto client = PulsarFriend::newClientFromImpl(std::make_shared<ClientImpl>(
         "pulsar://localhost:6650", ClientConfiguration{},
         [](const ServiceInfo& serviceInfo, const ClientConfiguration&, ConnectionPool& pool) {
             return std::make_shared<MockLookupService>(serviceInfo, pool, ClientConfiguration{});
-        });
+        }));
+
     std::promise<Result> promise;
-    client->subscribeAsync("lookup-service-test-after-client-shutdown", "sub", ConsumerConfiguration{},
-                           [&promise](Result result, const Consumer&) { promise.set_value(result); });
+    client.subscribeAsync("lookup-service-test-after-client-shutdown", "sub", ConsumerConfiguration{},
+                          [&promise](Result result, const Consumer&) { promise.set_value(result); });
     // When shutdown is called, there is a pending lookup request due to the 1st lookup is failed in
     // MockLookupService. Verify shutdown will cancel it and return ResultDisconnected.
-    client->shutdown();
+    client.shutdown();
     EXPECT_EQ(ResultDisconnected, promise.get_future().get());
 
     // A new subscribeAsync call will fail immediately in the current thread
     Result result = ResultOk;
-    client->subscribeAsync("lookup-service-test-retry-after-destroyed", "sub", ConsumerConfiguration{},
-                           [&result](Result innerResult, const Consumer&) { result = innerResult; });
+    client.subscribeAsync("lookup-service-test-retry-after-destroyed", "sub", ConsumerConfiguration{},
+                          [&result](Result innerResult, const Consumer&) { result = innerResult; });
     EXPECT_EQ(ResultAlreadyClosed, result);
 }
 

tests/PulsarFriend.h

@@ -124,6 +124,8 @@ class PulsarFriend {
 
     static std::shared_ptr<ClientImpl> getClientImplPtr(Client client) { return client.impl_; }
 
+    static Client newClientFromImpl(const ClientImplPtr& impl) { return Client{impl}; }
+
     static auto getProducers(const Client& client) -> decltype(ClientImpl::producers_)& {
         return getClientImplPtr(client)->producers_;
     }