diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt index 96c4ccce6..af4d71c96 100644 --- a/sdk/core/azure-core-amqp/CMakeLists.txt +++ b/sdk/core/azure-core-amqp/CMakeLists.txt @@ -192,7 +192,7 @@ az_rtti_setup( if(BUILD_TESTING) # define a symbol that enables some test hooks in code - add_compile_definitions(TESTING_BUILD) + add_compile_definitions(_azure_TESTING_BUILD) if (NOT AZ_ALL_LIBRARIES) include(AddGoogleTest) diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp index dcb82ee6b..8c4c6c0f9 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp @@ -37,7 +37,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { Jwt, }; -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) /** @brief Implementation of AMQP 1.0 Claims-based Security (CBS) protocol. * * This class allows AMQP clients to implement the CBS protocol for authentication and @@ -74,5 +74,5 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { private: std::shared_ptr m_impl; }; -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD }}}} // namespace Azure::Core::Amqp::_detail diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp index 5798add6b..1c72489ce 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp @@ -21,7 +21,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { class ConnectionFactory; }}}} // namespace Azure::Core::Amqp::_detail -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // Define the test classes dependant on this class here. namespace Azure { namespace Core { namespace Amqp { namespace Tests { namespace MessageTests { @@ -44,7 +44,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Tests { class TestMessages_ReceiverReceiveAsync_Test; }}}} // namespace Azure::Core::Amqp::Tests -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD #if defined(SAMPLES_BUILD) namespace LocalServerSample { int LocalServerSampleMain(); @@ -452,7 +452,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal { std::shared_ptr<_detail::ConnectionImpl> m_impl; friend class _detail::ConnectionFactory; -#if TESTING_BUILD +#if _azure_TESTING_BUILD friend class Azure::Core::Amqp::Tests::MessageTests::AmqpServerMock; friend class Azure::Core::Amqp::Tests::MessageTests::MessageListenerEvents; friend class Azure::Core::Amqp::Tests::TestSocketListenerEvents; @@ -467,7 +467,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal { friend class Azure::Core::Amqp::Tests::TestMessages_SenderSendAsync_Test; friend class Azure::Core::Amqp::Tests::TestMessages_SenderOpenClose_Test; -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD #if SAMPLES_BUILD friend int LocalServerSample::LocalServerSampleMain(); #endif // SAMPLES_BUILD diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp index c6728bbb2..2c25ef492 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp @@ -65,7 +65,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { Invalid }; -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) class Link; class LinkImplEvents; class LinkImplEventsImpl; @@ -159,5 +159,5 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { std::shared_ptr m_implEvents; std::shared_ptr m_impl; }; -#endif // defined(TESTING_BUILD) +#endif // _azure_TESTING_BUILD }}}} // namespace Azure::Core::Amqp::_detail diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp index 7510cf880..8467ba165 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp @@ -17,13 +17,13 @@ #include -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // Define the test classes dependant on this class here. namespace Azure { namespace Core { namespace Amqp { namespace Tests { namespace MessageTests { class AmqpServerMock; class MockServiceEndpoint; }}}}} // namespace Azure::Core::Amqp::Tests::MessageTests -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILDs namespace Azure { namespace Core { namespace Amqp { namespace _detail { class MessageSenderImpl; @@ -188,10 +188,10 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal { friend class _detail::MessageSenderFactory; std::shared_ptr<_detail::MessageSenderImpl> m_impl; -#if TESTING_BUILD +#if _azure_TESTING_BUILD friend class Azure::Core::Amqp::Tests::MessageTests::AmqpServerMock; friend class Azure::Core::Amqp::Tests::MessageTests::MockServiceEndpoint; friend class Azure::Core::Amqp::Tests::MessageTests::MessageListenerEvents; -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD }; }}}} // namespace Azure::Core::Amqp::_internal diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp index 572bfeabf..93c7e4005 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp @@ -16,7 +16,7 @@ #include #include -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // Define the test classes dependant on this class here. namespace Azure { namespace Core { namespace Amqp { namespace Tests { namespace MessageTests { @@ -34,7 +34,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace Tests { class LinkSocketListenerEvents; class TestMessages_SenderSendAsync_Test; }}}} // namespace Azure::Core::Amqp::Tests -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD #if defined(SAMPLES_BUILD) namespace LocalServerSample { class SampleEvents; @@ -245,7 +245,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal { friend class _detail::SessionFactory; -#if TESTING_BUILD +#if _azure_TESTING_BUILD friend class Azure::Core::Amqp::Tests::MessageTests::AmqpServerMock; friend class Azure::Core::Amqp::Tests::MessageTests::MockServiceEndpoint; friend class Azure::Core::Amqp::Tests::MessageTests::MessageListenerEvents; @@ -258,7 +258,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _internal { friend class Azure::Core::Amqp::Tests::TestLinks_LinkAttachDetach_Test; friend class Azure::Core::Amqp::Tests::TestMessages_SenderSendAsync_Test; -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD #if SAMPLES_BUILD friend class LocalServerSample::SampleEvents; #endif // SAMPLES_BUILD diff --git a/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp b/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp index 35e78cfb3..7cfe8e102 100644 --- a/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp @@ -16,7 +16,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { using namespace Azure::Core::Amqp::_internal; // The non-Impl types for CBS exist only for testing purposes. -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) ClaimsBasedSecurity::ClaimsBasedSecurity(Session const& session) : m_impl{std::make_shared<_detail::ClaimsBasedSecurityImpl>(SessionFactory::GetImpl(session))} { @@ -37,7 +37,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { return m_impl->PutToken(tokenType, audience, token, context); } -#endif // TESTING_BUILD +#endif // _azure_TESTING_BUILD ClaimsBasedSecurityImpl::ClaimsBasedSecurityImpl(std::shared_ptr<_detail::SessionImpl> session) : m_session{session} diff --git a/sdk/core/azure-core-amqp/src/amqp/link.cpp b/sdk/core/azure-core-amqp/src/amqp/link.cpp index 30a39acf9..b7d32a795 100644 --- a/sdk/core/azure-core-amqp/src/amqp/link.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/link.cpp @@ -15,7 +15,7 @@ #include namespace Azure { namespace Core { namespace Amqp { namespace _detail { -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) class LinkImplEventsImpl : public LinkImplEvents { public: @@ -164,7 +164,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { { return m_impl->Detach(close, errorCondition, errorDescription, info); } -#endif +#endif // _azure_TESTING_BUILD std::ostream& operator<<(std::ostream& os, LinkState linkState) { diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt index 85aa4f5f3..7c858a11a 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt @@ -96,7 +96,7 @@ endif() if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY AND BUILD_TESTING) # define a symbol that enables some test hooks in code - add_compile_definitions(TESTING_BUILD) + add_compile_definitions(_azure_TESTING_BUILD) if (NOT AZ_ALL_LIBRARIES) include(AddGoogleTest) diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt index 24fff3915..803e5754d 100644 --- a/sdk/core/azure-core/CMakeLists.txt +++ b/sdk/core/azure-core/CMakeLists.txt @@ -204,7 +204,7 @@ az_rtti_setup( if(BUILD_TESTING) # define a symbol that enables some test hooks in code - add_compile_definitions(TESTING_BUILD) + add_compile_definitions(_azure_TESTING_BUILD) if (NOT AZ_ALL_LIBRARIES) include(AddGoogleTest) diff --git a/sdk/core/azure-core/inc/azure/core/http/http.hpp b/sdk/core/azure-core/inc/azure/core/http/http.hpp index 8d191b62f..373d55bb2 100644 --- a/sdk/core/azure-core/inc/azure/core/http/http.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/http.hpp @@ -28,7 +28,7 @@ #include #include -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // Define the class used from tests to validate retry enabled namespace Azure { namespace Core { namespace Test { class TestHttp_getters_Test; @@ -181,7 +181,7 @@ namespace Azure { namespace Core { namespace Http { */ class Request final { friend class Azure::Core::Http::Policies::_internal::RetryPolicy; -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // make tests classes friends to validate set Retry friend class Azure::Core::Test::TestHttp_getters_Test; friend class Azure::Core::Test::TestHttp_query_parameter_Test; diff --git a/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp b/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp index f9e4ec1ab..511a1c3a7 100644 --- a/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/policies/policy.hpp @@ -364,7 +364,7 @@ namespace Azure { namespace Core { namespace Http { namespace Policies { * @brief HTTP retry policy. */ class RetryPolicy -#if !defined(TESTING_BUILD) +#if !defined(_azure_TESTING_BUILD) final #endif : public HttpPolicy { diff --git a/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp b/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp index b99ea48c1..4560ed0c2 100644 --- a/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp +++ b/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp @@ -23,7 +23,7 @@ #include #include -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // Define the class name that reads from ConnectionPool private members namespace Azure { namespace Core { namespace Test { class CurlConnectionPool_connectionPoolTest_Test; @@ -43,7 +43,7 @@ namespace Azure { namespace Core { namespace Http { namespace _detail { * connection pool per application. */ class CurlConnectionPool final { -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // Give access to private to this tests class friend class Azure::Core::Test::CurlConnectionPool_connectionPoolTest_Test; friend class Azure::Core::Test::CurlConnectionPool_uniquePort_Test; diff --git a/sdk/core/azure-core/src/http/curl/curl_session_private.hpp b/sdk/core/azure-core/src/http/curl/curl_session_private.hpp index d10beaf3c..fb77013f7 100644 --- a/sdk/core/azure-core/src/http/curl/curl_session_private.hpp +++ b/sdk/core/azure-core/src/http/curl/curl_session_private.hpp @@ -18,7 +18,7 @@ #include #include -#ifdef TESTING_BUILD +#ifdef _azure_TESTING_BUILD // Define the class name that reads from ConnectionPool private members namespace Azure { namespace Core { namespace Test { class CurlConnectionPool_connectionPoolTest_Test; @@ -40,7 +40,7 @@ namespace Azure { namespace Core { namespace Http { * transporter to be reusable in multiple pipelines while every call to network is unique. */ class CurlSession final : public Azure::Core::IO::BodyStream { -#ifdef TESTING_BUILD +#ifdef _azure_TESTING_BUILD // Give access to private to this tests class friend class Azure::Core::Test::CurlConnectionPool_connectionPoolTest_Test; friend class Azure::Core::Test::SdkWithLibcurl_DISABLED_globalCleanUp_Test; diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt index a53226b39..50df76415 100644 --- a/sdk/identity/azure-identity/CMakeLists.txt +++ b/sdk/identity/azure-identity/CMakeLists.txt @@ -126,7 +126,7 @@ az_rtti_setup( if(BUILD_TESTING) # define a symbol that enables some test hooks in code - add_compile_definitions(TESTING_BUILD) + add_compile_definitions(_azure_TESTING_BUILD) # tests if (NOT AZ_ALL_LIBRARIES OR FETCH_SOURCE_DEPS) diff --git a/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp b/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp index 981296692..1b1beb3a4 100644 --- a/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp +++ b/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp @@ -50,7 +50,7 @@ namespace Azure { namespace Identity { * token. */ class AzureCliCredential -#if !defined(TESTING_BUILD) +#if !defined(_azure_TESTING_BUILD) final #endif : public Core::Credentials::TokenCredential { @@ -106,7 +106,7 @@ namespace Azure { namespace Identity { Core::Credentials::TokenRequestContext const& tokenRequestContext, Core::Context const& context) const override; -#if !defined(TESTING_BUILD) +#if !defined(_azure_TESTING_BUILD) private: #else protected: diff --git a/sdk/identity/azure-identity/inc/azure/identity/default_azure_credential.hpp b/sdk/identity/azure-identity/inc/azure/identity/default_azure_credential.hpp index a209f94b9..a555e432a 100644 --- a/sdk/identity/azure-identity/inc/azure/identity/default_azure_credential.hpp +++ b/sdk/identity/azure-identity/inc/azure/identity/default_azure_credential.hpp @@ -13,7 +13,7 @@ #include -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) class DefaultAzureCredential_CachingCredential_Test; #endif @@ -42,7 +42,7 @@ namespace Azure { namespace Identity { */ class DefaultAzureCredential final : public Core::Credentials::TokenCredential { -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // make tests classes friends to validate caching friend class ::DefaultAzureCredential_CachingCredential_Test; #endif diff --git a/sdk/identity/azure-identity/inc/azure/identity/detail/token_cache.hpp b/sdk/identity/azure-identity/inc/azure/identity/detail/token_cache.hpp index 6ca49b82b..c311d92c0 100644 --- a/sdk/identity/azure-identity/inc/azure/identity/detail/token_cache.hpp +++ b/sdk/identity/azure-identity/inc/azure/identity/detail/token_cache.hpp @@ -25,11 +25,11 @@ namespace Azure { namespace Identity { namespace _detail { * */ class TokenCache -#if !defined(TESTING_BUILD) +#if !defined(_azure_TESTING_BUILD) final #endif { -#if !defined(TESTING_BUILD) +#if !defined(_azure_TESTING_BUILD) private: #else protected: diff --git a/sdk/identity/azure-identity/src/private/chained_token_credential_impl.hpp b/sdk/identity/azure-identity/src/private/chained_token_credential_impl.hpp index 3dcc39d37..95415044b 100644 --- a/sdk/identity/azure-identity/src/private/chained_token_credential_impl.hpp +++ b/sdk/identity/azure-identity/src/private/chained_token_credential_impl.hpp @@ -9,7 +9,7 @@ #include #include -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) class DefaultAzureCredential_CachingCredential_Test; #endif @@ -17,7 +17,7 @@ namespace Azure { namespace Identity { namespace _detail { class ChainedTokenCredentialImpl final { -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) // make tests classes friends to validate caching friend class ::DefaultAzureCredential_CachingCredential_Test; #endif diff --git a/sdk/identity/azure-identity/src/token_cache.cpp b/sdk/identity/azure-identity/src/token_cache.cpp index acdc4be69..5c470d658 100644 --- a/sdk/identity/azure-identity/src/token_cache.cpp +++ b/sdk/identity/azure-identity/src/token_cache.cpp @@ -39,7 +39,7 @@ std::shared_ptr TokenCache::GetOrCreateValue( } } -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) OnBeforeCacheWriteLock(); #endif @@ -101,7 +101,7 @@ AccessToken TokenCache::GetToken( } } -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) OnBeforeItemWriteLock(); #endif diff --git a/sdk/keyvault/CMakeLists.txt b/sdk/keyvault/CMakeLists.txt index eec39c807..a0596e20a 100644 --- a/sdk/keyvault/CMakeLists.txt +++ b/sdk/keyvault/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) if(BUILD_TESTING) # define a symbol that enables some test hooks in code - add_compile_definitions(TESTING_BUILD) + add_compile_definitions(_azure_TESTING_BUILD) endif() add_subdirectory(azure-security-keyvault-keys) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt index 084e41fb6..8f35a7ed9 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt @@ -102,7 +102,7 @@ generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION if(BUILD_TESTING) # define a symbol that enables some test hooks in code - add_compile_definitions(TESTING_BUILD) + add_compile_definitions(_azure_TESTING_BUILD) if (NOT AZ_ALL_LIBRARIES OR FETCH_SOURCE_DEPS) include(AddGoogleTest) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp index 54781a8db..0e572edb0 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp @@ -22,7 +22,7 @@ #include namespace Azure { namespace Security { namespace KeyVault { namespace Certificates { -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) namespace Test { class KeyVaultCertificateClientTest; } @@ -36,7 +36,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Certificat class CertificateClient final { friend class CreateCertificateOperation; -#if defined(TESTING_BUILD) +#if defined(_azure_TESTING_BUILD) friend class Test::KeyVaultCertificateClientTest; #endif diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp index 79c5f13fa..1c422a10c 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp @@ -35,7 +35,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { * restoring, and listing the KeyVaultKey. */ class KeyClient -#if !defined(TESTING_BUILD) +#if !defined(_azure_TESTING_BUILD) final #endif {