Merge ArrayWriter into FixedBuffer

test/format-test.cc

@@ -474,13 +474,6 @@ TEST(WriterTest, WWriter) {
   EXPECT_EQ(L"cafe", write_wstr(0xcafe, type='x'));
 }
 
-TEST(ArrayWriterTest, Ctor) {
-  char array[10] = "garbage";
-  fmt::ArrayWriter w(array, sizeof(array));
-  EXPECT_EQ(0u, w.size());
-  EXPECT_STREQ("", w.c_str());
-}
-
 TEST(FormatToTest, FormatWithoutArgs) {
   fmt::internal::MemoryBuffer<char> buffer;
   format_to(buffer, "test");
@@ -498,29 +491,6 @@ TEST(FormatToTest, Format) {
   EXPECT_EQ("part1part2", to_string(buffer));
 }
 
-TEST(ArrayWriterTest, CompileTimeSizeCtor) {
-  char array[10] = "garbage";
-  fmt::ArrayWriter w(array);
-  EXPECT_EQ(0u, w.size());
-  EXPECT_STREQ("", w.c_str());
-  format_to(w.buffer(), "{:10}", 1);
-}
-
-TEST(ArrayWriterTest, BufferOverflow) {
-  char array[10];
-  fmt::ArrayWriter w(array, sizeof(array));
-  format_to(w.buffer(), "{:10}", 1);
-  EXPECT_THROW_MSG(format_to(w.buffer(), "{}", 1), std::runtime_error,
-                   "buffer overflow");
-}
-
-TEST(ArrayWriterTest, WChar) {
-  wchar_t array[10];
-  fmt::WArrayWriter w(array);
-  format_to(w.buffer(), L"{}", 42);
-  EXPECT_EQ(L"42", w.str());
-}
-
 TEST(FormatterTest, Escape) {
   EXPECT_EQ("{", format("{{"));
   EXPECT_EQ("before {", format("before {{"));

test/util-test.cc

@@ -213,19 +213,6 @@ TEST(BufferTest, Clear) {
   EXPECT_EQ(20u, buffer.capacity());
 }
 
-TEST(BufferTest, PushBack) {
-  int data[15];
-  MockBuffer<int> buffer(data, 10);
-  buffer.push_back(11);
-  EXPECT_EQ(11, buffer[0]);
-  EXPECT_EQ(1u, buffer.size());
-  buffer.resize(10);
-  EXPECT_CALL(buffer, do_grow(11));
-  buffer.push_back(22);
-  EXPECT_EQ(22, buffer[10]);
-  EXPECT_EQ(11u, buffer.size());
-}
-
 TEST(BufferTest, Append) {
   char data[15];
   MockBuffer<char> buffer(data, 10);
@@ -393,6 +380,29 @@ TEST(MemoryBufferTest, ExceptionInDeallocate) {
   EXPECT_CALL(alloc, deallocate(&mem2[0], 2 * size));
 }
 
+TEST(FixedBufferTest, Ctor) {
+  char array[10] = "garbage";
+  fmt::FixedBuffer<char> buffer(array, sizeof(array));
+  EXPECT_EQ(0u, buffer.size());
+  EXPECT_EQ(10u, buffer.capacity());
+  EXPECT_EQ(array, buffer.data());
+}
+
+TEST(FixedBufferTest, CompileTimeSizeCtor) {
+  char array[10] = "garbage";
+  fmt::FixedBuffer<char> buffer(array);
+  EXPECT_EQ(0u, buffer.size());
+  EXPECT_EQ(10u, buffer.capacity());
+  EXPECT_EQ(array, buffer.data());
+}
+
+TEST(FixedBufferTest, BufferOverflow) {
+  char array[10];
+  fmt::FixedBuffer<char> buffer(array);
+  buffer.resize(10);
+  EXPECT_THROW_MSG(buffer.resize(11), std::runtime_error, "buffer overflow");
+}
+
 TEST(UtilTest, Increment) {
   char s[10] = "123";
   increment(s);