Merge pull request #68 from awslabs/FB-ConcurrentTests

Resource prefix to allow concurrent test runs

Author: bretambrose

aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp

@@ -36,6 +36,7 @@
 #include <aws/core/client/CoreErrors.h>
 #include <aws/core/utils/json/JsonSerializer.h>
 #include <aws/core/utils/Outcome.h>
+#include <aws/testing/TestingEnvironment.h>
 
 using namespace Aws::CognitoIdentity;
 using namespace Aws::CognitoIdentity::Model;
@@ -47,6 +48,11 @@ namespace
 {
 static const char* ALLOCATION_TAG = "IdentityPoolOperationTest";
 
+Aws::String GetResourcePrefix()
+{
+    return Aws::Testing::GetAwsResourcePrefix() + TEST_POOL_PREFIX;
+}
+
 class IdentityPoolOperationTest : public ::testing::Test
 {
 public:
@@ -71,13 +77,15 @@ class IdentityPoolOperationTest : public ::testing::Test
 
     void CleanupPreviousFailedTests()
     {
-        size_t prefixLength = strlen(TEST_POOL_PREFIX);
+        Aws::String resourcePrefix = GetResourcePrefix();
+
+        size_t prefixLength = resourcePrefix.length();
 
         Aws::Vector<IdentityPoolShortDescription> pools = GetAllPools();
         for (auto& pool : pools)
         {
             // Only delete integration test pools
-            if (pool.GetIdentityPoolName().compare(0, prefixLength, TEST_POOL_PREFIX) == 0)
+            if (pool.GetIdentityPoolName().compare(0, prefixLength, resourcePrefix) == 0)
             {
                 DeleteIdentityPoolRequest deleteIdentityPoolRequest;
                 deleteIdentityPoolRequest.WithIdentityPoolId(pool.GetIdentityPoolId());
@@ -105,7 +113,7 @@ class IdentityPoolOperationTest : public ::testing::Test
 TEST_F(IdentityPoolOperationTest, TestCreateGetUpdateDeleteOperations)
 {
     std::size_t initialPoolCount = GetAllPools().size();
-    Aws::String identityPoolName = TEST_POOL_PREFIX;
+    Aws::String identityPoolName = GetResourcePrefix();
     identityPoolName += "BatCave";
     CreateIdentityPoolRequest createIdentityPoolRequest;
     createIdentityPoolRequest.WithDeveloperProviderName("BruceWayne")
@@ -163,7 +171,7 @@ TEST_F(IdentityPoolOperationTest, TestCreateGetUpdateDeleteOperations)
 
 TEST_F(IdentityPoolOperationTest, TestExceptionProperlyPropgates)
 {
-    Aws::String identityPoolName = TEST_POOL_PREFIX;
+    Aws::String identityPoolName = GetResourcePrefix();
     identityPoolName += "Bat Cave";
 
     CreateIdentityPoolRequest createIdentityPoolRequest;
@@ -180,7 +188,7 @@ TEST_F(IdentityPoolOperationTest, TestExceptionProperlyPropgates)
 
 TEST_F(IdentityPoolOperationTest, TestIdentityActions)
 {
-    Aws::String identityPoolName = TEST_POOL_PREFIX;
+    Aws::String identityPoolName = GetResourcePrefix();
     identityPoolName += "FortressOfSolitude";
     CreateIdentityPoolRequest createIdentityPoolRequest;
     createIdentityPoolRequest.WithDeveloperProviderName("Superman")

aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp

@@ -16,12 +16,17 @@
 #include <aws/external/gtest.h>
 #include <aws/core/Aws.h>
 #include <aws/testing/platform/PlatformTesting.h>
+#include <aws/testing/TestingEnvironment.h>
 
 int main(int argc, char** argv)
 {
     Aws::SDKOptions options;
 
     Aws::Testing::InitPlatformTest(options);
+    if(argc > 1)
+    {
+        Aws::Testing::SetAwsResourcePrefix(argv[1]);
+    }
 
     options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
     Aws::InitAPI(options);

aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp

@@ -16,12 +16,17 @@
 #include <aws/external/gtest.h>
 #include <aws/core/Aws.h>
 #include <aws/testing/platform/PlatformTesting.h>
+#include <aws/testing/TestingEnvironment.h>
 
 int main(int argc, char** argv)
 {
     Aws::SDKOptions options;
 
     Aws::Testing::InitPlatformTest(options);
+    if(argc > 1)
+    {
+        Aws::Testing::SetAwsResourcePrefix(argv[1]);
+    }
 
     Aws::InitAPI(options);
     ::testing::InitGoogleTest(&argc, argv);