Chromium Code Reviews| Index: base/trace_event/process_memory_maps_dump_provider_unittest.cc |
| diff --git a/base/trace_event/process_memory_maps_dump_provider_unittest.cc b/base/trace_event/process_memory_maps_dump_provider_unittest.cc |
| index a73a21c772e9581d1d72bb9b98dbf03cc3627277..904850cc32c4630379891f58d5e200827da53a04 100644 |
| --- a/base/trace_event/process_memory_maps_dump_provider_unittest.cc |
| +++ b/base/trace_event/process_memory_maps_dump_provider_unittest.cc |
| @@ -4,14 +4,16 @@ |
| #include "base/trace_event/process_memory_maps_dump_provider.h" |
| -#include <fstream> |
| -#include <sstream> |
| - |
| +#include "base/files/file_util.h" |
| #include "base/trace_event/process_memory_dump.h" |
| #include "base/trace_event/process_memory_maps.h" |
| #include "base/trace_event/trace_event_argument.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| +#if defined(OS_LINUX) || defined(OS_ANDROID) |
| +#include <fcntl.h> |
|
Primiano Tucci (use gerrit)
2015/10/06 16:37:31
either you don't need fcntl and remove it, or just
ssid
2015/10/06 18:47:05
Done.
|
| +#endif |
| + |
| namespace base { |
| namespace trace_event { |
| @@ -104,6 +106,18 @@ const char kTestSmaps2[] = |
| "MMUPageSize: 4 kB\n" |
| "Locked: 0 kB\n" |
| "VmFlags: rd wr mr mw me ac sd\n"; |
| + |
| +void CreateAndSetSmapsFileForTesting(const char* smaps_string, |
| + ScopedFILE& file) { |
| + FilePath temp_path; |
| + FILE* temp_file = CreateAndOpenTemporaryFile(&temp_path); |
| + file.reset(temp_file); |
| + ASSERT_TRUE(temp_file); |
| + |
| + ASSERT_TRUE(base::WriteFileDescriptor(fileno(temp_file), smaps_string, |
| + strlen(smaps_string))); |
| +} |
| + |
| } // namespace |
| TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) { |
| @@ -114,25 +128,19 @@ TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) { |
| auto pmmdp = ProcessMemoryMapsDumpProvider::GetInstance(); |
| - // Emulate a non-existent /proc/self/smaps. |
| - ProcessMemoryDump pmd_invalid(nullptr /* session_state */); |
| - std::ifstream non_existent_file("/tmp/does-not-exist"); |
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = &non_existent_file; |
| - CHECK_EQ(false, non_existent_file.good()); |
| - pmmdp->OnMemoryDump(dump_args, &pmd_invalid); |
| - ASSERT_FALSE(pmd_invalid.has_process_mmaps()); |
| - |
| // Emulate an empty /proc/self/smaps. |
| - std::ifstream empty_file("/dev/null"); |
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = &empty_file; |
| - CHECK_EQ(true, empty_file.good()); |
| + ProcessMemoryDump pmd_invalid(nullptr /* session_state */); |
| + ScopedFILE empty_file(OpenFile(FilePath("/dev/null"), "r")); |
| + ASSERT_TRUE(empty_file.get()); |
| + ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = empty_file.get(); |
| pmmdp->OnMemoryDump(dump_args, &pmd_invalid); |
| ASSERT_FALSE(pmd_invalid.has_process_mmaps()); |
| // Parse the 1st smaps file. |
| ProcessMemoryDump pmd_1(nullptr /* session_state */); |
| - std::istringstream test_smaps_1(kTestSmaps1); |
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = &test_smaps_1; |
| + ScopedFILE temp_file1; |
| + CreateAndSetSmapsFileForTesting(kTestSmaps1, temp_file1); |
| + ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = temp_file1.get(); |
| pmmdp->OnMemoryDump(dump_args, &pmd_1); |
| ASSERT_TRUE(pmd_1.has_process_mmaps()); |
| const auto& regions_1 = pmd_1.process_mmaps()->vm_regions(); |
| @@ -162,8 +170,9 @@ TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) { |
| // Parse the 2nd smaps file. |
| ProcessMemoryDump pmd_2(nullptr /* session_state */); |
| - std::istringstream test_smaps_2(kTestSmaps2); |
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = &test_smaps_2; |
| + ScopedFILE temp_file2; |
| + CreateAndSetSmapsFileForTesting(kTestSmaps2, temp_file2); |
| + ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = temp_file2.get(); |
| pmmdp->OnMemoryDump(dump_args, &pmd_2); |
| ASSERT_TRUE(pmd_2.has_process_mmaps()); |
| const auto& regions_2 = pmd_2.process_mmaps()->vm_regions(); |