explicitly calling the code in SharedCrtManager to initialize allocat…

…or and api handle. This will resolve the Sensor pullish unit tests which manually creates and initializes allocator and eventloop.

source/SharedCrtResourceManager.h

@@ -58,7 +58,7 @@ namespace Aws
                 bool locateCredentials(const PlainConfig &config) const;
 
               public:
-                SharedCrtResourceManager() { initializeAllocator(); }
+                SharedCrtResourceManager() { }
 
                 virtual ~SharedCrtResourceManager();
 

source/main.cpp

@@ -297,6 +297,7 @@ int main(int argc, char *argv[])
     }
 
     resourceManager = std::make_shared<SharedCrtResourceManager>();
+    resourceManager->initializeAllocator();
 
     CliArgs cliArgs;
     if (!Config::ParseCliArgs(argc, argv, cliArgs) || !config.init(cliArgs))

test/config/TestConfig.cpp

@@ -38,6 +38,9 @@ class ConfigTestFixture : public ::testing::Test
 
     void SetUp() override
     {
+        //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+        resourceManager.initializeAllocator();
+
         // Config::Validate will check that cert, key, and root-ca files exist.
         // Create a temporary file to use as a placeholder for this purpose.
         ofstream file(filePath, std::fstream::app);
@@ -156,7 +159,6 @@ TEST_F(ConfigTestFixture, AllFeaturesEnabled)
         "secure-element-token-label": "token-label"
       }
 })";
-    SharedCrtResourceManager resourceManager;
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();

test/config/TestConfigSerialization.cpp

@@ -117,7 +117,9 @@ TEST(SerializeConfigTestFixture, SerializeConfigTest)
         ]
     }
 })";
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
     PlainConfig config;
 
     JsonObject jsonObject(jsonString);

test/devicedefender/TestDeviceDefender.cpp

@@ -85,6 +85,9 @@ class TestDeviceDefender : public testing::Test
     {
         deviceDefender = unique_ptr<MockDDFeature>(new MockDDFeature());
         manager = shared_ptr<SharedCrtResourceManager>(new SharedCrtResourceManager());
+        //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+        manager->initializeAllocator();
+
         notifier = shared_ptr<MockNotifier>(new MockNotifier());
         task = shared_ptr<MockReportTask>(new MockReportTask());
         config = getSimpleDDConfig();

test/fleetprovisioning/TestFleetProvisioning.cpp

@@ -21,6 +21,9 @@ TEST(FleetProvisioning, EmptyTemplateParameters)
 TEST(FleetProvisioning, MalformedTemplateParameters)
 {
     Aws::Iot::DeviceClient::SharedCrtResourceManager resourceManager;
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+    resourceManager.initializeAllocator();
+
     Aws::Crt::Optional<std::string> params("{\"SerialNumber\" \"Device-SN\"}"); // test missing colon
     FleetProvisioning fp;
     ASSERT_FALSE(fp.MapParameters(params));
@@ -33,6 +36,9 @@ TEST(FleetProvisioning, MalformedTemplateParameters)
 TEST(FleetProvisioning, ValidTemplateParameters)
 {
     Aws::Iot::DeviceClient::SharedCrtResourceManager resourceManager;
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+    resourceManager.initializeAllocator();
+
     Aws::Crt::Optional<std::string> params("{\"SerialNumber\": \"Device-SN\"}"); // test single JSON property
     FleetProvisioning fp;
     ASSERT_TRUE(fp.MapParameters(params));

test/jobs/TestJobDocument.cpp

@@ -173,7 +173,9 @@ TEST(JobDocument, SampleJobDocument)
     }
 })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -380,7 +382,9 @@ TEST(JobDocument, MissingRequiredFields)
     }
     })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -435,7 +439,9 @@ TEST(JobDocument, MinimumJobDocument)
     ]
 })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -530,7 +536,9 @@ TEST(JobDocument, MissingRequiredFieldsValue)
     }
     })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -559,7 +567,9 @@ TEST(JobDocument, CommandFieldsIsEmpty)
     ]
 })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -588,7 +598,9 @@ TEST(JobDocument, CommandContainsSpaceCharacters)
     ]
 })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -617,7 +629,9 @@ TEST(JobDocument, SpaceCharactersContainedWithinFirstWordOfCommand)
     ]
 })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();
@@ -637,7 +651,9 @@ TEST(JobDocument, oldJobDocumentCompatibility)
     "path": "default"
 })";
 
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();

test/jobs/TestJobsFeature.cpp

@@ -258,6 +258,9 @@ class TestJobsFeature : public ::testing::Test
   public:
     void SetUp()
     {
+        //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+        resourceManager.initializeAllocator();
+
         ThingName = Aws::Crt::String("thing-name value");
         notifier = shared_ptr<MockNotifier>(new MockNotifier());
         config = getSimpleConfig();

test/shadow/TestConfigShadowFeature.cpp

@@ -60,6 +60,9 @@ TEST(ConfigShadowFeature, resetClientConfigWithValidJSON)
 })";
 
     SharedCrtResourceManager resourceManager;
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+    resourceManager.initializeAllocator();
+
     JsonObject oldJsonObject(oldJsonString);
     JsonView jsonView = oldJsonObject.View();
     PlainConfig config;
@@ -151,6 +154,8 @@ TEST(ConfigShadowFeature, resetClientConfigWithInvalidJSON)
       }
 })";
     SharedCrtResourceManager resourceManager;
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+    resourceManager.initializeAllocator();
 
     JsonObject oldJsonObject(oldJsonString);
     JsonView jsonView = oldJsonObject.View();

test/tunneling/TestSecureTunnelingFeature.cpp

@@ -104,6 +104,9 @@ class TestSecureTunnelingFeature : public testing::Test
     void SetUp() override
     {
         manager = shared_ptr<SharedCrtResourceManager>(new SharedCrtResourceManager());
+        //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+        manager->initializeAllocator();
+
         thingName = Aws::Crt::String("thing-name value");
         secureTunnelingFeature = shared_ptr<MockSecureTunnelingFeature>(new MockSecureTunnelingFeature());
         mockClient = shared_ptr<MockIotSecureTunnelingClient>(new MockIotSecureTunnelingClient());

test/util/TestSharedResourceManager.cpp

@@ -57,6 +57,9 @@ class SharedResourceManagerTest : public ::testing::Test
 
     void SetUp() override
     {
+        //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
+        manager.initializeAllocator();
+
         // SharedCrtResourceManager::locateCredentials will check that cert, key files
         // have valid permissions. Create a temporary file to use as a placeholder for this purpose.
         FileUtils::CreateDirectoryWithPermissions(certDir.c_str(), 0700);

test/util/TestStringUtils.cpp

@@ -67,7 +67,9 @@ TEST(StringUtils, leavesNewLineAndTabAlone)
 
 TEST(StringUtils, maptoString)
 {
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String> map;
     map.insert(std::pair<Aws::Crt::String, Aws::Crt::String>("a", "b"));
@@ -134,7 +136,9 @@ TEST(StringUtils, ParseToStringVector)
 {
     "args": ["hello", "world"]
 })";
+    //Initializing allocator, so we can use CJSON lib from SDK in our unit tests.
     SharedCrtResourceManager resourceManager;
+    resourceManager.initializeAllocator();
 
     JsonObject jsonObject(jsonString);
     JsonView jsonView = jsonObject.View();