From 89c5a5623377e7d4d253c7a304bc726357c6ef0e Mon Sep 17 00:00:00 2001 From: Yang Gao Date: Mon, 22 Jun 2015 16:31:11 -0700 Subject: Add const to ByteBuffer methods and add tests --- test/cpp/util/byte_buffer_test.cc | 115 ++++++++++++++++++++++++++++++++++++++ test/cpp/util/slice_test.cc | 77 +++++++++++++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 test/cpp/util/byte_buffer_test.cc create mode 100644 test/cpp/util/slice_test.cc (limited to 'test/cpp') diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc new file mode 100644 index 0000000000..8ad2fad505 --- /dev/null +++ b/test/cpp/util/byte_buffer_test.cc @@ -0,0 +1,115 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +#include +#include + +#include +#include +#include + +namespace grpc { +namespace { + +class ByteBufferTest : public ::testing::Test { + protected: + const char* kContent1_ = "hello xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + const char* kContent2_ = "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy world"; +}; + +TEST_F(ByteBufferTest, CreateFromSingleSlice) { + gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + Slice s(hello, Slice::STEAL_REF); + ByteBuffer buffer(&s, 1); +} + +TEST_F(ByteBufferTest, CreateFromVector) { + gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + gpr_slice world = gpr_slice_from_copied_string(kContent2_); + std::vector slices; + slices.push_back(Slice(hello, Slice::STEAL_REF)); + slices.push_back(Slice(world, Slice::STEAL_REF)); + ByteBuffer buffer(&slices[0], 2); +} + +TEST_F(ByteBufferTest, Clear) { + gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + Slice s(hello, Slice::STEAL_REF); + ByteBuffer buffer(&s, 1); + buffer.Clear(); +} + +TEST_F(ByteBufferTest, Length) { + gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + gpr_slice world = gpr_slice_from_copied_string(kContent2_); + std::vector slices; + slices.push_back(Slice(hello, Slice::STEAL_REF)); + slices.push_back(Slice(world, Slice::STEAL_REF)); + ByteBuffer buffer(&slices[0], 2); + EXPECT_EQ(strlen(kContent1_) + strlen(kContent2_), buffer.Length()); +} + +bool SliceEqual(const Slice& a, gpr_slice b) { + if (a.size() != GPR_SLICE_LENGTH(b)) { + return false; + } + for (size_t i = 0; i < a.size(); i++) { + if (a.begin()[i] != GPR_SLICE_START_PTR(b)[i]) { + return false; + } + } + return true; +} + +TEST_F(ByteBufferTest, Dump) { + gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + gpr_slice world = gpr_slice_from_copied_string(kContent2_); + std::vector slices; + slices.push_back(Slice(hello, Slice::STEAL_REF)); + slices.push_back(Slice(world, Slice::STEAL_REF)); + ByteBuffer buffer(&slices[0], 2); + slices.clear(); + buffer.Dump(&slices); + EXPECT_TRUE(SliceEqual(slices[0], hello)); + EXPECT_TRUE(SliceEqual(slices[1], world)); +} + +} // namespace +} // namespace grpc + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc new file mode 100644 index 0000000000..36ffeb66bd --- /dev/null +++ b/test/cpp/util/slice_test.cc @@ -0,0 +1,77 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +#include +#include + +namespace grpc { +namespace { + +class SliceTest : public ::testing::Test { + protected: + void CheckSlice(const Slice& s, const grpc::string& content) { + EXPECT_EQ(content.size(), s.size()); + EXPECT_EQ(content, + grpc::string(reinterpret_cast(s.begin()), s.size())); + } + + const char* kContent = "hello xxxxxxxxxxxxxxxxxxxx world"; +}; + +TEST_F(SliceTest, Steal) { + gpr_slice s = gpr_slice_from_copied_string(kContent); + Slice spp(s, Slice::STEAL_REF); + CheckSlice(spp, kContent); +} + +TEST_F(SliceTest, Add) { + gpr_slice s = gpr_slice_from_copied_string(kContent); + Slice spp(s, Slice::ADD_REF); + gpr_slice_unref(s); + CheckSlice(spp, kContent); +} + +TEST_F(SliceTest, Empty) { + Slice empty_slice; + CheckSlice(empty_slice, ""); +} + +} // namespace +} // namespace grpc + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} -- cgit v1.2.3 From b1bbc8764db510547ac2b98168e86ee84c3d234b Mon Sep 17 00:00:00 2001 From: yang-g Date: Mon, 22 Jun 2015 23:30:00 -0700 Subject: proper init const char * --- test/cpp/util/byte_buffer_test.cc | 24 ++++++++++++------------ test/cpp/util/slice_test.cc | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test/cpp') diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc index 8ad2fad505..13eb49730a 100644 --- a/test/cpp/util/byte_buffer_test.cc +++ b/test/cpp/util/byte_buffer_test.cc @@ -43,21 +43,21 @@ namespace grpc { namespace { +const char* kContent1 = "hello xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; +const char* kContent2 = "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy world"; + class ByteBufferTest : public ::testing::Test { - protected: - const char* kContent1_ = "hello xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; - const char* kContent2_ = "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy world"; }; TEST_F(ByteBufferTest, CreateFromSingleSlice) { - gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + gpr_slice hello = gpr_slice_from_copied_string(kContent1); Slice s(hello, Slice::STEAL_REF); ByteBuffer buffer(&s, 1); } TEST_F(ByteBufferTest, CreateFromVector) { - gpr_slice hello = gpr_slice_from_copied_string(kContent1_); - gpr_slice world = gpr_slice_from_copied_string(kContent2_); + gpr_slice hello = gpr_slice_from_copied_string(kContent1); + gpr_slice world = gpr_slice_from_copied_string(kContent2); std::vector slices; slices.push_back(Slice(hello, Slice::STEAL_REF)); slices.push_back(Slice(world, Slice::STEAL_REF)); @@ -65,20 +65,20 @@ TEST_F(ByteBufferTest, CreateFromVector) { } TEST_F(ByteBufferTest, Clear) { - gpr_slice hello = gpr_slice_from_copied_string(kContent1_); + gpr_slice hello = gpr_slice_from_copied_string(kContent1); Slice s(hello, Slice::STEAL_REF); ByteBuffer buffer(&s, 1); buffer.Clear(); } TEST_F(ByteBufferTest, Length) { - gpr_slice hello = gpr_slice_from_copied_string(kContent1_); - gpr_slice world = gpr_slice_from_copied_string(kContent2_); + gpr_slice hello = gpr_slice_from_copied_string(kContent1); + gpr_slice world = gpr_slice_from_copied_string(kContent2); std::vector slices; slices.push_back(Slice(hello, Slice::STEAL_REF)); slices.push_back(Slice(world, Slice::STEAL_REF)); ByteBuffer buffer(&slices[0], 2); - EXPECT_EQ(strlen(kContent1_) + strlen(kContent2_), buffer.Length()); + EXPECT_EQ(strlen(kContent1) + strlen(kContent2), buffer.Length()); } bool SliceEqual(const Slice& a, gpr_slice b) { @@ -94,8 +94,8 @@ bool SliceEqual(const Slice& a, gpr_slice b) { } TEST_F(ByteBufferTest, Dump) { - gpr_slice hello = gpr_slice_from_copied_string(kContent1_); - gpr_slice world = gpr_slice_from_copied_string(kContent2_); + gpr_slice hello = gpr_slice_from_copied_string(kContent1); + gpr_slice world = gpr_slice_from_copied_string(kContent2); std::vector slices; slices.push_back(Slice(hello, Slice::STEAL_REF)); slices.push_back(Slice(world, Slice::STEAL_REF)); diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc index 36ffeb66bd..eb328490e1 100644 --- a/test/cpp/util/slice_test.cc +++ b/test/cpp/util/slice_test.cc @@ -39,6 +39,8 @@ namespace grpc { namespace { +const char* kContent = "hello xxxxxxxxxxxxxxxxxxxx world"; + class SliceTest : public ::testing::Test { protected: void CheckSlice(const Slice& s, const grpc::string& content) { @@ -46,8 +48,6 @@ class SliceTest : public ::testing::Test { EXPECT_EQ(content, grpc::string(reinterpret_cast(s.begin()), s.size())); } - - const char* kContent = "hello xxxxxxxxxxxxxxxxxxxx world"; }; TEST_F(SliceTest, Steal) { -- cgit v1.2.3