Merge pull request #71 from awslabs/DirectoryTreeFixes

Directory tree fixes

Author: JonathanHenson

aws-cpp-sdk-core-tests/CMakeLists.txt

@@ -15,7 +15,6 @@ file(GLOB UTILS_CRYPTO_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/crypto/*.cpp")
 file(GLOB UTILS_JSON_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/json/*.cpp")
 file(GLOB UTILS_STREAM_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/stream/*.cpp")
 file(GLOB UTILS_LOGGING_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/logging/*.cpp")
-file(GLOB UTILS_MEMORY_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/memory/*.cpp")
 file(GLOB UTILS_RATE_LIMITER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/ratelimiter/*.cpp")
 file(GLOB UTILS_XML_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/xml/*.cpp")
 
@@ -32,7 +31,6 @@ file(GLOB AWS_CPP_SDK_CORE_TESTS_SRC
   ${UTILS_STREAM_SRC}
   ${UTILS_XML_SRC}
   ${UTILS_LOGGING_SRC}
-  ${UTILS_MEMORY_SRC}
   ${UTILS_RATE_LIMITER_SRC}
 )
 
@@ -49,7 +47,6 @@ if(PLATFORM_WINDOWS)
     source_group("Source Files\\utils\\stream" FILES ${UTILS_STREAM_SRC})
     source_group("Source Files\\utils\\xml" FILES ${UTILS_XML_SRC})
     source_group("Source Files\\utils\\logging" FILES ${UTILS_LOGGING_SRC})
-    source_group("Source Files\\utils\\memory" FILES ${UTILS_MEMORY_SRC})
     source_group("Source Files\\utils\\ratelimiter" FILES ${UTILS_RATE_LIMITER_SRC})
   endif()
 endif()

aws-cpp-sdk-core-tests/RunTests.cpp

@@ -19,20 +19,28 @@
 #include <aws/core/Aws.h>
 #include <aws/testing/TestingEnvironment.h>
 #include <aws/testing/platform/PlatformTesting.h>
+#include <aws/testing/MemoryTesting.h>
 
 int main(int argc, char** argv)
 {
 
     Aws::Testing::RedirectHomeToTempIfAppropriate();
 
-    Aws::SDKOptions options;
+    Aws::SDKOptions options;	
 
+	ExactTestMemorySystem memorySystem(16, 10);
+	options.memoryManagementOptions.memoryManager = &memorySystem;
     Aws::Testing::InitPlatformTest(options);
 
+	options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
+
     Aws::InitAPI(options);
     ::testing::InitGoogleTest(&argc, argv);
     int retVal = RUN_ALL_TESTS();
     Aws::ShutdownAPI(options);
+	EXPECT_EQ(memorySystem.GetCurrentOutstandingAllocations(), 0ULL);
+	EXPECT_EQ(memorySystem.GetCurrentBytesAllocated(), 0ULL);
+	EXPECT_TRUE(memorySystem.IsClean());
 
     Aws::Testing::ShutdownPlatformTest(options);
 

aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp

@@ -15,7 +15,6 @@
 
 
 #include <aws/external/gtest.h>
-#include <aws/testing/MemoryTesting.h>
 
 #include <aws/testing/mocks/aws/auth/MockEC2MetadataClient.h>
 #include <aws/testing/platform/PlatformTesting.h>
@@ -39,7 +38,7 @@ using namespace Aws::Utils;
 
 TEST(ProfileConfigFileAWSCredentialsProviderTest, TestDefaultConfig)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
+    
     auto profileDirectory = ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory();
 
     Aws::FileSystem::CreateDirectoryIfNotExists(profileDirectory.c_str());
@@ -81,7 +80,6 @@ TEST(ProfileConfigFileAWSCredentialsProviderTest, TestDefaultConfig)
 
     Aws::FileSystem::RelocateFileOrDirectory(tempFileName.c_str(), configFileName.c_str());
 
-    AWS_END_MEMORY_TEST
 }
 
 class EnvironmentModifyingTest : public ::testing::Test
@@ -130,8 +128,6 @@ class EnvironmentModifyingTest : public ::testing::Test
 
 TEST_F(EnvironmentModifyingTest, ProfileConfigTestWithEnvVars)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename() + "_blah";
 
     Aws::String oldValue = Aws::Environment::GetEnv("AWS_SHARED_CREDENTIALS_FILE");
@@ -155,14 +151,10 @@ TEST_F(EnvironmentModifyingTest, ProfileConfigTestWithEnvVars)
     EXPECT_STREQ("SomeProfileSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str());
 
     Aws::FileSystem::RemoveFileIfExists(configFileName.c_str());
-
-    AWS_END_MEMORY_TEST
 }
 
 TEST_F(EnvironmentModifyingTest, ProfileConfigTestWithEnvVarsButSpecifiedProfile)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename() + "_blah";
 
     Aws::Environment::SetEnv("AWS_SHARED_CREDENTIALS_FILE", configFileName.c_str(), 1);
@@ -189,15 +181,11 @@ TEST_F(EnvironmentModifyingTest, ProfileConfigTestWithEnvVarsButSpecifiedProfile
     EXPECT_STREQ("customProfileSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str());
 
     Aws::FileSystem::RemoveFileIfExists(configFileName.c_str());
-
-    AWS_END_MEMORY_TEST
 }
 
 
 TEST_F(EnvironmentModifyingTest, ProfileConfigTestNotSetup)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename();
     Aws::String tempFileName = configFileName + "_tempNotSetup";
 
@@ -212,64 +200,48 @@ TEST_F(EnvironmentModifyingTest, ProfileConfigTestNotSetup)
     EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSSecretKey().c_str());
 
     Aws::FileSystem::RelocateFileOrDirectory(tempFileName.c_str(), configFileName.c_str());
-
-    AWS_END_MEMORY_TEST
 }
 
 TEST_F(EnvironmentModifyingTest, TestEnvironmentVariablesExist)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     Aws::Environment::SetEnv("AWS_ACCESS_KEY_ID", "Access Key", 1);
     Aws::Environment::SetEnv("AWS_SECRET_ACCESS_KEY", "Secret Key", 1);
     Aws::Environment::SetEnv("AWS_SESSION_TOKEN", "Session Token", 1);
 
     EnvironmentAWSCredentialsProvider provider;
     ASSERT_EQ("Access Key", provider.GetAWSCredentials().GetAWSAccessKeyId());
     ASSERT_EQ("Secret Key", provider.GetAWSCredentials().GetAWSSecretKey());
-    ASSERT_EQ("Session Token", provider.GetAWSCredentials().GetSessionToken());
-
-    AWS_END_MEMORY_TEST
+    ASSERT_EQ("Session Token", provider.GetAWSCredentials().GetSessionToken());    
 }
 
 
 TEST_F(EnvironmentModifyingTest, TestEnvironmentVariablesDoNotExist)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     Aws::Environment::UnSetEnv("AWS_ACCESS_KEY_ID");
     Aws::Environment::UnSetEnv("AWS_SECRET_ACCESS_KEY");
 
     EnvironmentAWSCredentialsProvider provider;
     ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId());
     ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey());
-
-    AWS_END_MEMORY_TEST
 }
 
 
 
 TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientReturnsGoodData)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     auto mockClient = Aws::MakeShared<MockEC2MetadataClient>(AllocationTag);
 
     const char* validCredentials = "{ \"AccessKeyId\": \"goodAccessKey\", \"SecretAccessKey\": \"goodSecretKey\", \"Token\": \"goodToken\" }";
     mockClient->SetMockedCredentialsValue(validCredentials);
 
     InstanceProfileCredentialsProvider provider(Aws::MakeShared<Aws::Config::EC2InstanceProfileConfigLoader>(AllocationTag, mockClient), 1000 * 60 * 15);
     ASSERT_EQ("goodAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId());
-    ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey());
-
-    AWS_END_MEMORY_TEST
+    ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey());    
 }
 
 
 TEST(InstanceProfileCredentialsProviderTest, TestThatProviderRefreshes)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     auto mockClient = Aws::MakeShared<MockEC2MetadataClient>(AllocationTag);
 
     const char* validCredentials = "{ \"AccessKeyId\": \"goodAccessKey\", \"SecretAccessKey\": \"goodSecretKey\", \"Token\": \"goodToken\" }";
@@ -284,15 +256,11 @@ TEST(InstanceProfileCredentialsProviderTest, TestThatProviderRefreshes)
 
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
     ASSERT_EQ("betterAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId());
-    ASSERT_EQ("betterSecretKey", provider.GetAWSCredentials().GetAWSSecretKey());
-
-    AWS_END_MEMORY_TEST
+    ASSERT_EQ("betterSecretKey", provider.GetAWSCredentials().GetAWSSecretKey());    
 }
 
 TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientCouldntFindCredentials)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     auto mockClient = Aws::MakeShared<MockEC2MetadataClient>(AllocationTag);
     const char* emptyCredentials = "";
     mockClient->SetMockedCredentialsValue(emptyCredentials);
@@ -304,24 +272,18 @@ TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientCouldntFindCre
     const char* missingInfo = "{ }";
     mockClient->SetMockedCredentialsValue(missingInfo);
     ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId());
-    ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey());
-
-    AWS_END_MEMORY_TEST
+    ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey());    
 }
 
 TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientReturnsBadData)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     auto mockClient = Aws::MakeShared<MockEC2MetadataClient>(AllocationTag);
     const char* badData = "blah blah blah, I'm bad";
     mockClient->SetMockedCredentialsValue(badData);
 
     InstanceProfileCredentialsProvider provider(Aws::MakeShared<Aws::Config::EC2InstanceProfileConfigLoader>(AllocationTag, mockClient), 1000 * 60 * 15);
     ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId());
     ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey());
-
-    AWS_END_MEMORY_TEST
 }
 
 

aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp

@@ -14,7 +14,6 @@
 */
 
 #include <aws/external/gtest.h>
-#include <aws/testing/MemoryTesting.h>
 #include <aws/core/client/AWSClient.h>
 #include <aws/core/client/AWSError.h>
 #include <aws/core/client/ClientConfiguration.h>
@@ -73,7 +72,6 @@ class AmazonWebServiceRequestMock : public AmazonWebServiceRequest
 
 TEST(AWSClientTest, TestBuildHttpRequestWithHeadersOnly)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
     HeaderValueCollection headerValues;
     headerValues["test1"] = "testValue1";
     headerValues["test2"] = "testValue2";
@@ -121,13 +119,10 @@ TEST(AWSClientTest, TestBuildHttpRequestWithHeadersOnly)
     ASSERT_EQ("testValue2", finalHeaders["test2"]);
     ASSERT_EQ("www.uri.com", finalHeaders[Http::HOST_HEADER]);
     ASSERT_FALSE(finalHeaders[Http::USER_AGENT_HEADER].empty());
-
-    AWS_END_MEMORY_TEST
-}
+	}
 
 TEST(AWSClientTest, TestBuildHttpRequestWithHeadersAndBody)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10);
     HeaderValueCollection headerValues;
     headerValues["test1"] = "testValue1";
     headerValues["test2"] = "testValue2";
