3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-10 06:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

win: Fixes for minidump_string_writer_test.cc

Browse Source 
- More references to sizeof(Struct::Member)
- Complaints about not being able to generate
  constructor, etc. on initialized struct.

R=mark@chromium.org
BUG=crashpad:1

Review URL: https://codereview.chromium.org/896423002
This commit is contained in:
Scott Graham 2015-02-05 09:42:16 -08:00
parent 38a026ffc7
commit e67b87ef02
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
minidump/minidump_string_writer_test.cc
View File

@ -21,6 +21,7 @@
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
@ -55,7 +56,7 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
size_t input_length; size_t input_length;
const char* input_string; const char* input_string;
size_t output_length; size_t output_length;
const base::char16 output_string[10]; base::char16 output_string[10];
} kTestData[] = { } kTestData[] = {
{0, "", 0, {}}, {0, "", 0, {}},
{1, "a", 1, {'a'}}, {1, "a", 1, {'a'}},
@ -89,8 +90,10 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
const size_t expected_utf16_units_with_nul = const size_t expected_utf16_units_with_nul =
kTestData[index].output_length + 1; kTestData[index].output_length + 1;
MINIDUMP_STRING tmp = {0};
ALLOW_UNUSED_LOCAL(tmp);
const size_t expected_utf16_bytes = const size_t expected_utf16_bytes =
expected_utf16_units_with_nul * sizeof(MINIDUMP_STRING::Buffer[0]); expected_utf16_units_with_nul * sizeof(tmp.Buffer[0]);
ASSERT_EQ(sizeof(MINIDUMP_STRING) + expected_utf16_bytes, ASSERT_EQ(sizeof(MINIDUMP_STRING) + expected_utf16_bytes,
file_writer.string().size()); file_writer.string().size());
@ -132,8 +135,10 @@ TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) {
const MINIDUMP_STRING* minidump_string = const MINIDUMP_STRING* minidump_string =
MinidumpStringAtRVA(file_writer.string(), 0); MinidumpStringAtRVA(file_writer.string(), 0);
EXPECT_TRUE(minidump_string); EXPECT_TRUE(minidump_string);
MINIDUMP_STRING tmp = {0};
ALLOW_UNUSED_LOCAL(tmp);
EXPECT_EQ(file_writer.string().size() - sizeof(MINIDUMP_STRING) - EXPECT_EQ(file_writer.string().size() - sizeof(MINIDUMP_STRING) -
sizeof(MINIDUMP_STRING::Buffer[0]), sizeof(tmp.Buffer[0]),
minidump_string->Length); minidump_string->Length);
base::string16 output_string = base::string16 output_string =
MinidumpStringAtRVAAsString(file_writer.string(), 0); MinidumpStringAtRVAAsString(file_writer.string(), 0);