3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-17 16:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

minidump: Use variable names in tests that match parallel array indices.

Browse Source 
Inspired by
https://codereview.chromium.org/637503006/diff/20001/minidump/minidump_thread_writer_test.cc#newcode409

TEST=minidump_test MinidumpMemoryWriter.*:MinidumpModuleWriter.*
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/643683003
This commit is contained in:
Mark Mentovai 2014-10-09 15:21:05 -04:00
parent 9d115e2391
commit 8d36e3581c
2 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
minidump/minidump_memory_writer_test.cc
View File

@ -134,17 +134,17 @@ TEST(MinidumpMemoryWriter, TwoMemoryRegions) {
MinidumpFileWriter minidump_file_writer; MinidumpFileWriter minidump_file_writer;
MinidumpMemoryListWriter memory_list_writer; MinidumpMemoryListWriter memory_list_writer;
const uint64_t kBaseAddress1 = 0xc0ffee; const uint64_t kBaseAddress0 = 0xc0ffee;
const uint64_t kSize1 = 0x0100; const uint64_t kSize0 = 0x0100;
const uint8_t kValue1 = '6'; const uint8_t kValue0 = '6';
const uint64_t kBaseAddress2 = 0xfac00fac; const uint64_t kBaseAddress1 = 0xfac00fac;
const uint64_t kSize2 = 0x0200; const uint64_t kSize1 = 0x0200;
const uint8_t kValue2 = '!'; const uint8_t kValue1 = '!';
TestMinidumpMemoryWriter memory_writer_0(kBaseAddress0, kSize0, kValue0);
memory_list_writer.AddMemory(&memory_writer_0);
TestMinidumpMemoryWriter memory_writer_1(kBaseAddress1, kSize1, kValue1); TestMinidumpMemoryWriter memory_writer_1(kBaseAddress1, kSize1, kValue1);
memory_list_writer.AddMemory(&memory_writer_1); memory_list_writer.AddMemory(&memory_writer_1);
TestMinidumpMemoryWriter memory_writer_2(kBaseAddress2, kSize2, kValue2);
memory_list_writer.AddMemory(&memory_writer_2);
minidump_file_writer.AddStream(&memory_list_writer); minidump_file_writer.AddStream(&memory_list_writer);
@ -162,8 +162,8 @@ TEST(MinidumpMemoryWriter, TwoMemoryRegions) {
{ {
SCOPED_TRACE("region 0"); SCOPED_TRACE("region 0");
expected.StartOfMemoryRange = kBaseAddress1; expected.StartOfMemoryRange = kBaseAddress0;
expected.Memory.DataSize = kSize1; expected.Memory.DataSize = kSize0;
expected.Memory.Rva = expected.Memory.Rva =
sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) + sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
sizeof(MINIDUMP_MEMORY_LIST) + sizeof(MINIDUMP_MEMORY_LIST) +
@ -171,21 +171,21 @@ TEST(MinidumpMemoryWriter, TwoMemoryRegions) {
ExpectMinidumpMemoryDescriptorAndContents(&expected, ExpectMinidumpMemoryDescriptorAndContents(&expected,
&memory_list->MemoryRanges[0], &memory_list->MemoryRanges[0],
file_writer.string(), file_writer.string(),
kValue1, kValue0,
false); false);
} }
{ {
SCOPED_TRACE("region 1"); SCOPED_TRACE("region 1");
expected.StartOfMemoryRange = kBaseAddress2; expected.StartOfMemoryRange = kBaseAddress1;
expected.Memory.DataSize = kSize2; expected.Memory.DataSize = kSize1;
expected.Memory.Rva = memory_list->MemoryRanges[0].Memory.Rva + expected.Memory.Rva = memory_list->MemoryRanges[0].Memory.Rva +
memory_list->MemoryRanges[0].Memory.DataSize; memory_list->MemoryRanges[0].Memory.DataSize;
ExpectMinidumpMemoryDescriptorAndContents(&expected, ExpectMinidumpMemoryDescriptorAndContents(&expected,
&memory_list->MemoryRanges[1], &memory_list->MemoryRanges[1],
file_writer.string(), file_writer.string(),
kValue2, kValue1,
true); true);
} }
} }
@ -234,21 +234,21 @@ TEST(MinidumpMemoryWriter, ExtraMemory) {
// memory writer a child of the memory list writer. // memory writer a child of the memory list writer.
MinidumpFileWriter minidump_file_writer; MinidumpFileWriter minidump_file_writer;
const uint64_t kBaseAddress1 = 0x1000; const uint64_t kBaseAddress0 = 0x1000;
const uint64_t kSize1 = 0x0400; const uint64_t kSize0 = 0x0400;
const uint8_t kValue1 = '1'; const uint8_t kValue0 = '1';
TestMemoryStream test_memory_stream(kBaseAddress1, kSize1, kValue1); TestMemoryStream test_memory_stream(kBaseAddress0, kSize0, kValue0);
MinidumpMemoryListWriter memory_list_writer; MinidumpMemoryListWriter memory_list_writer;
memory_list_writer.AddExtraMemory(test_memory_stream.memory()); memory_list_writer.AddExtraMemory(test_memory_stream.memory());
minidump_file_writer.AddStream(&test_memory_stream); minidump_file_writer.AddStream(&test_memory_stream);
const uint64_t kBaseAddress2 = 0x2000; const uint64_t kBaseAddress1 = 0x2000;
const uint64_t kSize2 = 0x0400; const uint64_t kSize1 = 0x0400;
const uint8_t kValue2 = 'm'; const uint8_t kValue1 = 'm';
TestMinidumpMemoryWriter memory_writer(kBaseAddress2, kSize2, kValue2); TestMinidumpMemoryWriter memory_writer(kBaseAddress1, kSize1, kValue1);
memory_list_writer.AddMemory(&memory_writer); memory_list_writer.AddMemory(&memory_writer);
minidump_file_writer.AddStream(&memory_list_writer); minidump_file_writer.AddStream(&memory_list_writer);
@ -267,8 +267,8 @@ TEST(MinidumpMemoryWriter, ExtraMemory) {
{ {
SCOPED_TRACE("region 0"); SCOPED_TRACE("region 0");
expected.StartOfMemoryRange = kBaseAddress1; expected.StartOfMemoryRange = kBaseAddress0;
expected.Memory.DataSize = kSize1; expected.Memory.DataSize = kSize0;
expected.Memory.Rva = expected.Memory.Rva =
sizeof(MINIDUMP_HEADER) + 2 * sizeof(MINIDUMP_DIRECTORY) + sizeof(MINIDUMP_HEADER) + 2 * sizeof(MINIDUMP_DIRECTORY) +
sizeof(MINIDUMP_MEMORY_LIST) + sizeof(MINIDUMP_MEMORY_LIST) +
@ -276,21 +276,21 @@ TEST(MinidumpMemoryWriter, ExtraMemory) {
ExpectMinidumpMemoryDescriptorAndContents(&expected, ExpectMinidumpMemoryDescriptorAndContents(&expected,
&memory_list->MemoryRanges[0], &memory_list->MemoryRanges[0],
file_writer.string(), file_writer.string(),
kValue1, kValue0,
false); false);
} }
{ {
SCOPED_TRACE("region 1"); SCOPED_TRACE("region 1");
expected.StartOfMemoryRange = kBaseAddress2; expected.StartOfMemoryRange = kBaseAddress1;
expected.Memory.DataSize = kSize2; expected.Memory.DataSize = kSize1;
expected.Memory.Rva = memory_list->MemoryRanges[0].Memory.Rva + expected.Memory.Rva = memory_list->MemoryRanges[0].Memory.Rva +
memory_list->MemoryRanges[0].Memory.DataSize; memory_list->MemoryRanges[0].Memory.DataSize;
ExpectMinidumpMemoryDescriptorAndContents(&expected, ExpectMinidumpMemoryDescriptorAndContents(&expected,
&memory_list->MemoryRanges[1], &memory_list->MemoryRanges[1],
file_writer.string(), file_writer.string(),
kValue2, kValue1,
true); true);
} }
} }

98
minidump/minidump_module_writer_test.cc
View File

@ -494,38 +494,45 @@ TEST(MinidumpModuleWriter, ThreeModules) {
MinidumpFileWriter minidump_file_writer; MinidumpFileWriter minidump_file_writer;
MinidumpModuleListWriter module_list_writer; MinidumpModuleListWriter module_list_writer;
const char kModuleName1[] = "main"; const char kModuleName0[] = "main";
const uint64_t kModuleBase1 = 0x100101000; const uint64_t kModuleBase0 = 0x100101000;
const uint32_t kModuleSize1 = 0xf000; const uint32_t kModuleSize0 = 0xf000;
const char kPDBName1[] = "main"; const char kPDBName0[] = "main";
const uint8_t kPDBUUIDBytes1[16] = const uint8_t kPDBUUIDBytes0[16] =
{0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00, 0x11, {0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00, 0x11,
0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99}; 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99};
UUID pdb_uuid_1; UUID pdb_uuid_0;
pdb_uuid_1.InitializeFromBytes(kPDBUUIDBytes1); pdb_uuid_0.InitializeFromBytes(kPDBUUIDBytes0);
const uint32_t kPDBAge1 = 0; const uint32_t kPDBAge0 = 0;
const char kModuleName2[] = "ld.so"; const char kModuleName1[] = "ld.so";
const uint64_t kModuleBase2 = 0x200202000; const uint64_t kModuleBase1 = 0x200202000;
const uint32_t kModuleSize2 = 0x1e000; const uint32_t kModuleSize1 = 0x1e000;
const char kModuleName3[] = "libc.so"; const char kModuleName2[] = "libc.so";
const uint64_t kModuleBase3 = 0x300303000; const uint64_t kModuleBase2 = 0x300303000;
const uint32_t kModuleSize3 = 0x2d000; const uint32_t kModuleSize2 = 0x2d000;
const char kPDBName3[] = "libc.so"; const char kPDBName2[] = "libc.so";
const time_t kPDBTimestamp3 = 0x386d4380; const time_t kPDBTimestamp2 = 0x386d4380;
const uint32_t kPDBAge3 = 2; const uint32_t kPDBAge2 = 2;
MinidumpModuleWriter module_writer_0;
module_writer_0.SetName(kModuleName0);
module_writer_0.SetImageBaseAddress(kModuleBase0);
module_writer_0.SetImageSize(kModuleSize0);
MinidumpModuleCodeViewRecordPDB70Writer codeview_pdb70_writer_0;
codeview_pdb70_writer_0.SetPDBName(kPDBName0);
codeview_pdb70_writer_0.SetUUIDAndAge(pdb_uuid_0, kPDBAge0);
module_writer_0.SetCodeViewRecord(&codeview_pdb70_writer_0);
module_list_writer.AddModule(&module_writer_0);
MinidumpModuleWriter module_writer_1; MinidumpModuleWriter module_writer_1;
module_writer_1.SetName(kModuleName1); module_writer_1.SetName(kModuleName1);
module_writer_1.SetImageBaseAddress(kModuleBase1); module_writer_1.SetImageBaseAddress(kModuleBase1);
module_writer_1.SetImageSize(kModuleSize1); module_writer_1.SetImageSize(kModuleSize1);
MinidumpModuleCodeViewRecordPDB70Writer codeview_pdb70_writer_1;
codeview_pdb70_writer_1.SetPDBName(kPDBName1);
codeview_pdb70_writer_1.SetUUIDAndAge(pdb_uuid_1, kPDBAge1);
module_writer_1.SetCodeViewRecord(&codeview_pdb70_writer_1);
module_list_writer.AddModule(&module_writer_1); module_list_writer.AddModule(&module_writer_1);
MinidumpModuleWriter module_writer_2; MinidumpModuleWriter module_writer_2;
@ -533,20 +540,13 @@ TEST(MinidumpModuleWriter, ThreeModules) {
module_writer_2.SetImageBaseAddress(kModuleBase2); module_writer_2.SetImageBaseAddress(kModuleBase2);
module_writer_2.SetImageSize(kModuleSize2); module_writer_2.SetImageSize(kModuleSize2);
MinidumpModuleCodeViewRecordPDB20Writer codeview_pdb70_writer_2;
codeview_pdb70_writer_2.SetPDBName(kPDBName2);
codeview_pdb70_writer_2.SetTimestampAndAge(kPDBTimestamp2, kPDBAge2);
module_writer_2.SetCodeViewRecord(&codeview_pdb70_writer_2);
module_list_writer.AddModule(&module_writer_2); module_list_writer.AddModule(&module_writer_2);
MinidumpModuleWriter module_writer_3;
module_writer_3.SetName(kModuleName3);
module_writer_3.SetImageBaseAddress(kModuleBase3);
module_writer_3.SetImageSize(kModuleSize3);
MinidumpModuleCodeViewRecordPDB20Writer codeview_pdb70_writer_3;
codeview_pdb70_writer_3.SetPDBName(kPDBName3);
codeview_pdb70_writer_3.SetTimestampAndAge(kPDBTimestamp3, kPDBAge3);
module_writer_3.SetCodeViewRecord(&codeview_pdb70_writer_3);
module_list_writer.AddModule(&module_writer_3);
minidump_file_writer.AddStream(&module_list_writer); minidump_file_writer.AddStream(&module_list_writer);
StringFileWriter file_writer; StringFileWriter file_writer;
@ -567,17 +567,17 @@ TEST(MinidumpModuleWriter, ThreeModules) {
{ {
SCOPED_TRACE("module 0"); SCOPED_TRACE("module 0");
expected.BaseOfImage = kModuleBase1; expected.BaseOfImage = kModuleBase0;
expected.SizeOfImage = kModuleSize1; expected.SizeOfImage = kModuleSize0;
ASSERT_NO_FATAL_FAILURE(ExpectModule(&expected, ASSERT_NO_FATAL_FAILURE(ExpectModule(&expected,
&module_list->Modules[0], &module_list->Modules[0],
file_writer.string(), file_writer.string(),
kModuleName1, kModuleName0,
kPDBName1, kPDBName0,
&pdb_uuid_1, &pdb_uuid_0,
0, 0,
kPDBAge1, kPDBAge0,
NULL, NULL,
0, 0,
false)); false));
@ -586,13 +586,13 @@ TEST(MinidumpModuleWriter, ThreeModules) {
{ {
SCOPED_TRACE("module 1"); SCOPED_TRACE("module 1");
expected.BaseOfImage = kModuleBase2; expected.BaseOfImage = kModuleBase1;
expected.SizeOfImage = kModuleSize2; expected.SizeOfImage = kModuleSize1;
ASSERT_NO_FATAL_FAILURE(ExpectModule(&expected, ASSERT_NO_FATAL_FAILURE(ExpectModule(&expected,
&module_list->Modules[1], &module_list->Modules[1],
file_writer.string(), file_writer.string(),
kModuleName2, kModuleName1,
NULL, NULL,
NULL, NULL,
0, 0,
@ -605,17 +605,17 @@ TEST(MinidumpModuleWriter, ThreeModules) {
{ {
SCOPED_TRACE("module 2"); SCOPED_TRACE("module 2");
expected.BaseOfImage = kModuleBase3; expected.BaseOfImage = kModuleBase2;
expected.SizeOfImage = kModuleSize3; expected.SizeOfImage = kModuleSize2;
ASSERT_NO_FATAL_FAILURE(ExpectModule(&expected, ASSERT_NO_FATAL_FAILURE(ExpectModule(&expected,
&module_list->Modules[2], &module_list->Modules[2],
file_writer.string(), file_writer.string(),
kModuleName3, kModuleName2,
kPDBName3, kPDBName2,
NULL, NULL,
kPDBTimestamp3, kPDBTimestamp2,
kPDBAge3, kPDBAge2,
NULL, NULL,
0, 0,
false)); false));