commit 32005de69ecb92f5507aef03bf363d925d7a682f
author Vitaly Buka <vitalybuka@chromium.org> Fri May 01 12:33:31 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Mon May 04 06:13:38 2015 +0000
tree 05af3e0843ba5d5b722ebf9b4c68ff1e09fabb03
parent b6b49e590e2f88032ea50a1ecad423f90868501d

buffet: Wrap buffet unit tests into buffet namespace

Just to make referencing shorter by removing buffet:: prefix.

BUG=None
TEST=FEATURE=test emerge-gizmo buffet

Change-Id: Ie2cb5645911481c2eb92f80f4847b0faaaea532d
Reviewed-on: https://chromium-review.googlesource.com/268787
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>

buffet/commands/command_manager_unittest.cc

diff --git a/buffet/commands/command_manager_unittest.cc b/buffet/commands/command_manager_unittest.cc
index 57e0d06..5b45cee 100644
--- a/buffet/commands/command_manager_unittest.cc
+++ b/buffet/commands/command_manager_unittest.cc
@@ -12,7 +12,9 @@
 
 #include "buffet/commands/unittest_utils.h"
 
-using buffet::unittests::CreateDictionaryValue;
+namespace buffet {
+
+using unittests::CreateDictionaryValue;
 
 namespace {
 
@@ -69,18 +71,18 @@
 }  // namespace
 
 TEST(CommandManager, Empty) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   EXPECT_TRUE(manager.GetCommandDictionary().IsEmpty());
 }
 
 TEST(CommandManager, LoadBaseCommandsJSON) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   auto json = CreateDictionaryValue(kTestBaseCommands);
   EXPECT_TRUE(manager.LoadBaseCommands(*json, nullptr));
 }
 
 TEST(CommandManager, LoadBaseCommandsFile) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   auto json = CreateDictionaryValue(kTestBaseCommands);
   base::FilePath temp_file = SaveJsonToTempFile(*json);
   EXPECT_TRUE(manager.LoadBaseCommands(temp_file, nullptr));
@@ -88,13 +90,13 @@
 }
 
 TEST(CommandManager, LoadCommandsJSON) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   auto json = CreateDictionaryValue(kTestVendorCommands);
   EXPECT_TRUE(manager.LoadCommands(*json, "category", nullptr));
 }
 
 TEST(CommandManager, LoadCommandsFile) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   // Load some standard command definitions first.
   auto json = CreateDictionaryValue(R"({
     'base': {
@@ -133,7 +135,7 @@
 }
 
 TEST(CommandManager, ShouldLoadStandardAndTestDefinitions) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   base::ScopedTempDir temp;
   CHECK(temp.CreateUniqueTempDir());
   base::FilePath base_path{temp.path().Append("base_defs")};
@@ -159,7 +161,7 @@
 }
 
 TEST(CommandManager, UpdateCommandVisibility) {
-  buffet::CommandManager manager;
+  CommandManager manager;
   int update_count = 0;
   auto on_command_change = [&update_count]() { update_count++; };
   auto token = manager.AddOnCommandDefChanged(base::Bind(on_command_change));
@@ -185,10 +187,9 @@
   })");
   ASSERT_TRUE(manager.LoadCommands(*json, "test", nullptr));
   EXPECT_EQ(1, update_count);
-  const buffet::CommandDictionary& dict = manager.GetCommandDictionary();
+  const CommandDictionary& dict = manager.GetCommandDictionary();
   EXPECT_TRUE(manager.SetCommandVisibility(
-      {"foo._baz"},
-      buffet::CommandDefinition::Visibility::GetLocal(), nullptr));
+      {"foo._baz"}, CommandDefinition::Visibility::GetLocal(), nullptr));
   EXPECT_EQ(2, update_count);
   EXPECT_EQ("local", dict.FindCommand("foo._baz")->GetVisibility().ToString());
   EXPECT_EQ("all", dict.FindCommand("foo._bar")->GetVisibility().ToString());
@@ -197,8 +198,8 @@
   chromeos::ErrorPtr error;
   ASSERT_FALSE(manager.SetCommandVisibility(
       {"foo._baz", "foo._bar", "test.cmd"},
-      buffet::CommandDefinition::Visibility::GetLocal(), &error));
-  EXPECT_EQ(buffet::errors::commands::kInvalidCommandName, error->GetCode());
+      CommandDefinition::Visibility::GetLocal(), &error));
+  EXPECT_EQ(errors::commands::kInvalidCommandName, error->GetCode());
   EXPECT_EQ("Command 'test.cmd' is unknown", error->GetMessage());
   // The visibility state of commands shouldn't have changed.
   EXPECT_EQ(2, update_count);
@@ -207,11 +208,12 @@
   EXPECT_EQ("none", dict.FindCommand("bar._quux")->GetVisibility().ToString());
 
   EXPECT_TRUE(manager.SetCommandVisibility(
-      {"foo._baz", "bar._quux"},
-      buffet::CommandDefinition::Visibility::GetCloud(), nullptr));
+      {"foo._baz", "bar._quux"}, CommandDefinition::Visibility::GetCloud(),
+      nullptr));
   EXPECT_EQ(3, update_count);
   EXPECT_EQ("cloud", dict.FindCommand("foo._baz")->GetVisibility().ToString());
   EXPECT_EQ("all", dict.FindCommand("foo._bar")->GetVisibility().ToString());
   EXPECT_EQ("cloud", dict.FindCommand("bar._quux")->GetVisibility().ToString());
 }
 
+}  // namespace buffet