1 files changed, 6 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp
index 7fa51bb8b95..0c80553e1e7 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp
@@ -34,8 +34,7 @@ public:
         : _memory_usage(memory_usage),
           _disk_usage(disk_usage)
     {}
-    size_t get_transient_memory_usage() const override { return _memory_usage; }
-    size_t get_transient_disk_usage() const override { return _disk_usage; }
+    TransientResourceUsage get_transient_resource_usage() const override { return {_disk_usage, _memory_usage}; }
 };
 
 struct DiskMemUsageSamplerTest : public ::testing::Test {
@@ -46,7 +45,7 @@ struct DiskMemUsageSamplerTest : public ::testing::Test {
                                             50ms, make_hw_info()))
     {
         sampler.add_transient_usage_provider(std::make_shared<MyProvider>(50, 200));
-        sampler.add_transient_usage_provider(std::make_shared<MyProvider>(100, 199));
+        sampler.add_transient_usage_provider(std::make_shared<MyProvider>(100, 150));
     }
     const DiskMemUsageFilter& filter() const { return sampler.writeFilter(); }
 };
@@ -56,7 +55,7 @@ TEST_F(DiskMemUsageSamplerTest, resource_usage_is_sampled)
     // Poll for up to 20 seconds to get a sample.
     size_t i = 0;
     for (; i < static_cast<size_t>(20s / 50ms); ++i) {
-        if (filter().get_transient_memory_usage() > 0) {
+        if (filter().get_transient_resource_usage().memory() > 0) {
             break;
         }
         std::this_thread::sleep_for(50ms);
@@ -70,10 +69,10 @@ TEST_F(DiskMemUsageSamplerTest, resource_usage_is_sampled)
     EXPECT_EQ(filter().getMemoryStats().getAnonymousRss(), 0);
 #endif
     EXPECT_GT(filter().getDiskUsedSize(), 0);
-    EXPECT_EQ(150, filter().get_transient_memory_usage());
+    EXPECT_EQ(150, filter().get_transient_resource_usage().memory());
     EXPECT_EQ(150.0 / memory_size_bytes, filter().usageState().transient_memory_usage());
-    EXPECT_EQ(200, filter().get_transient_disk_usage());
-    EXPECT_EQ(200.0 / disk_size_bytes, filter().get_relative_transient_disk_usage());
+    EXPECT_EQ(350, filter().get_transient_resource_usage().disk());
+    EXPECT_EQ(350.0 / disk_size_bytes, filter().usageState().transient_disk_usage());
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()