@@ -167,6 +162,4 @@ TEST(AWSClientTest, TestBuildHttpRequestWithHeadersAndBody)
     Aws::StringStream contentLengthExpected;
     contentLengthExpected << ss->str().length();
     ASSERT_EQ(contentLengthExpected.str(), finalHeaders[Http::CONTENT_LENGTH_HEADER]);  
-
-    AWS_END_MEMORY_TEST
 }

aws-cpp-sdk-core-tests/http/URITest.cpp

@@ -14,26 +14,19 @@
   */
 
 #include <aws/external/gtest.h>
-#include <aws/testing/MemoryTesting.h>
-
 #include <aws/core/http/URI.h>
 
 using namespace Aws::Http;
 TEST(URITest, DefaultConstructor)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     URI uri;
     EXPECT_EQ(Scheme::HTTP, uri.GetScheme());
     EXPECT_EQ(HTTP_DEFAULT_PORT, uri.GetPort());
-
-    AWS_END_MEMORY_TEST
+	    
 }
 
 TEST(URITest, TestSchemeChanges)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     URI uri;
     EXPECT_EQ(Scheme::HTTP, uri.GetScheme());
     EXPECT_EQ(HTTP_DEFAULT_PORT, uri.GetPort());
@@ -53,13 +46,10 @@ TEST(URITest, TestSchemeChanges)
     EXPECT_EQ(Scheme::HTTPS, uri.GetScheme());
     EXPECT_EQ(8080, uri.GetPort());
 
