diff options
author | Conlain Kelly <conlain.k@gmail.com> | 2018-07-18 13:11:19 -0400 |
---|---|---|
committer | Conlain Kelly <conlain.k@gmail.com> | 2018-07-18 13:11:25 -0400 |
commit | e380ed1779e4317437cea63f070a8345b41f2d33 (patch) | |
tree | b2d6669663b91a3f235c2ce4a00c0c888751ff20 /src/components/utils/test | |
parent | 09c941dd2ffd4f98ba706895a67133318c3c5007 (diff) | |
parent | 4f21cbafb247664bd7b89bf2d39944764b1763b1 (diff) | |
download | sdl_core-e380ed1779e4317437cea63f070a8345b41f2d33.tar.gz |
Merge branch 'develop' into feature/boost_lock_implementation
Diffstat (limited to 'src/components/utils/test')
-rw-r--r-- | src/components/utils/test/atomic_object_test.cc | 57 | ||||
-rw-r--r-- | src/components/utils/test/conditional_variable_test.cc | 2 | ||||
-rw-r--r-- | src/components/utils/test/data_accessor_test.cc | 36 |
3 files changed, 22 insertions, 73 deletions
diff --git a/src/components/utils/test/atomic_object_test.cc b/src/components/utils/test/atomic_object_test.cc deleted file mode 100644 index 44975fd004..0000000000 --- a/src/components/utils/test/atomic_object_test.cc +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2015, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include "utils/atomic_object.h" -#include "gtest/gtest.h" - -namespace test { -namespace components { -namespace utils_test { - -TEST(AtomicObjectTest, Construct) { - sync_primitives::atomic_int var(5); - EXPECT_EQ(5, var); - - var = 8; - EXPECT_EQ(8, var); - - sync_primitives::atomic_bool flag = true; - - EXPECT_TRUE(flag == true); - - flag = false; - EXPECT_FALSE(flag == true); -} - -} // namespace utils_test -} // namespace components -} // namespace test diff --git a/src/components/utils/test/conditional_variable_test.cc b/src/components/utils/test/conditional_variable_test.cc index 290ff3434f..1ef29685e6 100644 --- a/src/components/utils/test/conditional_variable_test.cc +++ b/src/components/utils/test/conditional_variable_test.cc @@ -61,8 +61,8 @@ class ConditionalVariableTest : public ::testing::Test { protected: std::string test_value_; - sync_primitives::ConditionalVariable cond_var_; sync_primitives::Lock test_mutex_; + sync_primitives::ConditionalVariable cond_var_; unsigned counter_; }; diff --git a/src/components/utils/test/data_accessor_test.cc b/src/components/utils/test/data_accessor_test.cc index c7c728b676..24b7bab282 100644 --- a/src/components/utils/test/data_accessor_test.cc +++ b/src/components/utils/test/data_accessor_test.cc @@ -41,7 +41,8 @@ namespace utils_test { TEST(DataAccessorTest, CreateDataAccessor) { // arrange int test_value = 10; - sync_primitives::Lock testSet_lock_; + std::shared_ptr<sync_primitives::Lock> testSet_lock_ = + std::make_shared<sync_primitives::Lock>(); DataAccessor<int> testdata(test_value, testSet_lock_); int data_from_testdata = testdata.GetData(); @@ -52,17 +53,19 @@ TEST(DataAccessorTest, CreateDataAccessor) { TEST(DataAccessorTest, CreateDataAccessor_MutexIsLocked_CannotLockItAgain) { // arrange int test_value = 10; - sync_primitives::Lock testSet_lock_; + std::shared_ptr<sync_primitives::Lock> testSet_lock_ = + std::make_shared<sync_primitives::Lock>(); DataAccessor<int> testdata(test_value, testSet_lock_); // assert - EXPECT_FALSE(testSet_lock_.Try()); + EXPECT_FALSE(testSet_lock_->Try()); } TEST(DataAccessorTest, CopyDataAccessor_GetDataFromDataAccessors) { // arrange int test_value = 10; - sync_primitives::Lock testSet_lock_; + std::shared_ptr<sync_primitives::Lock> testSet_lock_ = + std::make_shared<sync_primitives::Lock>(); DataAccessor<int> testdata(test_value, testSet_lock_); DataAccessor<int> testdata_copy(testdata); @@ -72,14 +75,15 @@ TEST(DataAccessorTest, CopyDataAccessor_GetDataFromDataAccessors) { // assert EXPECT_EQ(data_from_testdata, data_from_testdata_copy); - EXPECT_FALSE(testSet_lock_.Try()); + EXPECT_FALSE(testSet_lock_->Try()); } TEST(DataAccessorTest, ChangedDataInDataAccessor_ChangeData_DataInDataAccessorIsChanged) { // arrange int test_value = 10; - sync_primitives::Lock testSet_lock_; + std::shared_ptr<sync_primitives::Lock> testSet_lock_ = + std::make_shared<sync_primitives::Lock>(); DataAccessor<int> testdata(test_value, testSet_lock_); test_value = 0; @@ -93,40 +97,42 @@ TEST(DataAccessorTest, DeleteDataAccessor_CreatedOneDeleteOneThread_MutexIsUnlocked) { // arrange int test_value = 10; - sync_primitives::Lock testSet_lock_; + std::shared_ptr<sync_primitives::Lock> testSet_lock_ = + std::make_shared<sync_primitives::Lock>(); { DataAccessor<int> testdata(test_value, testSet_lock_); // assert - EXPECT_FALSE(testSet_lock_.Try()); + EXPECT_FALSE(testSet_lock_->Try()); } // assert - EXPECT_TRUE(testSet_lock_.Try()); + EXPECT_TRUE(testSet_lock_->Try()); - testSet_lock_.Release(); + testSet_lock_->Release(); } TEST(DataAccessorTest, DeleteDataAccessor_CreatedThreadAndCopyDeleteBothThreads_MutexIsUnlocked) { // arrange int test_value = 10; - sync_primitives::Lock testSet_lock_; + std::shared_ptr<sync_primitives::Lock> testSet_lock_ = + std::make_shared<sync_primitives::Lock>(); { DataAccessor<int> testdata(test_value, testSet_lock_); { DataAccessor<int> testdata_copy(testdata); // assert - EXPECT_FALSE(testSet_lock_.Try()); + EXPECT_FALSE(testSet_lock_->Try()); } // assert - EXPECT_FALSE(testSet_lock_.Try()); + EXPECT_FALSE(testSet_lock_->Try()); } // assert - EXPECT_TRUE(testSet_lock_.Try()); - testSet_lock_.Release(); + EXPECT_TRUE(testSet_lock_->Try()); + testSet_lock_->Release(); } } // namespace utils_test |