ErrorConsole Switch, Duplicate Error Detection, Dev Mode Check

chrome/browser/extensions/error_console/error_console_unittest.cc

Index: chrome/browser/extensions/error_console/error_console_unittest.cc
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index 62b5320d1808498893a09b301a3544f1a15f9c83..51b84ff3a3f2561e07bbe4e75daf75af2b056bdd 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -7,13 +7,18 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/common/extensions/feature_switch.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_error.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::string16;
@@ -39,11 +44,11 @@ string16 CreateErrorDetails(const std::string& extension_id) {
   return UTF8ToUTF16(json_utf8);
 }
 
-scoped_ptr<const ExtensionError> CreateNewRuntimeError(
+scoped_ptr<ExtensionError> CreateNewRuntimeError(
     bool from_incognito,
     const std::string& extension_id,
     const string16& message) {
-  return scoped_ptr<const ExtensionError>(new JavascriptRuntimeError(
+  return scoped_ptr<ExtensionError>(new RuntimeError(
       from_incognito,
       UTF8ToUTF16("source"),
       message,
@@ -55,12 +60,21 @@ scoped_ptr<const ExtensionError> CreateNewRuntimeError(
 
 class ErrorConsoleUnitTest : public testing::Test {
  public:
-  ErrorConsoleUnitTest() :
-      profile_(new TestingProfile),
-      error_console_(ErrorConsole::Get(profile_.get())) {
-  }
+  ErrorConsoleUnitTest() : error_console_(NULL) { }
   virtual ~ErrorConsoleUnitTest() { }
 
+  virtual void SetUp() OVERRIDE {
+    testing::Test::SetUp();
+
+    // Errors are only kept if we have the FeatureSwitch and have Developer Mode
+    // enabled.
+    FeatureSwitch::error_console()->SetOverrideValue(
+        FeatureSwitch::OVERRIDE_ENABLED);
+    profile_.reset(new TestingProfile);
+    profile_->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, true);
+    error_console_ = ErrorConsole::Get(profile_.get());
+  }
+
  protected:
   scoped_ptr<TestingProfile> profile_;
   ErrorConsole* error_console_;
@@ -73,11 +87,11 @@ TEST_F(ErrorConsoleUnitTest, AddAndRemoveErrors) {
 
   const size_t kNumTotalErrors = 6;
   const size_t kNumNonIncognitoErrors = 3;
-  const char kId[] = "id";
+  const std::string kId = id_util::GenerateId("id");
   // Populate with both incognito and non-incognito errors (evenly distributed).
   for (size_t i = 0; i < kNumTotalErrors; ++i) {
     error_console_->ReportError(
-        CreateNewRuntimeError(i % 2 == 0, kId, string16()));
+        CreateNewRuntimeError(i % 2 == 0, kId, base::UintToString16(i)));
   }
 
   // There should only be one entry in the map, since errors are stored in lists
@@ -96,7 +110,7 @@ TEST_F(ErrorConsoleUnitTest, AddAndRemoveErrors) {
     ASSERT_FALSE(errors[i]->from_incognito());
 
   // Add another error for a different extension id.
-  const char kSecondId[] = "id2";
+  const std::string kSecondId = id_util::GenerateId("id2");
   error_console_->ReportError(
       CreateNewRuntimeError(false, kSecondId, string16()));
 
@@ -127,7 +141,7 @@ TEST_F(ErrorConsoleUnitTest, ExcessiveErrorsGetCropped) {
   // This constant matches one of the same name in error_console.cc.
   const size_t kMaxErrorsPerExtension = 100;
   const size_t kNumExtraErrors = 5;
-  const char kId[] = "id";
+  const std::string kId = id_util::GenerateId("id");
 
   // Add new errors, with each error's message set to its number.
   for (size_t i = 0; i < kMaxErrorsPerExtension + kNumExtraErrors; ++i) {
@@ -143,11 +157,48 @@ TEST_F(ErrorConsoleUnitTest, ExcessiveErrorsGetCropped) {
 
   // We should have popped off errors in the order they arrived, so the
   // first stored error should be the 6th reported (zero-based)...
-  ASSERT_EQ(errors.front()->message(),
-            base::UintToString16(kNumExtraErrors));
+  ASSERT_EQ(base::UintToString16(kNumExtraErrors),
+            errors.front()->message());
   // ..and the last stored should be the 105th reported.
-  ASSERT_EQ(errors.back()->message(),
-            base::UintToString16(kMaxErrorsPerExtension + kNumExtraErrors - 1));
+  ASSERT_EQ(base::UintToString16(kMaxErrorsPerExtension + kNumExtraErrors - 1),
+            errors.back()->message());
+}
+
+// Test to ensure that the error console will not add duplicate errors, but will
+// keep the latest version of an error.
+TEST_F(ErrorConsoleUnitTest, DuplicateErrorsAreReplaced) {
+  ASSERT_EQ(0u, error_console_->errors().size());
+
+  const std::string kId = id_util::GenerateId("id");
+  const size_t kNumErrors = 3u;
+
+  // Report three errors.
+  for (size_t i = 0; i < kNumErrors; ++i) {
+    error_console_->ReportError(
+        CreateNewRuntimeError(false, kId, base::UintToString16(i)));
+  }
+
+  // Create an error identical to the second error reported, and save its
+  // location.
+  scoped_ptr<ExtensionError> runtime_error2 =
+      CreateNewRuntimeError(false, kId, base::UintToString16(1u));
+  const ExtensionError* weak_error = runtime_error2.get();
+
+  // Add it to the error console.
+  error_console_->ReportError(runtime_error2.Pass());
+
+  // We should only have three errors stored, since two of the four reported
+  // were identical, and the older should have been replaced.
+  ASSERT_EQ(1u, error_console_->errors().size());
+  const ErrorConsole::ErrorList& errors =
+      error_console_->GetErrorsForExtension(kId);
+  ASSERT_EQ(kNumErrors, errors.size());
+
+  // The more-recently reported error should be in the slot of the error it

[Yoyo Zhou, 2013/08/27 17:28:00]

this comment is obsolete

[Devlin, 2013/08/27 18:25:55]

Dang. Missed one. Done.

+  // replaced (pointer comparison).
+  ASSERT_EQ(weak_error, errors.back());
+  // The error should have two reported occurrences.
+  ASSERT_EQ(2u, errors.back()->occurrences());
 }
 
 }  // namespace extensions