mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 00:32:35 +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>
84 lines
2.8 KiB
C++
84 lines
2.8 KiB
C++
// Copyright 2016 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 "snapshot/api/module_annotations_win.h"
|
|
|
|
#include "client/crashpad_info.h"
|
|
#include "gtest/gtest.h"
|
|
#include "test/win/win_multiprocess.h"
|
|
#include "util/file/file_io.h"
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
namespace {
|
|
|
|
class ModuleAnnotationsMultiprocessTest final : public WinMultiprocess {
|
|
private:
|
|
void WinMultiprocessParent() override {
|
|
// Read the child executable module.
|
|
HMODULE module = nullptr;
|
|
CheckedReadFileExactly(ReadPipeHandle(), &module, sizeof(module));
|
|
|
|
// Reopen the child process with necessary access.
|
|
HANDLE process_handle =
|
|
OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
|
|
FALSE,
|
|
GetProcessId(ChildProcess()));
|
|
EXPECT_TRUE(process_handle);
|
|
|
|
// Read the module annotations in the child process and verify them.
|
|
std::map<std::string, std::string> annotations;
|
|
ASSERT_TRUE(ReadModuleAnnotations(process_handle, module, &annotations));
|
|
|
|
EXPECT_GE(annotations.size(), 3u);
|
|
EXPECT_EQ(annotations["#APITEST# key"], "value");
|
|
EXPECT_EQ(annotations["#APITEST# x"], "y");
|
|
EXPECT_EQ(annotations["#APITEST# empty_value"], "");
|
|
|
|
// Signal the child process to terminate.
|
|
char c = ' ';
|
|
CheckedWriteFile(WritePipeHandle(), &c, sizeof(c));
|
|
}
|
|
|
|
void WinMultiprocessChild() override {
|
|
// Set some test annotations.
|
|
crashpad::CrashpadInfo* crashpad_info =
|
|
crashpad::CrashpadInfo::GetCrashpadInfo();
|
|
|
|
crashpad::SimpleStringDictionary* simple_annotations =
|
|
new crashpad::SimpleStringDictionary();
|
|
simple_annotations->SetKeyValue("#APITEST# key", "value");
|
|
simple_annotations->SetKeyValue("#APITEST# x", "y");
|
|
simple_annotations->SetKeyValue("#APITEST# empty_value", "");
|
|
|
|
crashpad_info->set_simple_annotations(simple_annotations);
|
|
|
|
// Send the executable module.
|
|
HMODULE module = GetModuleHandle(nullptr);
|
|
CheckedWriteFile(WritePipeHandle(), &module, sizeof(module));
|
|
|
|
// Wait until a signal from the parent process to terminate.
|
|
char c;
|
|
CheckedReadFileExactly(ReadPipeHandle(), &c, sizeof(c));
|
|
}
|
|
};
|
|
|
|
TEST(ModuleAnnotationsWin, ReadAnnotations) {
|
|
WinMultiprocess::Run<ModuleAnnotationsMultiprocessTest>();
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace test
|
|
} // namespace crashpad
|