-    AWS_END_MEMORY_TEST
 }
 
 TEST(URITest, TestSetPath)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     URI uri;
     Aws::String path = "/path/to/resource";
 
@@ -71,15 +61,11 @@ TEST(URITest, TestSetPath)
     uri.SetPath(path);
     EXPECT_EQ("/path/with%20space/to/resource", uri.GetURLEncodedPath());
     //make sure we return an UnEncoded path properly
-    EXPECT_EQ(path, uri.GetPath());
-
-    AWS_END_MEMORY_TEST
+    EXPECT_EQ(path, uri.GetPath());    
 }
 
 TEST(URITest, TestAddQueryStringParameters)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     URI uri;
     Aws::String path = "/path/to/resource";
     uri.SetPath(path);
@@ -103,14 +89,10 @@ TEST(URITest, TestAddQueryStringParameters)
     //let's go ahead and make sure the url is constructed properly.
     EXPECT_STREQ("http://www.test.com/path/to/resource?test1=value1&test%20needs%20escaping=value%20needs%20escaping",
         uri.GetURIString().c_str());
-
-    AWS_END_MEMORY_TEST
 }
 
 TEST(URITest, TestCanonicalizeQueryStringParameters)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     URI uri;
     Aws::String path = "/path/to/resource";
     uri.SetPath(path);
