Commit f1b01b79 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Modernize RefCountedMemoryUnitTest.

Also fix some nits and use ASSERT_EQ() where appropriate.

Change-Id: I7c0686c77c3ad3937af19328adbdd7e21a76e6f0
Reviewed-on: https://chromium-review.googlesource.com/827904Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524254}
parent 501ca86c
...@@ -15,8 +15,7 @@ using testing::ElementsAre; ...@@ -15,8 +15,7 @@ using testing::ElementsAre;
namespace base { namespace base {
TEST(RefCountedMemoryUnitTest, RefCountedStaticMemory) { TEST(RefCountedMemoryUnitTest, RefCountedStaticMemory) {
scoped_refptr<RefCountedMemory> mem = new RefCountedStaticMemory( auto mem = MakeRefCounted<RefCountedStaticMemory>("static mem00", 10);
"static mem00", 10);
EXPECT_EQ(10U, mem->size()); EXPECT_EQ(10U, mem->size());
EXPECT_EQ("static mem", std::string(mem->front_as<char>(), mem->size())); EXPECT_EQ("static mem", std::string(mem->front_as<char>(), mem->size()));
...@@ -30,16 +29,16 @@ TEST(RefCountedMemoryUnitTest, RefCountedBytes) { ...@@ -30,16 +29,16 @@ TEST(RefCountedMemoryUnitTest, RefCountedBytes) {
EXPECT_EQ(0U, data.size()); EXPECT_EQ(0U, data.size());
EXPECT_EQ(2U, mem->size()); ASSERT_EQ(2U, mem->size());
EXPECT_EQ(45U, mem->front()[0]); EXPECT_EQ(45U, mem->front()[0]);
EXPECT_EQ(99U, mem->front()[1]); EXPECT_EQ(99U, mem->front()[1]);
scoped_refptr<RefCountedMemory> mem2; scoped_refptr<RefCountedMemory> mem2;
{ {
unsigned char data2[] = { 12, 11, 99 }; const unsigned char kData[] = {12, 11, 99};
mem2 = new RefCountedBytes(data2, 3); mem2 = MakeRefCounted<RefCountedBytes>(kData, arraysize(kData));
} }
EXPECT_EQ(3U, mem2->size()); ASSERT_EQ(3U, mem2->size());
EXPECT_EQ(12U, mem2->front()[0]); EXPECT_EQ(12U, mem2->front()[0]);
EXPECT_EQ(11U, mem2->front()[1]); EXPECT_EQ(11U, mem2->front()[1]);
EXPECT_EQ(99U, mem2->front()[2]); EXPECT_EQ(99U, mem2->front()[2]);
...@@ -65,20 +64,17 @@ TEST(RefCountedMemoryUnitTest, RefCountedString) { ...@@ -65,20 +64,17 @@ TEST(RefCountedMemoryUnitTest, RefCountedString) {
EXPECT_EQ(0U, s.size()); EXPECT_EQ(0U, s.size());
EXPECT_EQ(10U, mem->size()); ASSERT_EQ(10U, mem->size());
EXPECT_EQ('d', mem->front()[0]); EXPECT_EQ('d', mem->front()[0]);
EXPECT_EQ('e', mem->front()[1]); EXPECT_EQ('e', mem->front()[1]);
EXPECT_EQ('e', mem->front()[9]);
} }
TEST(RefCountedMemoryUnitTest, Equals) { TEST(RefCountedMemoryUnitTest, Equals) {
std::string s1("same"); std::string s1("same");
scoped_refptr<RefCountedMemory> mem1 = RefCountedString::TakeString(&s1); scoped_refptr<RefCountedMemory> mem1 = RefCountedString::TakeString(&s1);
std::vector<unsigned char> d2; std::vector<unsigned char> d2 = {'s', 'a', 'm', 'e'};
d2.push_back('s');
d2.push_back('a');
d2.push_back('m');
d2.push_back('e');
scoped_refptr<RefCountedMemory> mem2 = RefCountedBytes::TakeVector(&d2); scoped_refptr<RefCountedMemory> mem2 = RefCountedBytes::TakeVector(&d2);
EXPECT_TRUE(mem1->Equals(mem2)); EXPECT_TRUE(mem1->Equals(mem2));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment