diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2021-01-20 11:50:20 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2021-01-20 11:50:20 +0100 |
commit | d3b97467aee2c891a78ab85e587e9014ee397762 (patch) | |
tree | 61994f5a29b193548a61e82177318be83044bdf0 /storage | |
parent | 3a2ee8e6d8789ecb58392dc68194a016d3947ab8 (diff) |
Simplify test.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/tests/persistence/filestorage/service_layer_host_info_reporter_test.cpp | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/storage/src/tests/persistence/filestorage/service_layer_host_info_reporter_test.cpp b/storage/src/tests/persistence/filestorage/service_layer_host_info_reporter_test.cpp index 0c132718d97..cf9d380fb13 100644 --- a/storage/src/tests/persistence/filestorage/service_layer_host_info_reporter_test.cpp +++ b/storage/src/tests/persistence/filestorage/service_layer_host_info_reporter_test.cpp @@ -11,6 +11,8 @@ namespace storage { +using spi::ResourceUsage; + namespace { double @@ -29,25 +31,18 @@ struct ServiceLayerHostInfoReporterTest : ::testing::Test { ServiceLayerHostInfoReporterTest(); ~ServiceLayerHostInfoReporterTest(); - void notify(double disk_usage, double memory_usage) - { + void notify(double disk_usage, double memory_usage) { auto& listener = static_cast<spi::IResourceUsageListener&>(_reporter); - listener.update_resource_usage(spi::ResourceUsage(disk_usage, memory_usage)); + listener.update_resource_usage(ResourceUsage(disk_usage, memory_usage)); } size_t requested_almost_immediate_replies() { return _state_manager.requested_almost_immediate_node_state_replies(); } - std::vector<double> get_old_usage() { - auto &old_resource_usage = _reporter.get_old_resource_usage(); - return std::vector<double>{ old_resource_usage.get_disk_usage(), old_resource_usage.get_memory_usage() }; - } - std::vector<double> get_usage() { - auto &resource_usage = _reporter.get_usage(); - return std::vector<double>{ resource_usage.get_disk_usage(), resource_usage.get_memory_usage() }; - } - std::vector<double> get_slime_usage() { + ResourceUsage get_old_usage() { return _reporter.get_old_resource_usage(); } + ResourceUsage get_usage() { return _reporter.get_usage(); } + ResourceUsage get_slime_usage() { vespalib::Slime root; util::reporterToSlime(_reporter, root); - return std::vector<double>{ get_usage_element(root, "disk"), get_usage_element(root, "memory") }; + return ResourceUsage(get_usage_element(root, "disk"), get_usage_element(root, "memory")); } }; @@ -62,35 +57,35 @@ ServiceLayerHostInfoReporterTest::~ServiceLayerHostInfoReporterTest() = default; TEST_F(ServiceLayerHostInfoReporterTest, request_almost_immediate_node_state_as_needed) { EXPECT_EQ(0, requested_almost_immediate_replies()); - EXPECT_EQ((std::vector<double>{ 0.0, 0.0 }), get_old_usage()); - EXPECT_EQ((std::vector<double>{ 0.0, 0.0 }), get_usage()); + EXPECT_EQ(ResourceUsage(0.0, 0.0), get_old_usage()); + EXPECT_EQ(ResourceUsage(0.0, 0.0), get_usage()); notify(0.5, 0.4); EXPECT_EQ(1, requested_almost_immediate_replies()); - EXPECT_EQ((std::vector<double>{ 0.5, 0.4 }), get_old_usage()); - EXPECT_EQ((std::vector<double>{ 0.5, 0.4 }), get_usage()); + EXPECT_EQ(ResourceUsage(0.5, 0.4), get_old_usage()); + EXPECT_EQ(ResourceUsage(0.5, 0.4), get_usage()); notify(0.501, 0.401); EXPECT_EQ(1, requested_almost_immediate_replies()); - EXPECT_EQ((std::vector<double>{ 0.5, 0.4 }), get_old_usage()); - EXPECT_EQ((std::vector<double>{ 0.501, 0.401 }), get_usage()); + EXPECT_EQ(ResourceUsage(0.5, 0.4), get_old_usage()); + EXPECT_EQ(ResourceUsage(0.501, 0.401), get_usage()); notify(0.8, 0.4); EXPECT_EQ(2, requested_almost_immediate_replies()); - EXPECT_EQ((std::vector<double>{ 0.8, 0.4 }), get_old_usage()); - EXPECT_EQ((std::vector<double>{ 0.8, 0.4 }), get_usage()); + EXPECT_EQ(ResourceUsage(0.8, 0.4), get_old_usage()); + EXPECT_EQ(ResourceUsage(0.8, 0.4), get_usage()); notify(0.8, 0.7); EXPECT_EQ(3, requested_almost_immediate_replies()); - EXPECT_EQ((std::vector<double>{ 0.8, 0.7 }), get_old_usage()); - EXPECT_EQ((std::vector<double>{ 0.8, 0.7 }), get_usage()); + EXPECT_EQ(ResourceUsage(0.8, 0.7), get_old_usage()); + EXPECT_EQ(ResourceUsage(0.8, 0.7), get_usage()); notify(0.799, 0.699); EXPECT_EQ(3, requested_almost_immediate_replies()); - EXPECT_EQ((std::vector<double>{ 0.8, 0.7 }), get_old_usage()); - EXPECT_EQ((std::vector<double>{ 0.799, 0.699 }), get_usage()); + EXPECT_EQ(ResourceUsage(0.8, 0.7), get_old_usage()); + EXPECT_EQ(ResourceUsage(0.799, 0.699), get_usage()); } TEST_F(ServiceLayerHostInfoReporterTest, json_report_generated) { - EXPECT_EQ((std::vector<double>{ 0.0, 0.0 }), get_slime_usage()); + EXPECT_EQ(ResourceUsage(0.0, 0.0), get_slime_usage()); notify(0.5, 0.4); - EXPECT_EQ((std::vector<double>{ 0.5, 0.4 }), get_slime_usage()); + EXPECT_EQ(ResourceUsage(0.5, 0.4), get_slime_usage()); } } |