diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-16 22:55:04 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-16 22:55:04 -0600 |
commit | 06eae17d656fd281e05ca28d4e38696fc05d2dbf (patch) | |
tree | 3cd1f386e75cfdefaedb1ba19f8fbdc5533fc5b7 /staging_vespalib/src/tests/rusage/rusage_test.cpp | |
parent | 72e3bfb3c55653e57991ba3aff1f58f25f20dd8b (diff) |
Revert "Revert "Balder/remove steadytimestamp 2""
Diffstat (limited to 'staging_vespalib/src/tests/rusage/rusage_test.cpp')
-rw-r--r-- | staging_vespalib/src/tests/rusage/rusage_test.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/staging_vespalib/src/tests/rusage/rusage_test.cpp b/staging_vespalib/src/tests/rusage/rusage_test.cpp index 23b9d4072b1..0f2992e09e8 100644 --- a/staging_vespalib/src/tests/rusage/rusage_test.cpp +++ b/staging_vespalib/src/tests/rusage/rusage_test.cpp @@ -5,23 +5,7 @@ using namespace vespalib; -class Test : public TestApp -{ -public: - int Main() override; - void testRUsage(); -}; - -int -Test::Main() -{ - TEST_INIT("rusage_test"); - testRUsage(); - TEST_DONE(); -} - -void -Test::testRUsage() +TEST("testRUsage") { RUsage r1; EXPECT_EQUAL("", r1.toString()); @@ -30,12 +14,12 @@ Test::testRUsage() RUsage diff = r2-r1; EXPECT_EQUAL(diff.toString(), r2.toString()); { - RUsage then = RUsage::createSelf(fastos::SteadyTimeStamp(7)); + RUsage then = RUsage::createSelf(steady_time(7ns)); RUsage now = RUsage::createSelf(); EXPECT_NOT_EQUAL(now.toString(), then.toString()); } { - RUsage then = RUsage::createChildren(fastos::SteadyTimeStamp(1337583)); + RUsage then = RUsage::createChildren(steady_time(1337583ns)); RUsage now = RUsage::createChildren(); EXPECT_NOT_EQUAL(now.toString(), then.toString()); } @@ -70,4 +54,4 @@ Test::testRUsage() } } -TEST_APPHOOK(Test) +TEST_MAIN() { TEST_RUN_ALL(); } |