From 1bfbaf733088703d5a6c8b6257c46ae4d2b47d4c Mon Sep 17 00:00:00 2001
From: Victor Vazquez <victor.vazquez@microsoft.com>
Date: Wed, 16 Dec 2020 23:00:01 +0000
Subject: [PATCH] use gtest_discover_tests for creating tests (#1195)

---
 sdk/core/azure-core/test/ut/CMakeLists.txt      | 4 ++--
 sdk/core/azure-core/test/ut/main.cpp            | 2 +-
 sdk/template/azure-template/test/CMakeLists.txt | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sdk/core/azure-core/test/ut/CMakeLists.txt b/sdk/core/azure-core/test/ut/CMakeLists.txt
index 509296f54..da2614218 100644
--- a/sdk/core/azure-core/test/ut/CMakeLists.txt
+++ b/sdk/core/azure-core/test/ut/CMakeLists.txt
@@ -59,7 +59,7 @@ target_include_directories (azure-core-test PRIVATE $<BUILD_INTERFACE:${CMAKE_CU
 
 target_link_libraries(azure-core-test PRIVATE azure-core gtest gmock)
 
-# gtest_add_tests will scan the test from azure-core-test and call add_test
+# gtest_discover_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-core-test
+gtest_discover_tests(azure-core-test
      TEST_PREFIX azure-core.)
diff --git a/sdk/core/azure-core/test/ut/main.cpp b/sdk/core/azure-core/test/ut/main.cpp
index 79661728f..f638a8aac 100644
--- a/sdk/core/azure-core/test/ut/main.cpp
+++ b/sdk/core/azure-core/test/ut/main.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
 #include <curl/curl.h>
+#include <gtest/gtest.h>
 
 int main(int argc, char** argv)
 {
diff --git a/sdk/template/azure-template/test/CMakeLists.txt b/sdk/template/azure-template/test/CMakeLists.txt
index b52cf7d55..2d2b0c7b9 100644
--- a/sdk/template/azure-template/test/CMakeLists.txt
+++ b/sdk/template/azure-template/test/CMakeLists.txt
@@ -9,16 +9,18 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 add_compile_definitions(AZURE_TEST_DATA_PATH="${CMAKE_BINARY_DIR}")
 
+include(GoogleTest)
+
 add_executable (
      azure-template-test
      ut/template_test.cpp
      )
 
-target_link_libraries(azure-template-test PRIVATE Azure::azure-template)
+target_link_libraries(azure-template-test PRIVATE Azure::azure-template gtest_main)
 
 if (MSVC)
     target_compile_options(azure-template-test PUBLIC /wd6326 /wd26495 /wd26812)
 endif()
 
-add_gtest(azure-template-test)
+gtest_discover_tests(azure-template-test TEST_PREFIX azure-template.)