Fixed 'I'm an idiot' deadlock in text-to-speech unit tests.

Author: JonathanHenson

aws-cpp-sdk-text-to-speech-tests/TextToSpeechManagerTests.cpp

@@ -30,71 +30,71 @@ static const char* ALLOC_TAG = "TextToSpeechManagerTests";
 
 class MockPCMDriver : public PCMOutputDriver
 {
-public:   
-    MockPCMDriver() : m_primeCalledCount(0), m_flushCalledCount(0), m_mockWriteResponse(false) {}
-
-    bool WriteBufferToDevice(const unsigned char* buffer, size_t size) override
-    {
-        m_buffersWritten.push_back(ByteBuffer(buffer, size));
-        return m_mockWriteResponse;
-    }
-
-    void MockWriteResponse(bool response)
-    {
-        m_mockWriteResponse = response;
-    }
-
-    const Aws::Vector<ByteBuffer>& GetWrittenBuffers() const
-    {
-        return m_buffersWritten;
-    }
-   
-    Aws::Vector<DeviceInfo> EnumerateDevices() const override
-    {
-        return m_devices;
-    }
-
-    void AddDevice(const DeviceInfo& device)
-    {
-        m_devices.push_back(device);
-    }
-        
-    void SetActiveDevice(const DeviceInfo& device, const CapabilityInfo& caps) override
-    {
-        m_activeDevice = device;
-        m_selectedCaps = caps;
-    }
-
-    const DeviceInfo& GetActiveDevice() const
-    {
-        return m_activeDevice;
-    }
-
-    const CapabilityInfo& GetActiveCaps() const
-    {
-        return m_selectedCaps;
-    }
-
-    const char* GetName() const override
-    {
-        return MOCK_DRIVER_NAME;
-    }
-
-    size_t GetPrimeCalledCount() const
-    {
-        return m_primeCalledCount;
-    }
-
-    void Prime() override
-    {
-        m_primeCalledCount++;
-    }
-
-    size_t GetFlushCalledCount() const
-    {
-        return m_primeCalledCount;
-    }
-      
+public:   
+    MockPCMDriver() : m_primeCalledCount(0), m_flushCalledCount(0), m_mockWriteResponse(false) {}
+
+    bool WriteBufferToDevice(const unsigned char* buffer, size_t size) override
+    {
+        m_buffersWritten.push_back(ByteBuffer(buffer, size));
+        return m_mockWriteResponse;
+    }
+
+    void MockWriteResponse(bool response)
+    {
+        m_mockWriteResponse = response;
+    }
+
+    const Aws::Vector<ByteBuffer>& GetWrittenBuffers() const
+    {
+        return m_buffersWritten;
+    }
+   
+    Aws::Vector<DeviceInfo> EnumerateDevices() const override
+    {
+        return m_devices;
+    }
+
+    void AddDevice(const DeviceInfo& device)
+    {
+        m_devices.push_back(device);
+    }
+        
+    void SetActiveDevice(const DeviceInfo& device, const CapabilityInfo& caps) override
+    {
+        m_activeDevice = device;
+        m_selectedCaps = caps;
+    }
+
+    const DeviceInfo& GetActiveDevice() const
+    {
+        return m_activeDevice;
+    }
+
+    const CapabilityInfo& GetActiveCaps() const
+    {
+        return m_selectedCaps;
+    }
+
+    const char* GetName() const override
+    {
+        return MOCK_DRIVER_NAME;
+    }
+
+    size_t GetPrimeCalledCount() const
+    {
+        return m_primeCalledCount;
+    }
+
+    void Prime() override
+    {
+        m_primeCalledCount++;
+    }
+
+    size_t GetFlushCalledCount() const
+    {
+        return m_primeCalledCount;
+    }
+      
     void Flush() override
     {
         m_flushCalledCount++;
@@ -320,14 +320,15 @@ TEST(TextToSpeechManagerTests, TestSynthResponseAndOutput)
     const char* REQUEST_TEXT = "Blah blah blah";
 
     SendTextCompletedHandler handler = [&](const char* text, const SynthesizeSpeechOutcome&, bool sent) 
-        {  
-           EXPECT_STREQ(REQUEST_TEXT, text);
-           EXPECT_TRUE(sent);
-           semaphore.notify_all();
+        {
+            std::lock_guard<std::mutex> lockGuard(lock);
+            EXPECT_STREQ(REQUEST_TEXT, text);
+            EXPECT_TRUE(sent);
+            semaphore.notify_all();
         };
 
-    manager.SendTextToOutputDevice(REQUEST_TEXT, handler);
     std::unique_lock<std::mutex> locker(lock);
+    manager.SendTextToOutputDevice(REQUEST_TEXT, handler);
     semaphore.wait(locker);
 
     auto capturedRequest = pollyClient->GetCapturedSynthesizeSpeech();
@@ -381,13 +382,14 @@ TEST(TextToSpeechManagerTests, TestSynthRequestFailedAndNoOutput)
 
     SendTextCompletedHandler handler = [&](const char* text, const SynthesizeSpeechOutcome&, bool sent)
     {
+        std::lock_guard<std::mutex> lockGuard(lock);
         EXPECT_STREQ(REQUEST_TEXT, text);
         EXPECT_FALSE(sent);
         semaphore.notify_all();
     };
 
-    manager.SendTextToOutputDevice(REQUEST_TEXT, handler);
     std::unique_lock<std::mutex> locker(lock);
+    manager.SendTextToOutputDevice(REQUEST_TEXT, handler);
     semaphore.wait(locker);
 
     auto capturedRequest = pollyClient->GetCapturedSynthesizeSpeech();