diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-08 12:20:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-08 12:20:31 +0100 |
commit | e963d5ec9f95fd40e469d9cb67c25385d33d0675 (patch) | |
tree | 3fa7feafbd970a3ef9a48405de4f490c2f5a9f26 /storage/src/tests/storageframework/clock/timetest.cpp | |
parent | dacf06805e11990437412e828a06fe58d4e4f5f0 (diff) | |
parent | 4de586e0b9205501ac56d64f714413bd9853a307 (diff) |
Merge pull request #25936 from vespa-engine/balder/reduce-use-of-microsecondtime
Balder/reduce use of microsecondtime
Diffstat (limited to 'storage/src/tests/storageframework/clock/timetest.cpp')
-rw-r--r-- | storage/src/tests/storageframework/clock/timetest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/src/tests/storageframework/clock/timetest.cpp b/storage/src/tests/storageframework/clock/timetest.cpp index 0f18dc9ed3a..17625b4bf45 100644 --- a/storage/src/tests/storageframework/clock/timetest.cpp +++ b/storage/src/tests/storageframework/clock/timetest.cpp @@ -8,7 +8,6 @@ namespace storage::framework::defaultimplementation { TEST(TimeTest, testBasics) { - MicroSecTime timeMicros(1000*1000); MicroSecTime timeMicros2 = timeMicros; @@ -26,7 +25,8 @@ TEST(TimeTest, testCreatedFromClock) defaultimplementation::FakeClock clock; clock.setAbsoluteTimeInSeconds(600); - EXPECT_EQ(MicroSecTime(600 * 1000 * 1000), MicroSecTime(clock)); + EXPECT_EQ(vespalib::system_time(600s), clock.getSystemTime()); + EXPECT_EQ(vespalib::steady_time(600s), clock.getMonotonicTime()); } TEST(TimeTest, canAssignMicrosecondResolutionTimeToFakeClock) @@ -34,8 +34,9 @@ TEST(TimeTest, canAssignMicrosecondResolutionTimeToFakeClock) defaultimplementation::FakeClock clock; clock.setAbsoluteTimeInMicroSeconds(1234567); // 1.234567 seconds + EXPECT_EQ(vespalib::system_time(1234567us), clock.getSystemTime()); + EXPECT_EQ(vespalib::steady_time(1234567us), clock.getMonotonicTime()); // All non-microsec time points must necessarily be truncated. - EXPECT_EQ(MicroSecTime(1234567), MicroSecTime(clock)); } } |