Revert "Øess use of getSeconds/getMicroSeconds/getMilliSeconds."

1 files changed, 9 insertions, 2 deletions

diff --git a/storage/src/tests/storageframework/clock/timetest.cpp b/storage/src/tests/storageframework/clock/timetest.cpp
index 9dbcdd409d8..e1270156aa0 100644
--- a/storage/src/tests/storageframework/clock/timetest.cpp
+++ b/storage/src/tests/storageframework/clock/timetest.cpp
@@ -8,12 +8,16 @@ namespace storage::framework::defaultimplementation {
 
 TEST(TimeTest, testBasics)
 {
+    SecondTime timeSec(1);
 
-    MilliSecTime timeMillis(1000);
+    MilliSecTime timeMillis = timeSec.getMillis();
     EXPECT_EQ(uint64_t(1000), timeMillis.getTime());
+    EXPECT_EQ(timeSec, timeMillis.getSeconds());
 
-    MicroSecTime timeMicros = timeMillis.getMicros();
+    MicroSecTime timeMicros = timeSec.getMicros();
+    EXPECT_EQ(timeSec.getMicros(), timeMillis.getMicros());
     EXPECT_EQ(timeMillis, timeMicros.getMillis());
+    EXPECT_EQ(timeSec, timeMicros.getSeconds());
 
     MicroSecTime timeMicros2 = timeMicros;
     EXPECT_EQ(timeMicros2, timeMicros);
@@ -28,6 +32,7 @@ TEST(TimeTest, testBasics)
     MilliSecTime timeMillis2 = timeMicros2.getMillis();
     EXPECT_GT(timeMillis2, timeMillis);
     EXPECT_EQ(uint64_t(1050), timeMillis2.getTime());
+    EXPECT_EQ(timeSec, timeMillis2.getSeconds());
 }
 
 TEST(TimeTest, testCreatedFromClock)
@@ -35,6 +40,7 @@ TEST(TimeTest, testCreatedFromClock)
     defaultimplementation::FakeClock clock;
     clock.setAbsoluteTimeInSeconds(600);
 
+    EXPECT_EQ(SecondTime(600), SecondTime(clock));
     EXPECT_EQ(MilliSecTime(600 * 1000), MilliSecTime(clock));
     EXPECT_EQ(MicroSecTime(600 * 1000 * 1000), MicroSecTime(clock));
 }
@@ -45,6 +51,7 @@ TEST(TimeTest, canAssignMicrosecondResolutionTimeToFakeClock)
     clock.setAbsoluteTimeInMicroSeconds(1234567); // 1.234567 seconds
 
     // All non-microsec time points must necessarily be truncated.
+    EXPECT_EQ(SecondTime(1), SecondTime(clock));
     EXPECT_EQ(MilliSecTime(1234), MilliSecTime(clock));
     EXPECT_EQ(MicroSecTime(1234567), MicroSecTime(clock));
 }