@@ -129,27 +111,21 @@ TEST(URITest, TestCanonicalizeQueryStringParameters)
     nonStandardUri.CanonicalizeQueryString();
     EXPECT_EQ("?nonStandard", nonStandardUri.GetQueryString());
 
-    AWS_END_MEMORY_TEST
 }
 
 TEST(URITest, TestPort)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     URI uri;
     Aws::String path = "/path/to/resource";
     uri.SetPath(path);
     uri.SetAuthority("www.test.com");
     uri.SetPort(8080);
 
     EXPECT_STREQ("http://www.test.com:8080/path/to/resource", uri.GetURIString().c_str());
-
-    AWS_END_MEMORY_TEST
 }
 
 TEST(URITest, TestParse)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
 
     const char* strUri = "https://www.test.com:8443/path/to/resource?test1=value1&test%20space=value%20space";
     URI uri(strUri);
@@ -177,14 +153,10 @@ TEST(URITest, TestParse)
     EXPECT_EQ(80, uriThatBrokeTheOtherDay.GetPort());
     EXPECT_EQ("/686094048/testQueueName/", uriThatBrokeTheOtherDay.GetPath());
     EXPECT_EQ("http://sqs.us-east-1.amazonaws.com/686094048/testQueueName/", uriThatBrokeTheOtherDay.GetURIString());
-
-    AWS_END_MEMORY_TEST
 }
 
 TEST(URITest, TestParseWithColon)
 {
-    AWS_BEGIN_MEMORY_TEST(16, 10)
-
     const char* strUri = "https://test.com/path/1234:_Some_Path";
     URI uri(strUri);
 
@@ -212,7 +184,6 @@ TEST(URITest, TestParseWithColon)
     EXPECT_EQ(80, complexUri.GetPort());
     EXPECT_STREQ("/awsnativesdkputobjectstestbucket20150702T200059Z/TestObject:1234/awsnativesdkputobjectstestbucket20150702T200059Z/TestObject:Key", complexUri.GetPath().c_str());
     EXPECT_STREQ(strComplexUri, complexUri.GetURIString().c_str());
-
-    AWS_END_MEMORY_TEST
+    
 }