Beginnings of the script bubble.

chrome/browser/extensions/component_loader_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 106 matching lines @@
     return test_data_dir.AppendASCII("extensions");
   }
 };
 
 TEST_F(ComponentLoaderTest, ParseManifest) {
   scoped_ptr<DictionaryValue> manifest;
 
   // Test invalid JSON.
   manifest.reset(
       component_loader_.ParseManifest("{ 'test': 3 } invalid"));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   // Test manifests that are valid JSON, but don't have an object literal
   // at the root. ParseManifest() should always return NULL.
 
   manifest.reset(component_loader_.ParseManifest(""));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("[{ \"foo\": 3 }]"));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("\"Test\""));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("42"));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("true"));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("false"));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("null"));
-  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
+  EXPECT_FALSE(manifest.get());
 
   // Test parsing valid JSON.
 
-  int value;
+  int value = 0;
   manifest.reset(component_loader_.ParseManifest(
       "{ \"test\": { \"one\": 1 }, \"two\": 2 }"));
-  ASSERT_NE(manifest.get(), (DictionaryValue*)NULL);
-  ASSERT_TRUE(manifest->GetInteger("test.one", &value));
-  ASSERT_EQ(1, value);
+  ASSERT_TRUE(manifest.get());
+  EXPECT_TRUE(manifest->GetInteger("test.one", &value));
+  EXPECT_EQ(1, value);
   ASSERT_TRUE(manifest->GetInteger("two", &value));
-  ASSERT_EQ(2, value);
+  EXPECT_EQ(2, value);
 
   std::string string_value;
   manifest.reset(component_loader_.ParseManifest(manifest_contents_));
   ASSERT_TRUE(manifest->GetString("background.page", &string_value));
-  ASSERT_EQ("backgroundpage.html", string_value);
+  EXPECT_EQ("backgroundpage.html", string_value);
 }
 
 // Test that the extension isn't loaded if the extension service isn't ready.
 TEST_F(ComponentLoaderTest, AddWhenNotReady) {
-  scoped_refptr<const Extension> extension;
   extension_service_.set_ready(false);
-  extension = component_loader_.Add(manifest_contents_, extension_path_);
-  ASSERT_EQ((Extension*)NULL, extension.get());
-  ASSERT_EQ(0u, extension_service_.extensions()->size());
+  std::string extension_id =
+      component_loader_.Add(manifest_contents_, extension_path_);
+  EXPECT_NE("", extension_id);
+  EXPECT_EQ(0u, extension_service_.extensions()->size());
 }
 
 // Test that it *is* loaded when the extension service *is* ready.
 TEST_F(ComponentLoaderTest, AddWhenReady) {
-  scoped_refptr<const Extension> extension;
   extension_service_.set_ready(true);
-  extension = component_loader_.Add(manifest_contents_, extension_path_);
-  ASSERT_NE((Extension*)NULL, extension.get());
-  ASSERT_EQ(1u, extension_service_.extensions()->size());
+  std::string extension_id =
+      component_loader_.Add(manifest_contents_, extension_path_);
+  EXPECT_NE("", extension_id);
+  EXPECT_EQ(1u, extension_service_.extensions()->size());
+  EXPECT_TRUE(extension_service_.extensions()->GetByID(extension_id));
 }
 
 TEST_F(ComponentLoaderTest, Remove) {
   extension_service_.set_ready(false);
 
   // Removing an extension that was never added should be ok.
   component_loader_.Remove(extension_path_);
-  ASSERT_EQ(0u, extension_service_.extensions()->size());
+  EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // Try adding and removing before LoadAll() is called.
   component_loader_.Add(manifest_contents_, extension_path_);
   component_loader_.Remove(extension_path_);
   component_loader_.LoadAll();
-  ASSERT_EQ(0u, extension_service_.extensions()->size());
+  EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // Load an extension, and check that it's unloaded when Remove() is called.
-  scoped_refptr<const Extension> extension;
   extension_service_.set_ready(true);
-  extension = component_loader_.Add(manifest_contents_, extension_path_);
-  ASSERT_NE((Extension*)NULL, extension.get());
+  std::string extension_id =
+      component_loader_.Add(manifest_contents_, extension_path_);
+  EXPECT_EQ(1u, extension_service_.extensions()->size());
   component_loader_.Remove(extension_path_);
-  ASSERT_EQ(0u, extension_service_.extensions()->size());
+  EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // And after calling LoadAll(), it shouldn't get loaded.
   component_loader_.LoadAll();
-  ASSERT_EQ(0u, extension_service_.extensions()->size());
+  EXPECT_EQ(0u, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, LoadAll) {
   extension_service_.set_ready(false);
 
   // No extensions should be loaded if none were added.
   component_loader_.LoadAll();
-  ASSERT_EQ(0u, extension_service_.extensions()->size());
+  EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // Use LoadAll() to load the default extensions.
   component_loader_.AddDefaultComponentExtensions();
   component_loader_.LoadAll();
   unsigned int default_count = extension_service_.extensions()->size();
 
   // Clear the list of loaded extensions, and reload with one more.
   extension_service_.clear_extensions();
   component_loader_.Add(manifest_contents_, extension_path_);
   component_loader_.LoadAll();
 
-  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
+  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
   component_loader_.AddDefaultComponentExtensions();
   component_loader_.LoadAll();
   unsigned int default_count = extension_service_.extensions()->size();
 
   // Set the pref, and it should get loaded automatically.
   extension_service_.set_ready(true);
   prefs_.SetUserPref(prefs::kEnterpriseWebStoreURL,
                      Value::CreateStringValue("http://www.google.com"));
-  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
+  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
 
   // Now that the pref is set, check if it's added by default.
   extension_service_.set_ready(false);
   extension_service_.clear_extensions();
   component_loader_.ClearAllRegistered();
   component_loader_.AddDefaultComponentExtensions();
   component_loader_.LoadAll();
-  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
+  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
 
   // Number of loaded extensions should be the same after changing the pref.
   prefs_.SetUserPref(prefs::kEnterpriseWebStoreURL,
                      Value::CreateStringValue("http://www.google.de"));
-  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
+  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, AddOrReplace) {
-  ASSERT_EQ(0u, component_loader_.registered_extensions_count());
+  EXPECT_EQ(0u, component_loader_.registered_extensions_count());
   component_loader_.AddDefaultComponentExtensions();
   size_t const default_count = component_loader_.registered_extensions_count();
   FilePath known_extension = GetBasePath()
       .AppendASCII("override_component_extension");
   FilePath unknow_extension = extension_path_;
 
   // Replace a default component extension.
   component_loader_.AddOrReplace(known_extension);
-  ASSERT_EQ(default_count,
+  EXPECT_EQ(default_count,
             component_loader_.registered_extensions_count());
 
   // Add a new component extension.
   component_loader_.AddOrReplace(unknow_extension);
-  ASSERT_EQ(default_count + 1,
+  EXPECT_EQ(default_count + 1,
             component_loader_.registered_extensions_count());
 
   extension_service_.set_ready(true);
   component_loader_.LoadAll();
 
-  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
-  ASSERT_EQ(0u, extension_service_.unloaded_count());
+  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
+  EXPECT_EQ(0u, extension_service_.unloaded_count());
 
   // replace loaded component extension.
   component_loader_.AddOrReplace(known_extension);
-  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
-  ASSERT_EQ(1u, extension_service_.unloaded_count());
+  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
+  EXPECT_EQ(1u, extension_service_.unloaded_count());
 }
 
 }  // namespace extensions