From 6df5463e4d60fea612709f623e37f18104e7219c Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 25 Jan 2021 11:20:44 +0300 Subject: [PATCH] fix tests --- .../ConditionLockIntegrationTest.cpp | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/tests/concurrent/ConditionLockIntegrationTest.cpp b/tests/concurrent/ConditionLockIntegrationTest.cpp index e7f211ae..c2098790 100644 --- a/tests/concurrent/ConditionLockIntegrationTest.cpp +++ b/tests/concurrent/ConditionLockIntegrationTest.cpp @@ -8,46 +8,48 @@ class ConditionLock : public ::testing::Test, public TestUtil { public: PIMutex* m = new PIMutex(); + bool isProtect; + bool isReleased; }; TEST_F(ConditionLock, lock_is_protect) { - m->lock(); - bool* isProtect = new bool(true); - - createThread([&](){ - m->lock(); - *isProtect = false; - }); + m->lock(); + isProtect = true; + createThread([&](){ + m->lock(); + isProtect = false; + }); EXPECT_FALSE(thread->waitForFinish(WAIT_THREAD_TIME_MS)); - ASSERT_TRUE(*isProtect); + ASSERT_TRUE(isProtect); + } TEST_F(ConditionLock, unlock_is_release) { - m->lock(); - bool* isReleased = new bool(false); - m->unlock(); + m->lock(); + isReleased = false; + m->unlock(); - createThread([&](){ - m->lock(); - *isReleased = true; - m->unlock(); - }); - ASSERT_TRUE(*isReleased); + createThread([&](){ + m->lock(); + isReleased = true; + m->unlock(); + }); + ASSERT_TRUE(isReleased); } TEST_F(ConditionLock, tryLock_is_false_when_locked) { - createThread([&](){ - m->lock(); - piMSleep(WAIT_THREAD_TIME_MS); - }); - ASSERT_FALSE(m->tryLock()); + createThread([&](){ + m->lock(); + piMSleep(WAIT_THREAD_TIME_MS); + }); + ASSERT_FALSE(m->tryLock()); } TEST_F(ConditionLock, tryLock_is_true_when_unlocked) { - ASSERT_TRUE(m->tryLock()); + ASSERT_TRUE(m->tryLock()); } TEST_F(ConditionLock, tryLock_is_recursive_lock_enable) { - m->lock(); - ASSERT_TRUE(m->tryLock()); + m->lock(); + ASSERT_TRUE(m->tryLock()); }