Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(spanner): equality for copyable classes #9648

Merged
merged 1 commit into from
Aug 8, 2022
Merged

feat(spanner): equality for copyable classes #9648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions google/cloud/spanner/create_instance_request_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "google/cloud/spanner/instance.h"
#include "google/cloud/spanner/version.h"
#include <google/protobuf/util/message_differencer.h>
#include <google/spanner/admin/instance/v1/spanner_instance_admin.pb.h>
#include <map>
#include <string>
Expand Down Expand Up @@ -46,6 +47,16 @@ class CreateInstanceRequestBuilder {
CreateInstanceRequestBuilder& operator=(CreateInstanceRequestBuilder&&) =
default;

friend bool operator==(CreateInstanceRequestBuilder const& a,
CreateInstanceRequestBuilder const& b) noexcept {
return google::protobuf::util::MessageDifferencer::Equivalent(a.request_,
b.request_);
}
friend bool operator!=(CreateInstanceRequestBuilder const& a,
CreateInstanceRequestBuilder const& b) noexcept {
return !(a == b);
}

/**
* Constructor requires Instance and Cloud Spanner instance config name.
* The display_name is set to a default value of in.instance_id().
Expand Down
10 changes: 10 additions & 0 deletions google/cloud/spanner/create_instance_request_builder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ namespace cloud {
namespace spanner {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN

TEST(CreateInstanceRequestBuilder, Equality) {
Instance in(Project("test-project"), "test-instance");
CreateInstanceRequestBuilder b1(in, "c1");
CreateInstanceRequestBuilder b2(in, "c2");
EXPECT_NE(b1, b2);

b2 = b1;
EXPECT_EQ(b1, b2);
}

TEST(CreateInstanceRequestBuilder, DefaultValues) {
Instance in(Project("test-project"), "test-instance");
std::string expected_config =
Expand Down
11 changes: 11 additions & 0 deletions google/cloud/spanner/update_instance_request_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "google/cloud/spanner/instance.h"
#include "google/cloud/spanner/version.h"
#include <google/protobuf/util/field_mask_util.h>
#include <google/protobuf/util/message_differencer.h>
#include <google/spanner/admin/instance/v1/spanner_instance_admin.pb.h>
#include <map>
#include <string>
Expand Down Expand Up @@ -52,6 +53,16 @@ class UpdateInstanceRequestBuilder {
UpdateInstanceRequestBuilder& operator=(UpdateInstanceRequestBuilder&&) =
default;

friend bool operator==(UpdateInstanceRequestBuilder const& a,
UpdateInstanceRequestBuilder const& b) noexcept {
return google::protobuf::util::MessageDifferencer::Equivalent(a.request_,
b.request_);
}
friend bool operator!=(UpdateInstanceRequestBuilder const& a,
UpdateInstanceRequestBuilder const& b) noexcept {
return !(a == b);
}

explicit UpdateInstanceRequestBuilder(std::string instance_name) {
request_.mutable_instance()->set_name(std::move(instance_name));
}
Expand Down
9 changes: 9 additions & 0 deletions google/cloud/spanner/update_instance_request_builder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ TEST(UpdateInstanceRequestBuilder, Constructors) {
EXPECT_EQ(expected_name, req.instance().name());
}

TEST(UpdateInstanceRequestBuilder, Equality) {
UpdateInstanceRequestBuilder b1("i1");
UpdateInstanceRequestBuilder b2("i2");
EXPECT_NE(b1, b2);

b2 = b1;
EXPECT_EQ(b1, b2);
}

TEST(UpdateInstanceRequestBuilder, AddLabels) {
Instance in(Project("test-project"), "test-instance");
std::string expected_name = in.FullName();
Expand Down