diff options
author | 2015-12-30 09:33:39 -0800 | |
---|---|---|
committer | 2015-12-30 09:33:39 -0800 | |
commit | 994f8f76e77d15d7e54f05ec7794d624cdc5b158 (patch) | |
tree | aa244c87c5c89f0e14d951a5eb145dba7d7fdc39 /test/cpp | |
parent | be75ffd028ae4d7224883d0fa96bbd188d180305 (diff) | |
parent | 7593cff337629ca179302ddf6ce2cbedbbbcab73 (diff) |
Merge branch 'master' into bbuf
Diffstat (limited to 'test/cpp')
-rw-r--r-- | test/cpp/end2end/zookeeper_test.cc | 2 | ||||
-rw-r--r-- | test/cpp/util/string_ref_test.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/cpp/end2end/zookeeper_test.cc b/test/cpp/end2end/zookeeper_test.cc index e88c0f9c68..41482717d2 100644 --- a/test/cpp/end2end/zookeeper_test.cc +++ b/test/cpp/end2end/zookeeper_test.cc @@ -158,7 +158,7 @@ class ZookeeperTest : public ::testing::Test { void ResetStub() { string target = "zookeeper://" + zookeeper_address_ + "/test"; channel_ = CreateChannel(target, InsecureChannelCredentials()); - stub_ = std::move(grpc::cpp::test::util::TestService::NewStub(channel_)); + stub_ = grpc::cpp::test::util::TestService::NewStub(channel_); } string to_string(const int number) { diff --git a/test/cpp/util/string_ref_test.cc b/test/cpp/util/string_ref_test.cc index 44a298d892..d94aa5962b 100644 --- a/test/cpp/util/string_ref_test.cc +++ b/test/cpp/util/string_ref_test.cc @@ -102,7 +102,8 @@ TEST_F(StringRefTest, Iterator) { string_ref s(kTestString); size_t i = 0; for (auto it = s.cbegin(); it != s.cend(); ++it) { - EXPECT_EQ(kTestString[i++], *it); + auto val = kTestString[i++]; + EXPECT_EQ(val, *it); } EXPECT_EQ(strlen(kTestString), i); } @@ -111,7 +112,8 @@ TEST_F(StringRefTest, ReverseIterator) { string_ref s(kTestString); size_t i = strlen(kTestString); for (auto rit = s.crbegin(); rit != s.crend(); ++rit) { - EXPECT_EQ(kTestString[--i], *rit); + auto val = kTestString[--i]; + EXPECT_EQ(val, *rit); } EXPECT_EQ(0U, i); } |