Add MinidumpStringListWriter and test

minidump/minidump_string_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_string_writer.h"
 
 #include <dbghelp.h>
 #include <sys/types.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
+#include "minidump/test/minidump_rva_list_test_util.h"
 #include "minidump/test/minidump_string_writer_test_util.h"
+#include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
   StringFileWriter file_writer;
 
   {
@@ skipping 150 matching lines @@
               file_writer.string().size());
 
     const MinidumpUTF8String* minidump_string =
         MinidumpUTF8StringAtRVA(file_writer.string(), 0);
     EXPECT_TRUE(minidump_string);
     EXPECT_EQ(test_string,
               MinidumpUTF8StringAtRVAAsString(file_writer.string(), 0));
   }
 }
 
+struct MinidumpUTF16StringListWriterTraits {
+  using MinidumpStringListWriterType = internal::MinidumpUTF16StringListWriter;
+  static string16 ExpectationForUTF8(const std::string& utf8) {
+    return base::UTF8ToUTF16(utf8);
+  }
+  static string16 ObservationAtRVA(const std::string& file_contents, RVA rva) {
+    return MinidumpStringAtRVAAsString(file_contents, rva);
+  }
+};
+
+struct MinidumpUTF8StringListWriterTraits {
+  using MinidumpStringListWriterType = internal::MinidumpUTF8StringListWriter;
+  static std::string ExpectationForUTF8(const std::string& utf8) {
+    return utf8;
+  }
+  static std::string ObservationAtRVA(const std::string& file_contents,
+                                      RVA rva) {
+    return MinidumpUTF8StringAtRVAAsString(file_contents, rva);
+  }
+};
+
+template <typename Traits>

[Robert Sesek, 2014/11/07 14:47:00]

There's gtest support for this, too:
https://code.google.com/p/googletest/wiki/AdvancedGuide#Typed_Tests

[Mark Mentovai, 2014/11/07 14:56:48]

Robert Sesek wrote:
I’ll keep that in mind for the future, but I don’t think it works as well in
this instance. It looks like that will repeat the entire test case for the
desired types, but I only want to repeat a single test. I don’t think that it’s
an advantage to break out a new test case for this.

+void MinidumpStringListTest() {
+  std::vector<std::string> strings;
+  strings.push_back(std::string("One"));
+  strings.push_back(std::string());
+  strings.push_back(std::string("3"));
+  strings.push_back(std::string("\360\237\222\251"));
+
+  typename Traits::MinidumpStringListWriterType string_list_writer;
+  EXPECT_FALSE(string_list_writer.IsUseful());
+  string_list_writer.InitializeFromVector(strings);
+  EXPECT_TRUE(string_list_writer.IsUseful());
+
+  StringFileWriter file_writer;
+
+  ASSERT_TRUE(string_list_writer.WriteEverything(&file_writer));
+
+  const MinidumpRVAList* list =
+      MinidumpRVAListAtStart(file_writer.string(), strings.size());
+  ASSERT_TRUE(list);
+
+  for (size_t index = 0; index < strings.size(); ++index) {
+    EXPECT_EQ(Traits::ExpectationForUTF8(strings[index]),
+              Traits::ObservationAtRVA(file_writer.string(),
+                                       list->children[index]));
+  }
+}
+
+TEST(MinidumpStringWriter, MinidumpUTF16StringList) {
+  MinidumpStringListTest<MinidumpUTF16StringListWriterTraits>();
+}
+
+TEST(MinidumpStringWriter, MinidumpUTF8StringList) {
+  MinidumpStringListTest<MinidumpUTF8StringListWriterTraits>();
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace crashpad