Refactor minidump test utilities for MinidumpWritable, …

minidump/minidump_simple_string_dictionary_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,
@@ skipping 46 matching lines @@
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + 1 + 3 + 1,  // 3 for padding
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryCast(file_writer);
   EXPECT_EQ(1u, dictionary->count);
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ("",
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ("",
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, OneKeyValue) {
   StringFileWriter file_writer;
 
   char kKey[] = "key";
   char kValue[] = "value";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
   MinidumpSimpleStringDictionaryEntryWriter entry_writer;
   entry_writer.SetKeyValue(kKey, kValue);
   dictionary_writer.AddEntry(&entry_writer);
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + sizeof(kKey) + sizeof(kValue),
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryCast(file_writer);
   EXPECT_EQ(1u, dictionary->count);
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ(kKey,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ(kValue,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, ThreeKeysValues) {
   StringFileWriter file_writer;
 
   char kKey0[] = "m0";
   char kValue0[] = "value0";
   char kKey1[] = "zzz1";
   char kValue1[] = "v1";
   char kKey2[] = "aa2";
@@ skipping 28 matching lines @@
   EXPECT_EQ(68u, dictionary->entries[2].key);
   EXPECT_EQ(80u, dictionary->entries[2].value);
 
   // The entries don’t appear in the order they were added. The current
   // implementation uses a std::map and sorts keys, so the entires appear in
   // alphabetical order. However, this is an implementation detail, and it’s OK
   // if the writer stops sorting in this order. Testing for a specific order is
   // just the easiest way to write this test while the writer will output things
   // in a known order.
   EXPECT_EQ(kKey2,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ(kValue2,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
   EXPECT_EQ(kKey0,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[1].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[1].key));
   EXPECT_EQ(kValue0,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[1].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[1].value));
   EXPECT_EQ(kKey1,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[2].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[2].key));
   EXPECT_EQ(kValue1,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[2].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[2].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, DuplicateKeyValue) {
   StringFileWriter file_writer;
 
   char kKey[] = "key";
   char kValue0[] = "fake_value";
   char kValue1[] = "value";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
   MinidumpSimpleStringDictionaryEntryWriter entry_writer_0;
   entry_writer_0.SetKeyValue(kKey, kValue0);
   dictionary_writer.AddEntry(&entry_writer_0);
   MinidumpSimpleStringDictionaryEntryWriter entry_writer_1;
   entry_writer_1.SetKeyValue(kKey, kValue1);
   dictionary_writer.AddEntry(&entry_writer_1);
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + sizeof(kKey) + sizeof(kValue1),
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryCast(file_writer);
   EXPECT_EQ(1u, dictionary->count);
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ(kKey,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ(kValue1,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad