| Index: client/crash_report_database_test.cc
|
| diff --git a/client/crash_report_database_test.cc b/client/crash_report_database_test.cc
|
| index 00b7eff13c173de3bc969d816a0d676b99a902be..4b7db856a300eb64e068935a835eee9624f38f8e 100644
|
| --- a/client/crash_report_database_test.cc
|
| +++ b/client/crash_report_database_test.cc
|
| @@ -16,11 +16,16 @@
|
|
|
| #include <sys/stat.h>
|
|
|
| +#include "build/build_config.h"
|
| #include "gtest/gtest.h"
|
| #include "util/file/file_io.h"
|
| #include "util/test/errors.h"
|
| #include "util/test/scoped_temp_dir.h"
|
|
|
| +#if !defined(OS_WIN)
|
| +#include "client/settings.h"
|
| +#endif
|
| +
|
| namespace crashpad {
|
| namespace test {
|
| namespace {
|
| @@ -74,6 +79,15 @@ class CrashReportDatabaseTest : public testing::Test {
|
| }
|
|
|
| void UploadReport(const UUID& uuid, bool successful, const std::string& id) {
|
| +#if !defined(OS_WIN)
|
| + // Enable when ported to Windows.
|
| + // https://code.google.com/p/crashpad/issues/detail?id=13
|
| + Settings* const settings = db_->GetSettings();
|
| + ASSERT_TRUE(settings);
|
| + time_t times[2];
|
| + ASSERT_TRUE(settings->GetLastUploadAttemptTime(×[0]));
|
| +#endif
|
| +
|
| const CrashReportDatabase::Report* report = nullptr;
|
| ASSERT_EQ(CrashReportDatabase::kNoError,
|
| db_->GetReportForUploading(uuid, &report));
|
| @@ -84,6 +98,14 @@ class CrashReportDatabaseTest : public testing::Test {
|
| EXPECT_GT(report->creation_time, 0);
|
| EXPECT_EQ(CrashReportDatabase::kNoError,
|
| db_->RecordUploadAttempt(report, successful, id));
|
| +
|
| +#if !defined(OS_WIN)
|
| + // Enable when ported to Windows.
|
| + // https://code.google.com/p/crashpad/issues/detail?id=13
|
| + ASSERT_TRUE(settings->GetLastUploadAttemptTime(×[1]));
|
| + EXPECT_NE(times[1], 0);
|
| + EXPECT_GE(times[1], times[0]);
|
| +#endif
|
| }
|
|
|
| void ExpectPreparedCrashReport(const CrashReportDatabase::Report& report) {
|
| @@ -112,7 +134,21 @@ class CrashReportDatabaseTest : public testing::Test {
|
|
|
| TEST_F(CrashReportDatabaseTest, Initialize) {
|
| // Initialize the database for the first time, creating it.
|
| - EXPECT_TRUE(db());
|
| + ASSERT_TRUE(db());
|
| +
|
| +#if !defined(OS_WIN)
|
| + // Enable when ported to Windows.
|
| + // https://code.google.com/p/crashpad/issues/detail?id=13
|
| + Settings* settings = db()->GetSettings();
|
| +
|
| + UUID client_ids[2];
|
| + ASSERT_TRUE(settings->GetClientID(&client_ids[0]));
|
| + EXPECT_NE(client_ids[0], UUID());
|
| +
|
| + time_t last_upload_attempt_time;
|
| + ASSERT_TRUE(settings->GetLastUploadAttemptTime(&last_upload_attempt_time));
|
| + EXPECT_EQ(0, last_upload_attempt_time);
|
| +#endif
|
|
|
| // Close and reopen the database at the same path.
|
| ResetDatabase();
|
| @@ -120,6 +156,18 @@ TEST_F(CrashReportDatabaseTest, Initialize) {
|
| auto db = CrashReportDatabase::Initialize(path());
|
| ASSERT_TRUE(db);
|
|
|
| +#if !defined(OS_WIN)
|
| + // Enable when ported to Windows.
|
| + // https://code.google.com/p/crashpad/issues/detail?id=13
|
| + settings = db->GetSettings();
|
| +
|
| + ASSERT_TRUE(settings->GetClientID(&client_ids[1]));
|
| + EXPECT_EQ(client_ids[0], client_ids[1]);
|
| +
|
| + ASSERT_TRUE(settings->GetLastUploadAttemptTime(&last_upload_attempt_time));
|
| + EXPECT_EQ(0, last_upload_attempt_time);
|
| +#endif
|
| +
|
| std::vector<CrashReportDatabase::Report> reports;
|
| EXPECT_EQ(CrashReportDatabase::kNoError, db->GetPendingReports(&reports));
|
| EXPECT_TRUE(reports.empty());
|
|
|