Revert "Revert "Balder/remove steadytimestamp 2""

1 files changed, 10 insertions, 9 deletions

diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index edaa8792d6c..e5ac6ed15b0 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -22,7 +22,8 @@ using namespace search::grouping;
 using namespace search;
 using search::attribute::test::MockAttributeContext;
 using proton::matching::SessionManager;
-using fastos::SteadyTimeStamp;
+using vespalib::steady_time;
+using vespalib::duration;
 
 //-----------------------------------------------------------------------------
 
@@ -111,8 +112,8 @@ private:
 
 struct DoomFixture {
     vespalib::Clock clock;
-    fastos::SteadyTimeStamp timeOfDoom;
-    DoomFixture() : clock(), timeOfDoom(fastos::SteadyTimeStamp::FUTURE) {}
+    steady_time timeOfDoom;
+    DoomFixture() : clock(), timeOfDoom(steady_time::max()) {}
 };
 
 //-----------------------------------------------------------------------------
@@ -472,24 +473,24 @@ TEST_F("test session timeout", DoomFixture()) {
     SessionId id1("foo");
     SessionId id2("bar");
 
-    GroupingContext initContext1(f1.clock, SteadyTimeStamp(10));
-    GroupingContext initContext2(f1.clock, SteadyTimeStamp(20));
+    GroupingContext initContext1(f1.clock, steady_time(duration(10)));
+    GroupingContext initContext2(f1.clock, steady_time(duration(20)));
     GroupingSession::UP s1(new GroupingSession(id1, initContext1, world.attributeContext));
     GroupingSession::UP s2(new GroupingSession(id2, initContext2, world.attributeContext));
     mgr.insert(std::move(s1));
     mgr.insert(std::move(s2));
-    mgr.pruneTimedOutSessions(SteadyTimeStamp(5));
+    mgr.pruneTimedOutSessions(steady_time(5ns));
     SessionManager::Stats stats(mgr.getGroupingStats());
     ASSERT_EQUAL(2u, stats.numCached);
-    mgr.pruneTimedOutSessions(SteadyTimeStamp(10));
+    mgr.pruneTimedOutSessions(steady_time(10ns));
     stats = mgr.getGroupingStats();
     ASSERT_EQUAL(2u, stats.numCached);
 
-    mgr.pruneTimedOutSessions(SteadyTimeStamp(11));
+    mgr.pruneTimedOutSessions(steady_time(11ns));
     stats = mgr.getGroupingStats();
     ASSERT_EQUAL(1u, stats.numCached);
 
-    mgr.pruneTimedOutSessions(SteadyTimeStamp(21));
+    mgr.pruneTimedOutSessions(steady_time(21ns));
     stats = mgr.getGroupingStats();
     ASSERT_EQUAL(0u, stats.numCached);
 }