summaryrefslogtreecommitdiffstats
path: root/storage/src/tests/storageframework
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-02-05 22:42:33 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-02-06 17:50:33 +0000
commit2037c56a04d5edd5d1d3eb197fbdc24d8331e8bf (patch)
treee4edab73bdef14ce6db9ff106afcb20e2b56a456 /storage/src/tests/storageframework
parent1a37850993a673e79182eb62220d063878d48410 (diff)
GC MilliSeconds in favor of c++11 time/duration.
Diffstat (limited to 'storage/src/tests/storageframework')
-rw-r--r--storage/src/tests/storageframework/clock/timetest.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/storage/src/tests/storageframework/clock/timetest.cpp b/storage/src/tests/storageframework/clock/timetest.cpp
index 9dbcdd409d8..0f18dc9ed3a 100644
--- a/storage/src/tests/storageframework/clock/timetest.cpp
+++ b/storage/src/tests/storageframework/clock/timetest.cpp
@@ -9,11 +9,7 @@ namespace storage::framework::defaultimplementation {
TEST(TimeTest, testBasics)
{
- MilliSecTime timeMillis(1000);
- EXPECT_EQ(uint64_t(1000), timeMillis.getTime());
-
- MicroSecTime timeMicros = timeMillis.getMicros();
- EXPECT_EQ(timeMillis, timeMicros.getMillis());
+ MicroSecTime timeMicros(1000*1000);
MicroSecTime timeMicros2 = timeMicros;
EXPECT_EQ(timeMicros2, timeMicros);
@@ -23,11 +19,6 @@ TEST(TimeTest, testBasics)
timeMicros2 -= MicroSecTime(30000);
EXPECT_LT(timeMicros2, timeMicros);
EXPECT_GT(timeMicros, timeMicros2);
- timeMicros2 += MicroSecTime(55000);
-
- MilliSecTime timeMillis2 = timeMicros2.getMillis();
- EXPECT_GT(timeMillis2, timeMillis);
- EXPECT_EQ(uint64_t(1050), timeMillis2.getTime());
}
TEST(TimeTest, testCreatedFromClock)
@@ -35,7 +26,6 @@ TEST(TimeTest, testCreatedFromClock)
defaultimplementation::FakeClock clock;
clock.setAbsoluteTimeInSeconds(600);
- EXPECT_EQ(MilliSecTime(600 * 1000), MilliSecTime(clock));
EXPECT_EQ(MicroSecTime(600 * 1000 * 1000), MicroSecTime(clock));
}
@@ -45,7 +35,6 @@ TEST(TimeTest, canAssignMicrosecondResolutionTimeToFakeClock)
clock.setAbsoluteTimeInMicroSeconds(1234567); // 1.234567 seconds
// All non-microsec time points must necessarily be truncated.
- EXPECT_EQ(MilliSecTime(1234), MilliSecTime(clock));
EXPECT_EQ(MicroSecTime(1234567), MicroSecTime(clock));
}