Cross-platform thread primitives

test/Thread.cpp

 #include <gtest/gtest.h>
 #include <queue>
 #include <vector>
 
 #include "../src/Thread.h"
 
 namespace
 {
 #ifndef WIN32
   void Sleep(const int millis)
@@ skipping 19 matching lines @@
       timesCalled++;
       mutex.Unlock();
     }
   };
 
   class LockingMock : public AdblockPlus::Thread
   {
   public:
     bool working;
 
-    LockingMock(const std::string& name, std::vector<std::string>& log,
-                AdblockPlus::Mutex& logMutex)
-      : name(name), log(log), logMutex(logMutex)
+    LockingMock(std::vector<std::string>& log, AdblockPlus::Mutex& logMutex)
+      : log(log), logMutex(logMutex)
     {
     }
 
     void Run()
     {
       logMutex.Lock();
-      log.push_back(name);
+      log.push_back("started");
+      Sleep(5);
+      log.push_back("ended");
       logMutex.Unlock();
     }
 
   private:
     const std::string name;
     std::vector<std::string>& log;
     AdblockPlus::Mutex& logMutex;
   };
 
   class Enqueuer : public AdblockPlus::Thread
@@ skipping 53 matching lines @@
   ASSERT_EQ(0, mock.timesCalled);
   mock.mutex.Unlock();
   mock.Join();
   ASSERT_EQ(1, mock.timesCalled);
 }
 
 TEST(ThreadTest, Mutex)
 {
   std::vector<std::string> log;
   AdblockPlus::Mutex logMutex;
-  LockingMock mock1("mock1", log, logMutex);
-  LockingMock mock2("mock2", log, logMutex);
+  LockingMock mock1(log, logMutex);
+  LockingMock mock2(log, logMutex);
   mock1.Start();
-  Sleep(5);
   mock2.Start();
   mock1.Join();
   mock2.Join();
-  ASSERT_EQ("mock1", log[0]);
-  ASSERT_EQ("mock2", log[1]);
+  ASSERT_EQ("started", log[0]);
+  ASSERT_EQ("ended", log[1]);
+  ASSERT_EQ("started", log[2]);
+  ASSERT_EQ("ended", log[3]);
 }
 
 TEST(ThreadTest, ConditionVariable)
 {
   std::queue<int> queue;
   AdblockPlus::Mutex queueMutex;
   AdblockPlus::ConditionVariable notEmpty;
   Dequeuer dequeuer(queue, queueMutex, notEmpty);
   Enqueuer enqueuer(queue, queueMutex, notEmpty);
   dequeuer.Start();
   Sleep(5);
   enqueuer.Start();
   enqueuer.Join();
   dequeuer.Join();
   ASSERT_EQ(0, queue.size());
 }