From 53dc081d48be4f5850f4b609e6a031c014ae6425 Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli <vekterli@yahooinc.com>
Date: Thu, 20 Apr 2023 11:53:36 +0000
Subject: Add NewestReplica equality tests and gmock matcher for distinct
 elements in a range

Add a new `matchers` directory in vespalib which can be used as a repository for
generic, reusable GMock matchers.

Move distributor tests from using an explicit gtest runner to using `GTest::gmock_main`
which serves the same purpose. Need to depend on a gmock target (not just gtest) to
be able to link with stuff required for matchers.
---
 storage/src/tests/distributor/CMakeLists.txt       |  4 ++--
 storage/src/tests/distributor/gtest_runner.cpp     |  8 --------
 .../src/tests/distributor/newest_replica_test.cpp  | 24 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
 delete mode 100644 storage/src/tests/distributor/gtest_runner.cpp
 create mode 100644 storage/src/tests/distributor/newest_replica_test.cpp

(limited to 'storage')

diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt
index c59b56eb68f..11bbf2c241a 100644
--- a/storage/src/tests/distributor/CMakeLists.txt
+++ b/storage/src/tests/distributor/CMakeLists.txt
@@ -19,7 +19,6 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST
     externaloperationhandlertest.cpp
     garbagecollectiontest.cpp
     getoperationtest.cpp
-    gtest_runner.cpp
     idealstatemanagertest.cpp
     joinbuckettest.cpp
     maintenancemocks.cpp
@@ -27,6 +26,7 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST
     mergelimitertest.cpp
     mergeoperationtest.cpp
     multi_thread_stripe_access_guard_test.cpp
+    newest_replica_test.cpp
     node_supported_features_repo_test.cpp
     nodeinfotest.cpp
     nodemaintenancestatstrackertest.cpp
@@ -57,7 +57,7 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST
     storage_testcommon
     storage_testhostreporter
     storage
-    GTest::GTest
+    GTest::gmock_main
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/distributor/gtest_runner.cpp b/storage/src/tests/distributor/gtest_runner.cpp
deleted file mode 100644
index 7c20f681093..00000000000
--- a/storage/src/tests/distributor/gtest_runner.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/vespalib/gtest/gtest.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP("storage_distributor_gtest_runner");
-
-GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/distributor/newest_replica_test.cpp b/storage/src/tests/distributor/newest_replica_test.cpp
new file mode 100644
index 00000000000..9267c6e37a2
--- /dev/null
+++ b/storage/src/tests/distributor/newest_replica_test.cpp
@@ -0,0 +1,24 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#include <vespa/storage/distributor/operations/external/newest_replica.h>
+#include <vespa/vespalib/gtest/gtest.h>
+#include <vespa/vespalib/gtest/matchers/elements_are_distinct.h>
+
+using namespace ::testing;
+using storage::api::Timestamp;
+using document::BucketId;
+
+namespace storage::distributor {
+
+TEST(NewestReplicaTest, equality_predicate_considers_all_fields) {
+    std::vector elems = {
+        NewestReplica::of(Timestamp(1000), BucketId(16, 1), 0, false, false),
+        NewestReplica::of(Timestamp(1001), BucketId(16, 1), 0, false, false),
+        NewestReplica::of(Timestamp(1000), BucketId(16, 2), 0, false, false),
+        NewestReplica::of(Timestamp(1000), BucketId(16, 1), 1, false, false),
+        NewestReplica::of(Timestamp(1000), BucketId(16, 1), 0, true,  false),
+        NewestReplica::of(Timestamp(1000), BucketId(16, 1), 0, false, true)
+    };
+    EXPECT_THAT(elems, ElementsAreDistinct());
+}
+
+}
-- 
cgit v1.2.3