Rewrite unit test to use GTest.

2 files changed, 54 insertions, 53 deletions

diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt b/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt
index 0bd8ca368e0..942ac6a8c69 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt
@@ -4,5 +4,6 @@ vespa_add_executable(searchcore_disk_mem_usage_filter_test_app TEST
     disk_mem_usage_filter_test.cpp
     DEPENDS
     searchcore_server
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_disk_mem_usage_filter_test_app COMMAND searchcore_disk_mem_usage_filter_test_app)
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
index 4fbe7a13acb..b83ce4d6d1b 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
@@ -1,21 +1,21 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/server/disk_mem_usage_filter.h>
 #include <vespa/searchcore/proton/server/resource_usage_state.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 using namespace proton;
 
 namespace fs = std::filesystem;
 
-struct Fixture
+struct DiskMemUsageFilterTest : public ::testing::Test
 {
     DiskMemUsageFilter _filter;
     using State = DiskMemUsageFilter::State;
     using Config = DiskMemUsageFilter::Config;
 
-    Fixture()
+    DiskMemUsageFilterTest()
         : _filter(HwInfo(HwInfo::Disk(100, false, false), HwInfo::Memory(1000), HwInfo::Cpu(0)))
     {
         _filter.setDiskUsedSize(20);
@@ -31,12 +31,12 @@ struct Fixture
             EXPECT_TRUE(_filter.acceptWriteOperation());
             State state = _filter.getAcceptState();
             EXPECT_TRUE(state.acceptWriteOperation());
-            EXPECT_EQUAL(exp, state.message());
+            EXPECT_EQ(exp, state.message());
         } else {
             EXPECT_FALSE(_filter.acceptWriteOperation());
             State state = _filter.getAcceptState();
             EXPECT_FALSE(state.acceptWriteOperation());
-            EXPECT_EQUAL(exp, state.message());
+            EXPECT_EQ(exp, state.message());
         }
     }
 
@@ -54,71 +54,71 @@ struct Fixture
     }
 };
 
-TEST_F("Check that default filter allows write", Fixture)
+TEST_F(DiskMemUsageFilterTest, default_filter_allows_write)
 {
-    f.testWrite("");
+    testWrite("");
 }
 
-TEST_F("Check that stats are wired through", Fixture)
+TEST_F(DiskMemUsageFilterTest, stats_are_wired_through)
 {
-    EXPECT_EQUAL(42u, f._filter.getMemoryStats().getMappingsCount());
-    f.triggerMemoryLimit();
-    EXPECT_EQUAL(43u, f._filter.getMemoryStats().getMappingsCount());
+    EXPECT_EQ(42u, _filter.getMemoryStats().getMappingsCount());
+    triggerMemoryLimit();
+    EXPECT_EQ(43u, _filter.getMemoryStats().getMappingsCount());
 }
 
 void
 assertResourceUsage(double usage, double limit, double utilization, const ResourceUsageState &state)
 {
-    EXPECT_EQUAL(usage, state.usage());
-    EXPECT_EQUAL(limit, state.limit());
-    EXPECT_EQUAL(utilization, state.utilization());
+    EXPECT_EQ(usage, state.usage());
+    EXPECT_EQ(limit, state.limit());
+    EXPECT_DOUBLE_EQ(utilization, state.utilization());
 }
 
-TEST_F("Check that disk limit can be reached", Fixture)
+TEST_F(DiskMemUsageFilterTest, disk_limit_can_be_reached)
 {
-    f._filter.setConfig(Fixture::Config(1.0, 0.8));
-    TEST_DO(assertResourceUsage(0.2, 0.8, 0.25, f._filter.usageState().diskState()));
-    f.triggerDiskLimit();
-    f.testWrite("diskLimitReached: { "
-                "action: \"add more content nodes\", "
-                "reason: \"disk used (0.9) > disk limit (0.8)\", "
-                "stats: { "
-                "capacity: 100, used: 90, diskUsed: 0.9, diskLimit: 0.8}}");
-    TEST_DO(assertResourceUsage(0.9, 0.8, 1.125, f._filter.usageState().diskState()));
+    _filter.setConfig(Config(1.0, 0.8));
+    assertResourceUsage(0.2, 0.8, 0.25, _filter.usageState().diskState());
+    triggerDiskLimit();
+    testWrite("diskLimitReached: { "
+              "action: \"add more content nodes\", "
+              "reason: \"disk used (0.9) > disk limit (0.8)\", "
+              "stats: { "
+              "capacity: 100, used: 90, diskUsed: 0.9, diskLimit: 0.8}}");
+    assertResourceUsage(0.9, 0.8, 1.125, _filter.usageState().diskState());
 }
 
-TEST_F("Check that memory limit can be reached", Fixture)
+TEST_F(DiskMemUsageFilterTest, memory_limit_can_be_reached)
 {
-    f._filter.setConfig(Fixture::Config(0.8, 1.0));
-    TEST_DO(assertResourceUsage(0.3, 0.8, 0.375, f._filter.usageState().memoryState()));
-    f.triggerMemoryLimit();
-    f.testWrite("memoryLimitReached: { "
-                "action: \"add more content nodes\", "
-                "reason: \"memory used (0.9) > memory limit (0.8)\", "
-                "stats: { "
-                "mapped: { virt: 897, rss: 898}, "
-                "anonymous: { virt: 899, rss: 900}, "
-                "physicalMemory: 1000, memoryUsed: 0.9, memoryLimit: 0.8}}");
-    TEST_DO(assertResourceUsage(0.9, 0.8, 1.125, f._filter.usageState().memoryState()));
+    _filter.setConfig(Config(0.8, 1.0));
+    assertResourceUsage(0.3, 0.8, 0.375, _filter.usageState().memoryState());
+    triggerMemoryLimit();
+    testWrite("memoryLimitReached: { "
+              "action: \"add more content nodes\", "
+              "reason: \"memory used (0.9) > memory limit (0.8)\", "
+              "stats: { "
+              "mapped: { virt: 897, rss: 898}, "
+              "anonymous: { virt: 899, rss: 900}, "
+              "physicalMemory: 1000, memoryUsed: 0.9, memoryLimit: 0.8}}");
+    assertResourceUsage(0.9, 0.8, 1.125, _filter.usageState().memoryState());
 }
 
-TEST_F("Check that both disk limit and memory limit can be reached", Fixture)
+TEST_F(DiskMemUsageFilterTest, both_disk_limit_and_memory_limit_can_be_reached)
 {
-    f._filter.setConfig(Fixture::Config(0.8, 0.8));
-    f.triggerMemoryLimit();
-    f.triggerDiskLimit();
-    f.testWrite("memoryLimitReached: { "
-                "action: \"add more content nodes\", "
-                "reason: \"memory used (0.9) > memory limit (0.8)\", "
-                "stats: { "
-                "mapped: { virt: 897, rss: 898}, "
-                "anonymous: { virt: 899, rss: 900}, "
-                "physicalMemory: 1000, memoryUsed: 0.9, memoryLimit: 0.8}}, "
-                "diskLimitReached: { "
-                "action: \"add more content nodes\", "
-                "reason: \"disk used (0.9) > disk limit (0.8)\", "
-                "stats: { "
-                "capacity: 100, used: 90, diskUsed: 0.9, diskLimit: 0.8}}");
+    _filter.setConfig(Config(0.8, 0.8));
+    triggerMemoryLimit();
+    triggerDiskLimit();
+    testWrite("memoryLimitReached: { "
+              "action: \"add more content nodes\", "
+              "reason: \"memory used (0.9) > memory limit (0.8)\", "
+              "stats: { "
+              "mapped: { virt: 897, rss: 898}, "
+              "anonymous: { virt: 899, rss: 900}, "
+              "physicalMemory: 1000, memoryUsed: 0.9, memoryLimit: 0.8}}, "
+              "diskLimitReached: { "
+              "action: \"add more content nodes\", "
+              "reason: \"disk used (0.9) > disk limit (0.8)\", "
+              "stats: { "
+              "capacity: 100, used: 90, diskUsed: 0.9, diskLimit: 0.8}}");
 }
 
-TEST_MAIN() { TEST_RUN_ALL(); }
+GTEST_MAIN_RUN_ALL_TESTS()