diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-24 00:03:37 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-24 12:00:12 +0100 |
commit | 195d6cded05f7ef5bde695ee047b341a0265eab3 (patch) | |
tree | af6ffa3622ae9bf7f2f5f065e269e86a019af854 /test/unit/app/system_linux_test.cpp | |
parent | c211b001d2a4c9b36034a812650f1a2ac693ee54 (diff) | |
download | colobot-195d6cded05f7ef5bde695ee047b341a0265eab3.tar.gz colobot-195d6cded05f7ef5bde695ee047b341a0265eab3.tar.bz2 colobot-195d6cded05f7ef5bde695ee047b341a0265eab3.zip |
Fixed timer functions on win32
* changed win32 implementation to QueryPerformaceTimer system function
* refactored system utils code
* proper tests for time utils and update event creation in application
* should fix issue #134
Diffstat (limited to 'test/unit/app/system_linux_test.cpp')
-rw-r--r-- | test/unit/app/system_linux_test.cpp | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/test/unit/app/system_linux_test.cpp b/test/unit/app/system_linux_test.cpp index fe89399..b0a05ca 100644 --- a/test/unit/app/system_linux_test.cpp +++ b/test/unit/app/system_linux_test.cpp @@ -3,10 +3,23 @@ #include <gtest/gtest.h> -TEST(SystemLinuxTest, TimeStampDiff) +class CSystemUtilsLinuxWrapper : public CSystemUtilsLinux { - const long long SEC = 1000000000; +public: + CSystemUtilsLinuxWrapper() {} +}; +class SystemUtilsLinuxUT : public testing::Test +{ +protected: + static const long long SEC = 1000000000; + + CSystemUtilsLinuxWrapper systemUtils; +}; + + +TEST_F(SystemUtilsLinuxUT, TimeStampDiff) +{ SystemTimeStamp before, after; before.clockTime.tv_sec = 1; @@ -15,10 +28,10 @@ TEST(SystemLinuxTest, TimeStampDiff) after.clockTime.tv_sec = 1; after.clockTime.tv_nsec = 900; - long long tDiff = TimeStampExactDiff_Linux(&before, &after); + long long tDiff = systemUtils.TimeStampExactDiff(&before, &after); EXPECT_EQ( 800, tDiff); - tDiff = TimeStampExactDiff_Linux(&after, &before); + tDiff = systemUtils.TimeStampExactDiff(&after, &before); EXPECT_EQ(-800, tDiff); // ------- @@ -29,10 +42,10 @@ TEST(SystemLinuxTest, TimeStampDiff) after.clockTime.tv_sec = 3; after.clockTime.tv_nsec = 500; - tDiff = TimeStampExactDiff_Linux(&before, &after); + tDiff = systemUtils.TimeStampExactDiff(&before, &after); EXPECT_EQ( SEC + 300, tDiff); - tDiff = TimeStampExactDiff_Linux(&after, &before); + tDiff = systemUtils.TimeStampExactDiff(&after, &before); EXPECT_EQ(-SEC - 300, tDiff); // ------- @@ -43,9 +56,9 @@ TEST(SystemLinuxTest, TimeStampDiff) after.clockTime.tv_sec = 4; after.clockTime.tv_nsec = 100; - tDiff = TimeStampExactDiff_Linux(&before, &after); + tDiff = systemUtils.TimeStampExactDiff(&before, &after); EXPECT_EQ( SEC - 100, tDiff); - tDiff = TimeStampExactDiff_Linux(&after, &before); + tDiff = systemUtils.TimeStampExactDiff(&after, &before); EXPECT_EQ(-SEC + 100, tDiff); } |