From f91dc80f4ca4d7033c4a07983f189039b16a366b Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 16 Aug 2025 14:49:26 -0700 Subject: [PATCH] Minor cleanup --- test/format-test.cc | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/test/format-test.cc b/test/format-test.cc index 8686ee24..71bfe61d 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -361,21 +361,20 @@ TEST(memory_buffer_test, move_ctor_inline_buffer_non_propagating) { basic_memory_buffer buffer2( std::move(buffer)); const char* new_data_ptr = &buffer2[0]; - EXPECT_NE(original_data_ptr, new_data_ptr); - EXPECT_EQ(str, std::string(&buffer[0], buffer.size())); - EXPECT_EQ(str, std::string(&buffer2[0], buffer2.size())); - EXPECT_EQ(5u, buffer2.capacity()); + EXPECT_NE(new_data_ptr, original_data_ptr); + EXPECT_EQ(std::string(buffer.data(), buffer.size()), str); + EXPECT_EQ(std::string(buffer2.data(), buffer2.size()), str); + EXPECT_EQ(buffer2.capacity(), 5u); // Allocators should NOT be transferred; they remain distinct instances. // The original buffer's allocator pointer should still be valid (not // nullptr). - EXPECT_EQ(original_alloc_ptr, buffer.get_allocator().get()); - EXPECT_NE(original_alloc_ptr, buffer2.get_allocator().get()); + EXPECT_EQ(buffer.get_allocator().get(), original_alloc_ptr); + EXPECT_NE(buffer2.get_allocator().get(), original_alloc_ptr); }; auto alloc = std::allocator(); basic_memory_buffer buffer( (std_allocator_noprop(&alloc))); - const char test[] = "test"; - buffer.append(string_view(test, 4)); + buffer.append(string_view("test", 4)); check_move_buffer("test", buffer); buffer.push_back('a'); check_move_buffer("testa", buffer); @@ -389,15 +388,15 @@ TEST(memory_buffer_test, move_ctor_dynamic_buffer_non_propagating) { buffer.append(test, test + 4); const char* inline_buffer_ptr = &buffer[0]; buffer.push_back('a'); - EXPECT_NE(&buffer[0], inline_buffer_ptr); + EXPECT_NE(buffer.data(), inline_buffer_ptr); std::allocator* original_alloc_ptr = buffer.get_allocator().get(); basic_memory_buffer buffer2; buffer2 = std::move(buffer); - EXPECT_EQ(std::string(&buffer2[0], buffer2.size()), "testa"); + EXPECT_EQ(std::string(buffer2.data(), buffer2.size()), "testa"); EXPECT_GT(buffer2.capacity(), 4u); - EXPECT_NE(&buffer2[0], inline_buffer_ptr); - EXPECT_EQ(original_alloc_ptr, buffer.get_allocator().get()); - EXPECT_NE(original_alloc_ptr, buffer2.get_allocator().get()); + EXPECT_NE(buffer2.data(), inline_buffer_ptr); + EXPECT_EQ(buffer.get_allocator().get(), original_alloc_ptr); + EXPECT_NE(buffer2.get_allocator().get(), original_alloc_ptr); } void check_move_assign_buffer(const char* str, @@ -405,9 +404,9 @@ void check_move_assign_buffer(const char* str, basic_memory_buffer buffer2; buffer2 = std::move(buffer); // Move shouldn't destroy the inline content of the first buffer. - EXPECT_EQ(str, std::string(&buffer[0], buffer.size())); - EXPECT_EQ(str, std::string(&buffer2[0], buffer2.size())); - EXPECT_EQ(5u, buffer2.capacity()); + EXPECT_EQ(std::string(&buffer[0], buffer.size()), str); + EXPECT_EQ(std::string(&buffer2[0], buffer2.size()), str); + EXPECT_EQ(buffer2.capacity(), 5u); } TEST(memory_buffer_test, move_assignment) { @@ -426,8 +425,8 @@ TEST(memory_buffer_test, move_assignment) { basic_memory_buffer buffer2; buffer2 = std::move(buffer); // Move should rip the guts of the first buffer. - EXPECT_EQ(inline_buffer_ptr, &buffer[0]); - EXPECT_EQ("testab", std::string(&buffer2[0], buffer2.size())); + EXPECT_EQ(buffer.data(), inline_buffer_ptr); + EXPECT_EQ(std::string(buffer2.data(), buffer2.size()), "testab"); EXPECT_GT(buffer2.capacity(), 5u); }