1 files changed, 33 insertions, 13 deletions
diff --git a/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp b/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp
index 0e06e5d28ed..46de8479d1d 100644
--- a/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp
+++ b/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp
@@ -75,33 +75,53 @@ TEST_F("require that strategy is updated when setting new config", Fixture)
     TEST_DO(f.assertStrategyConfig(6, 3, 30));
 }
 
+void
+expectEqual(const MemoryFlush::Config & a, const MemoryFlush::Config & b) {
+    EXPECT_TRUE(a.equal(b));
+    EXPECT_TRUE(a == b);
+    EXPECT_FALSE( a != b);
+    EXPECT_TRUE(b.equal(a));
+    EXPECT_TRUE(b == a);
+    EXPECT_FALSE( b != a);
+}
+
+void
+expectNotEqual(const MemoryFlush::Config & a, const MemoryFlush::Config & b) {
+    EXPECT_FALSE(a.equal(b));
+    EXPECT_FALSE(a == b);
+    EXPECT_TRUE( a != b);
+    EXPECT_FALSE(b.equal(a));
+    EXPECT_FALSE(b == a);
+    EXPECT_TRUE( b != a);
+}
+
 TEST("require that MemoryFlush::Config equal is correct") {
     MemoryFlush::Config a, b;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
     a.maxGlobalMemory = 7;
-    EXPECT_FALSE(a.equal(b) || b.equal(a));
+    expectNotEqual(a, b);
     b.maxGlobalMemory = 7;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
     a.maxMemoryGain = 8;
-    EXPECT_FALSE(a.equal(b) || b.equal(a));
+    expectNotEqual(a, b);
     b.maxMemoryGain = 8;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
     a.maxGlobalTlsSize = 9;
-    EXPECT_FALSE(a.equal(b) || b.equal(a));
+    expectNotEqual(a, b);
     b.maxGlobalTlsSize = 9;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
     a.maxTimeGain = 10us;
-    EXPECT_FALSE(a.equal(b) || b.equal(a));
+    expectNotEqual(a, b);
     b.maxTimeGain = 10us;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
     a.globalDiskBloatFactor = 11;
-    EXPECT_FALSE(a.equal(b) || b.equal(a));
+    expectNotEqual(a, b);
     b.globalDiskBloatFactor = 11;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
     a.diskBloatFactor = 12;
-    EXPECT_FALSE(a.equal(b) || b.equal(a));
+    expectNotEqual(a, b);
     b.diskBloatFactor = 12;
-    EXPECT_TRUE(a.equal(b) && b.equal(a));
+    expectEqual(a, b);;
 }
 
 TEST("require that we use configured memory limits") {