From 6c5e487f6d6ddd313852432f42c27e430fc70942 Mon Sep 17 00:00:00 2001
From: Victor Vazquez <victor.vazquez@microsoft.com>
Date: Fri, 12 Mar 2021 16:22:34 -0800
Subject: [PATCH] fix pollInternal implementation (#1892)

---
 .../src/delete_key_operation.cpp                           | 2 +-
 .../azure-security-keyvault-keys/test/ut/CMakeLists.txt    | 7 +++++--
 .../test/ut/key_client_base_test.hpp                       | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
index b38fb6ee7..85dcc355a 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
@@ -35,7 +35,7 @@ Azure::Security::KeyVault::Keys::DeleteKeyOperation::PollInternal(Azure::Core::C
   {
     rawResponse = m_pipeline->GetResponse(
         context, Azure::Core::Http::HttpMethod::Get, {_detail::DeletedKeysPath, m_value.Name()});
-    m_status = CheckCompleted(*m_rawResponse);
+    m_status = CheckCompleted(*rawResponse);
   }
 
   // To ensure the success of calling Poll multiple times, even after operation is completed, a
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt
index a0a1f33fc..923c4df7a 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt
@@ -27,8 +27,11 @@ target_link_libraries(azure-security-keyvault-keys-test PRIVATE azure-security-k
 
 # gtest_add_tests will scan the test from azure-core-test and call add_test
 # for each test to ctest. This enables `ctest -r` to run specific tests directly.
-gtest_add_tests(TARGET azure-security-keyvault-keys-test
-     TEST_PREFIX azure-security-keyvault-keys-unittest.)
+gtest_discover_tests(azure-security-keyvault-keys-test
+  TEST_PREFIX azure-security-keyvault-keys-unittest.
+  NO_PRETTY_TYPES
+  NO_PRETTY_VALUES
+)
 
 
 ################## Live Tests ##########################
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
index d6149ff14..137eb1bf0 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
@@ -44,7 +44,11 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam
         Azure::Core::Http::HttpStatusCode expectedCode = Azure::Core::Http::HttpStatusCode::Ok)
     {
       auto rawResponse = response.ExtractRawResponse();
-      EXPECT_EQ(rawResponse->GetStatusCode(), expectedCode);
+      EXPECT_EQ(
+          static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
+              rawResponse->GetStatusCode()),
+          static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
+              expectedCode));
     }
   };