commit 1b9069cd5d4c7763861b78ee2c0f05dc4b0bda1a
author Mike Yu <yumike@google.com> Tue Aug 25 15:17:29 2020 +0800
committer Mike Yu <yumike@google.com> Wed Sep 23 17:05:04 2020 +0800
tree 254e3c9206e12e73ee8f55d9965eca7b6d7f05a9
parent 0c8e452d3cd4be5255aa21c51047835306d2c5e3

Rewrite DnsTlsSocketTest by gMock

Bug: 149445907
Test: resolv_unit_test passed
Change-Id: I9262f65e97f11b8c682730e6e561566459f50b06

resolv_tls_unit_test.cpp

diff --git a/resolv_tls_unit_test.cpp b/resolv_tls_unit_test.cpp
index 872162b..a76c731 100644
--- a/resolv_tls_unit_test.cpp
+++ b/resolv_tls_unit_test.cpp
@@ -22,6 +22,7 @@
 
 #include <android-base/logging.h>
 #include <android-base/macros.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <netdutils/Slice.h>
 
@@ -39,8 +40,9 @@
 namespace android {
 namespace net {
 
-using netdutils::Slice;
 using netdutils::makeSlice;
+using netdutils::Slice;
+using ::testing::NiceMock;
 
 typedef std::vector<uint8_t> bytevec;
 
@@ -979,12 +981,10 @@
     EXPECT_FALSE(map.recordQuery(makeSlice(QUERY)));
 }
 
-class StubObserver : public IDnsTlsSocketObserver {
+class MockDnsTlsSocketObserver : public IDnsTlsSocketObserver {
   public:
-    bool closed = false;
-    void onResponse(std::vector<uint8_t>) override {}
-
-    void onClosed() override { closed = true; }
+    MOCK_METHOD(void, onClosed, (), (override));
+    MOCK_METHOD(void, onResponse, (std::vector<uint8_t>), (override));
 };
 
 TEST(DnsTlsSocketTest, SlowDestructor) {
@@ -1000,8 +1000,7 @@
     DnsTlsServer server;
     parseServer(tls_addr, 8530, &server.ss);
 
-    StubObserver observer;
-    ASSERT_FALSE(observer.closed);
+    MockDnsTlsSocketObserver observer;
     DnsTlsSessionCache cache;
     auto socket = std::make_unique<DnsTlsSocket>(server, MARK, &observer, &cache);
     ASSERT_TRUE(socket->initialize());
@@ -1009,11 +1008,11 @@
 
     // Test: Time the socket destructor.  This should be fast.
     auto before = std::chrono::steady_clock::now();
+    EXPECT_CALL(observer, onClosed);
     socket.reset();
     auto after = std::chrono::steady_clock::now();
     auto delay = after - before;
     LOG(DEBUG) << "Shutdown took " << delay / std::chrono::nanoseconds{1} << "ns";
-    EXPECT_TRUE(observer.closed);
     // Shutdown should complete in milliseconds, but if the shutdown signal is lost
     // it will wait for the timeout, which is expected to take 20seconds.
     EXPECT_LT(delay, std::chrono::seconds{5});
@@ -1031,8 +1030,9 @@
     DnsTlsServer server;
     parseServer(tls_addr, 8530, &server.ss);
 
-    StubObserver observer;
-    ASSERT_FALSE(observer.closed);
+    // Use NiceMock to suppress the "uninteresting calls" warning.
+    // (onClose will be called when running |socket|'s destructor)
+    NiceMock<MockDnsTlsSocketObserver> observer;
     DnsTlsSessionCache cache;
     auto socket = std::make_unique<DnsTlsSocket>(server, MARK, &observer, &cache);