mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 08:39:44 +08:00
4b450c8137
gtest used to require (expected, actual) ordering for arguments to
EXPECT_EQ and ASSERT_EQ, and in failed test assertions would identify
each side as “expected” or “actual.” Tests in Crashpad adhered to this
traditional ordering. After a gtest change in February 2016, it is now
agnostic with respect to the order of these arguments.
This change mechanically updates all uses of these macros to (actual,
expected) by reversing them. This provides consistency with our use of
the logging CHECK_EQ and DCHECK_EQ macros, and makes for better
readability by ordinary native speakers. The rough (but working!)
conversion tool is
https://chromium-review.googlesource.com/c/466727/1/rewrite_expectassert_eq.py,
and “git cl format” cleaned up its output.
EXPECT_NE and ASSERT_NE never had a preferred ordering. gtest never made
a judgment that one side or the other needed to provide an “unexpected”
value. Consequently, some code used (unexpected, actual) while other
code used (actual, unexpected). For consistency with the new EXPECT_EQ
and ASSERT_EQ usage, as well as consistency with CHECK_NE and DCHECK_NE,
this change also updates these use sites to (actual, unexpected) where
one side can be called “unexpected” as, for example, std::string::npos
can be. Unfortunately, this portion was a manual conversion.
References:
https://github.com/google/googletest/blob/master/googletest/docs/Primer.md#binary-comparison
77d6b17338
https://github.com/google/googletest/pull/713
Change-Id: I978fef7c94183b8b1ef63f12f5ab4d6693626be3
Reviewed-on: https://chromium-review.googlesource.com/466727
Reviewed-by: Scott Graham <scottmg@chromium.org>
108 lines
3.4 KiB
C++
108 lines
3.4 KiB
C++
// 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/test/minidump_string_writer_test_util.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include "gtest/gtest.h"
|
|
#include "minidump/minidump_extensions.h"
|
|
#include "minidump/test/minidump_writable_test_util.h"
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
|
|
namespace {
|
|
|
|
template <typename T>
|
|
const T* TMinidumpStringAtRVA(const std::string& file_contents, RVA rva) {
|
|
const T* string_base = MinidumpWritableAtRVA<T>(file_contents, rva);
|
|
if (!string_base) {
|
|
return nullptr;
|
|
}
|
|
|
|
// |Length| must indicate the ability to store an integral number of code
|
|
// units.
|
|
const size_t kCodeUnitSize = sizeof(string_base->Buffer[0]);
|
|
if (string_base->Length % kCodeUnitSize != 0) {
|
|
EXPECT_EQ(string_base->Length % kCodeUnitSize, 0u);
|
|
return nullptr;
|
|
}
|
|
|
|
// |Length| does not include space for the required NUL terminator.
|
|
MINIDUMP_LOCATION_DESCRIPTOR location;
|
|
location.DataSize =
|
|
sizeof(*string_base) + string_base->Length + kCodeUnitSize;
|
|
location.Rva = rva;
|
|
const T* string =
|
|
MinidumpWritableAtLocationDescriptor<T>(file_contents, location);
|
|
if (!string) {
|
|
return nullptr;
|
|
}
|
|
|
|
EXPECT_EQ(string, string_base);
|
|
|
|
// Require the NUL terminator to be NUL.
|
|
if (string->Buffer[string->Length / kCodeUnitSize] != '\0') {
|
|
EXPECT_EQ(string->Buffer[string->Length / kCodeUnitSize], '\0');
|
|
return nullptr;
|
|
}
|
|
|
|
return string;
|
|
}
|
|
|
|
template <typename StringType, typename MinidumpStringType>
|
|
StringType TMinidumpStringAtRVAAsString(const std::string& file_contents,
|
|
RVA rva) {
|
|
const MinidumpStringType* minidump_string =
|
|
TMinidumpStringAtRVA<MinidumpStringType>(file_contents, rva);
|
|
if (!minidump_string) {
|
|
return StringType();
|
|
}
|
|
|
|
StringType minidump_string_data(
|
|
reinterpret_cast<const typename StringType::value_type*>(
|
|
&minidump_string->Buffer[0]),
|
|
minidump_string->Length / sizeof(minidump_string->Buffer[0]));
|
|
return minidump_string_data;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
const MINIDUMP_STRING* MinidumpStringAtRVA(const std::string& file_contents,
|
|
RVA rva) {
|
|
return TMinidumpStringAtRVA<MINIDUMP_STRING>(file_contents, rva);
|
|
}
|
|
|
|
const MinidumpUTF8String* MinidumpUTF8StringAtRVA(
|
|
const std::string& file_contents,
|
|
RVA rva) {
|
|
return TMinidumpStringAtRVA<MinidumpUTF8String>(file_contents, rva);
|
|
}
|
|
|
|
base::string16 MinidumpStringAtRVAAsString(const std::string& file_contents,
|
|
RVA rva) {
|
|
return TMinidumpStringAtRVAAsString<base::string16, MINIDUMP_STRING>(
|
|
file_contents, rva);
|
|
}
|
|
|
|
std::string MinidumpUTF8StringAtRVAAsString(const std::string& file_contents,
|
|
RVA rva) {
|
|
return TMinidumpStringAtRVAAsString<std::string, MinidumpUTF8String>(
|
|
file_contents, rva);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace crashpad
|