Crash reporter: collect suspend and resume info from power manager

unclean_shutdown_collector_test.cc

Index: unclean_shutdown_collector_test.cc
diff --git a/unclean_shutdown_collector_test.cc b/unclean_shutdown_collector_test.cc
index 7be52af146db6faaeae8bae48be92aa814f92661..485ae345b037fe6ec3482e438e8ffeb894fbc8e3 100644
--- a/unclean_shutdown_collector_test.cc
+++ b/unclean_shutdown_collector_test.cc
@@ -15,6 +15,8 @@ static int s_crashes = 0;
 static bool s_metrics = false;
 
 static const char kTestUnclean[] = "test/unclean";
+static const char kTestSuspended[] = "test/suspended";
+static const char kTestLowBattery[] = "test/low_battery";

[kmixter1, 2010/11/23 23:18:01]

nit: abc order unless there's a specific reason not to

 
 void CountCrash() {
   ++s_crashes;
@@ -34,6 +36,9 @@ class UncleanShutdownCollectorTest : public ::testing::Test {
     test_unclean_ = FilePath(kTestUnclean);
     collector_.unclean_shutdown_file_ = kTestUnclean;
     file_util::Delete(test_unclean_, true);
+    // Set up alternate power manager tracing files as well
+    collector_.powerd_suspended_file_ = FilePath(kTestSuspended);
+    collector_.powerd_low_battery_file_ = FilePath(kTestLowBattery);
   }
  protected:
   void WriteStringToFile(const FilePath &file_path,
@@ -78,6 +83,29 @@ TEST_F(UncleanShutdownCollectorTest, CollectFalse) {
   ASSERT_FALSE(collector_.Collect());
 }
 
+TEST_F(UncleanShutdownCollectorTest, CollectDeadBatteryRunningLow) {
+  ASSERT_TRUE(collector_.Enable());
+  ASSERT_TRUE(file_util::PathExists(test_unclean_));
+  file_util::WriteFile(collector_.powerd_low_battery_file_, "", 0);
+  ASSERT_TRUE(collector_.Collect());

[kmixter1, 2010/11/23 23:18:01]

Should return false.

+  ASSERT_FALSE(file_util::PathExists(test_unclean_));
+  ASSERT_FALSE(file_util::PathExists(collector_.powerd_low_battery_file_));
+  ASSERT_NE(std::string::npos,
+            logging_.log().find("Unclean shutdown occurred while running with "
+                                "battery critically low"));

[kmixter1, 2010/11/23 23:18:01]

nit: search for ending '.' like you do in the other unit test

+}
+
+TEST_F(UncleanShutdownCollectorTest, CollectDeadBatterySuspended) {
+  ASSERT_TRUE(collector_.Enable());
+  ASSERT_TRUE(file_util::PathExists(test_unclean_));
+  file_util::WriteFile(collector_.powerd_suspended_file_, "", 0);
+  ASSERT_TRUE(collector_.Collect());

[kmixter1, 2010/11/23 23:18:01]

Should return false.

+  ASSERT_FALSE(file_util::PathExists(test_unclean_));
+  ASSERT_FALSE(file_util::PathExists(collector_.powerd_suspended_file_));
+  ASSERT_NE(std::string::npos,
+            logging_.log().find("Unclean shutdown occurred while suspended."));

[kmixter1, 2010/11/23 23:18:01]

Could you add a check here, above and in CollectFalse and CollectTrue for the
value of s_crashes?  In all functions except CollectTrue it should be 0.  In
CollectTrue it should be 1.  That would have made the bug in the new code more
obvious to see in the test.

+}
+
 TEST_F(UncleanShutdownCollectorTest, Disable) {
   ASSERT_TRUE(collector_.Enable());
   ASSERT_TRUE(file_util::PathExists(test_unclean_));