From 3822ca8729ace2de495a7bf405838669468242fd Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Wed, 2 Dec 2020 17:16:46 -0800 Subject: [PATCH] use private as suffix for private headers (#1040) fixes: https://github.com/Azure/azure-sdk-for-cpp/issues/1039 Adding `private` suffix for private headers. Updating core test CMake script to include the /src folder from CORE to expose the private headers to the tests. Then tests don't need to do relative-path includes. --- sdk/core/azure-core/src/http/curl/curl.cpp | 6 +++--- ...connection_pool.hpp => curl_connection_pool_private.hpp} | 2 +- .../{curl_connection.hpp => curl_connection_private.hpp} | 0 .../curl/{curl_session.hpp => curl_session_private.hpp} | 4 ++-- sdk/core/azure-core/test/ut/CMakeLists.txt | 3 +++ sdk/core/azure-core/test/ut/curl_options.cpp | 4 ++-- sdk/core/azure-core/test/ut/curl_session.hpp | 2 +- sdk/core/azure-core/test/ut/curl_session_test.cpp | 4 ++-- sdk/core/azure-core/test/ut/transport_adapter_curl.cpp | 4 ++-- 9 files changed, 16 insertions(+), 13 deletions(-) rename sdk/core/azure-core/src/http/curl/{curl_connection_pool.hpp => curl_connection_pool_private.hpp} (98%) rename sdk/core/azure-core/src/http/curl/{curl_connection.hpp => curl_connection_private.hpp} (100%) rename sdk/core/azure-core/src/http/curl/{curl_session.hpp => curl_session_private.hpp} (99%) diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp index dcb14e28e..726b5b776 100644 --- a/sdk/core/azure-core/src/http/curl/curl.cpp +++ b/sdk/core/azure-core/src/http/curl/curl.cpp @@ -8,9 +8,9 @@ #include "azure/core/internal/log.hpp" // Private incude -#include "curl_connection.hpp" -#include "curl_connection_pool.hpp" -#include "curl_session.hpp" +#include "curl_connection_pool_private.hpp" +#include "curl_connection_private.hpp" +#include "curl_session_private.hpp" #ifdef POSIX #include // for poll() diff --git a/sdk/core/azure-core/src/http/curl/curl_connection_pool.hpp b/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp similarity index 98% rename from sdk/core/azure-core/src/http/curl/curl_connection_pool.hpp rename to sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp index eb33bce82..5bd48bc18 100644 --- a/sdk/core/azure-core/src/http/curl/curl_connection_pool.hpp +++ b/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp @@ -11,7 +11,7 @@ #include "azure/core/http/http.hpp" -#include "curl_connection.hpp" +#include "curl_connection_private.hpp" #include #include diff --git a/sdk/core/azure-core/src/http/curl/curl_connection.hpp b/sdk/core/azure-core/src/http/curl/curl_connection_private.hpp similarity index 100% rename from sdk/core/azure-core/src/http/curl/curl_connection.hpp rename to sdk/core/azure-core/src/http/curl/curl_connection_private.hpp diff --git a/sdk/core/azure-core/src/http/curl/curl_session.hpp b/sdk/core/azure-core/src/http/curl/curl_session_private.hpp similarity index 99% rename from sdk/core/azure-core/src/http/curl/curl_session.hpp rename to sdk/core/azure-core/src/http/curl/curl_session_private.hpp index 70b0f5e04..13359078b 100644 --- a/sdk/core/azure-core/src/http/curl/curl_session.hpp +++ b/sdk/core/azure-core/src/http/curl/curl_session_private.hpp @@ -13,8 +13,8 @@ #include "azure/core/http/http.hpp" -#include "curl_connection.hpp" -#include "curl_connection_pool.hpp" +#include "curl_connection_pool_private.hpp" +#include "curl_connection_private.hpp" #include #include diff --git a/sdk/core/azure-core/test/ut/CMakeLists.txt b/sdk/core/azure-core/test/ut/CMakeLists.txt index b93bd2dd2..7667ce57c 100644 --- a/sdk/core/azure-core/test/ut/CMakeLists.txt +++ b/sdk/core/azure-core/test/ut/CMakeLists.txt @@ -47,6 +47,9 @@ add_executable ( uuid.cpp ) +# Adding private headers from CORE to the tests so we can test the private APIs with no relative paths include. +target_include_directories (${TARGET_NAME} PRIVATE $) + target_link_libraries(${TARGET_NAME} PRIVATE azure-core gtest gmock) # gtest_add_tests will scan the test from azure-core-test and call add_test diff --git a/sdk/core/azure-core/test/ut/curl_options.cpp b/sdk/core/azure-core/test/ut/curl_options.cpp index d665fa61f..80c39d530 100644 --- a/sdk/core/azure-core/test/ut/curl_options.cpp +++ b/sdk/core/azure-core/test/ut/curl_options.cpp @@ -12,8 +12,8 @@ #include -#include "../../src/http/curl/curl_connection.hpp" -#include "../../src/http/curl/curl_session.hpp" +#include +#include #include #include diff --git a/sdk/core/azure-core/test/ut/curl_session.hpp b/sdk/core/azure-core/test/ut/curl_session.hpp index 398842af6..1cefac0e8 100644 --- a/sdk/core/azure-core/test/ut/curl_session.hpp +++ b/sdk/core/azure-core/test/ut/curl_session.hpp @@ -15,7 +15,7 @@ #include #include -#include "../../src/http/curl/curl_connection_pool.hpp" +#include namespace Azure { namespace Core { namespace Test { diff --git a/sdk/core/azure-core/test/ut/curl_session_test.cpp b/sdk/core/azure-core/test/ut/curl_session_test.cpp index ea725aa09..223512841 100644 --- a/sdk/core/azure-core/test/ut/curl_session_test.cpp +++ b/sdk/core/azure-core/test/ut/curl_session_test.cpp @@ -6,8 +6,8 @@ #include #include -#include "../../src/http/curl/curl_connection.hpp" -#include "../../src/http/curl/curl_session.hpp" +#include +#include using ::testing::_; using ::testing::DoAll; diff --git a/sdk/core/azure-core/test/ut/transport_adapter_curl.cpp b/sdk/core/azure-core/test/ut/transport_adapter_curl.cpp index 066ef40eb..429b736c4 100644 --- a/sdk/core/azure-core/test/ut/transport_adapter_curl.cpp +++ b/sdk/core/azure-core/test/ut/transport_adapter_curl.cpp @@ -8,8 +8,8 @@ #include #include -#include "../../src/http/curl/curl_connection.hpp" -#include "../../src/http/curl/curl_connection_pool.hpp" +#include +#include using testing::ValuesIn;