Chromium Code Reviews| Index: chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
| diff --git a/chromecast/crash/linux/dummy_minidump_generator_unittest.cc b/chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
| index c38304f270b6c32c3fa510993d7446af37740897..9d7649b45d262deb385644b315bb96818b9e9d18 100644 |
| --- a/chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
| +++ b/chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
| @@ -12,8 +12,8 @@ |
| namespace chromecast { |
| namespace { |
| -// This value should stay in sync with the internal buffer size used in |
| -// CopyAndDelete(). |
| +// This value should stay in sync with the internal buffer size used for copying |
|
wzhong
2015/07/16 21:08:20
The comment seems incorrect.
slan
2015/07/16 22:39:18
Okay. Now that we are using the Chrome utility, we
|
| +// in base::Move(). |
| const int kInternalBufferSize = 32768; |
| } // namespace |
| @@ -27,7 +27,7 @@ TEST(DummyMinidumpGeneratorTest, GenerateFailsWithInvalidPath) { |
| ASSERT_FALSE(generator.Generate(minidump_dir.Append("minidump.dmp").value())); |
| } |
| -TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithValidPath) { |
| +TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithSmallSource) { |
| // Create directory in which to put minidump. |
| base::FilePath minidump_dir; |
| ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
| @@ -52,43 +52,7 @@ TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithValidPath) { |
| EXPECT_EQ(data, copied_data); |
| } |
| -TEST(DummyMinidumpGeneratorTest, CopyAndDeleteFailsWithInvalidSource) { |
| - // Create directory in which to put minidump. |
| - base::FilePath minidump_dir; |
| - ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
| - |
| - // Attempt to copy from an invalid path. |
| - DummyMinidumpGenerator generator("/path/does/not/exist/minidump.dmp"); |
| - ASSERT_FALSE(generator.CopyAndDeleteForTest( |
| - minidump_dir.Append("minidump.dmp").value())); |
| -} |
| - |
| -TEST(DummyMinidumpGeneratorTest, CopyAndDeleteSucceedsWithSmallSource) { |
| - // Create directory in which to put minidump. |
| - base::FilePath minidump_dir; |
| - ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
| - |
| - // Create a fake minidump file. |
| - base::FilePath fake_minidump; |
| - ASSERT_TRUE(base::CreateTemporaryFile(&fake_minidump)); |
| - const std::string data("Test contents of the minidump file.\n"); |
| - ASSERT_EQ(static_cast<int>(data.size()), |
| - base::WriteFile(fake_minidump, data.c_str(), data.size())); |
| - |
| - base::FilePath new_minidump = minidump_dir.Append("minidump.dmp"); |
| - DummyMinidumpGenerator generator(fake_minidump.value()); |
| - ASSERT_TRUE(generator.CopyAndDeleteForTest(new_minidump.value())); |
| - |
| - // Original file should not exist, and new file should contain original |
| - // contents. |
| - std::string copied_data; |
| - EXPECT_FALSE(base::PathExists(fake_minidump)); |
| - ASSERT_TRUE(base::PathExists(new_minidump)); |
| - EXPECT_TRUE(base::ReadFileToString(new_minidump, &copied_data)); |
| - EXPECT_EQ(data, copied_data); |
| -} |
| - |
| -TEST(DummyMinidumpGeneratorTest, CopyAndDeleteSucceedsWithLargeSource) { |
| +TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithLargeSource) { |
| // Create directory in which to put minidump. |
| base::FilePath minidump_dir; |
| ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
| @@ -110,7 +74,7 @@ TEST(DummyMinidumpGeneratorTest, CopyAndDeleteSucceedsWithLargeSource) { |
| base::FilePath new_minidump = minidump_dir.Append("minidump.dmp"); |
| DummyMinidumpGenerator generator(fake_minidump.value()); |
| - ASSERT_TRUE(generator.CopyAndDeleteForTest(new_minidump.value())); |
| + ASSERT_TRUE(generator.Generate(new_minidump.value())); |
| // Original file should not exist, and new file should contain original |
| // contents. |
| @@ -121,7 +85,7 @@ TEST(DummyMinidumpGeneratorTest, CopyAndDeleteSucceedsWithLargeSource) { |
| EXPECT_EQ(data, copied_data); |
| } |
| -TEST(DummyMinidumpGeneratorTest, CopyAndDeleteSucceedsWhenEOFAlignsWithBuffer) { |
| +TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWhenEOFAlignsWithBuffer) { |
| // Create directory in which to put minidump. |
| base::FilePath minidump_dir; |
| ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
| @@ -143,7 +107,7 @@ TEST(DummyMinidumpGeneratorTest, CopyAndDeleteSucceedsWhenEOFAlignsWithBuffer) { |
| base::FilePath new_minidump = minidump_dir.Append("minidump.dmp"); |
| DummyMinidumpGenerator generator(fake_minidump.value()); |
| - ASSERT_TRUE(generator.CopyAndDeleteForTest(new_minidump.value())); |
| + ASSERT_TRUE(generator.Generate(new_minidump.value())); |
| // Original file should not exist, and new file should contain original |
| // contents. |