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/device_registration_info_unittest.cc

diff --git a/buffet/device_registration_info_unittest.cc b/buffet/device_registration_info_unittest.cc
index 0deaa6e..f82a39b 100644
--- a/buffet/device_registration_info_unittest.cc
+++ b/buffet/device_registration_info_unittest.cc
@@ -21,12 +21,12 @@
 #include "buffet/states/state_manager.h"
 #include "buffet/storage_impls.h"
 
+namespace buffet {
+
 using chromeos::http::request_header::kAuthorization;
 using chromeos::http::fake::ServerRequest;
 using chromeos::http::fake::ServerResponse;
 
-namespace buffet {
-
 namespace {
 
 namespace test_data {
@@ -313,8 +313,7 @@
   EXPECT_FALSE(DeviceRegistrationInfo::TestHelper::CheckRegistration(
       dev_reg_.get(), &error));
   EXPECT_EQ(1, transport_->GetRequestCount());
-  EXPECT_TRUE(error->HasError(buffet::kErrorDomainOAuth2,
-                              "unable_to_authenticate"));
+  EXPECT_TRUE(error->HasError(kErrorDomainOAuth2, "unable_to_authenticate"));
   EXPECT_EQ(RegistrationStatus::kConnecting, dev_reg_->GetRegistrationStatus());
 }
 
@@ -332,8 +331,7 @@
   EXPECT_FALSE(DeviceRegistrationInfo::TestHelper::CheckRegistration(
       dev_reg_.get(), &error));
   EXPECT_EQ(1, transport_->GetRequestCount());
-  EXPECT_TRUE(error->HasError(buffet::kErrorDomainOAuth2,
-                              "invalid_grant"));
+  EXPECT_TRUE(error->HasError(kErrorDomainOAuth2, "invalid_grant"));
   EXPECT_EQ(RegistrationStatus::kInvalidCredentials,
             dev_reg_->GetRegistrationStatus());
 }
@@ -402,11 +400,12 @@
     base::DictionaryValue* commandDefs = nullptr;
     EXPECT_TRUE(json->GetDictionary("deviceDraft.commandDefs", &commandDefs));
     EXPECT_FALSE(commandDefs->empty());
-    EXPECT_EQ("{'base':{'reboot':{'parameters':{"
-              "'delay':{'minimum':10,'type':'integer'}}}},"
-              "'robot':{'_jump':{'parameters':{"
-              "'_height':{'type':'integer'}}}}}",
-              buffet::unittests::ValueToString(commandDefs));
+    EXPECT_EQ(
+        "{'base':{'reboot':{'parameters':{"
+        "'delay':{'minimum':10,'type':'integer'}}}},"
+        "'robot':{'_jump':{'parameters':{"
+        "'_height':{'type':'integer'}}}}}",
+        unittests::ValueToString(commandDefs));
 
     base::DictionaryValue json_resp;
     json_resp.SetString("id", test_data::kClaimTicketId);
@@ -422,7 +421,7 @@
     response->ReplyJson(chromeos::http::status_code::Ok, &json_resp);
   };
 
-  auto json_base = buffet::unittests::CreateDictionaryValue(R"({
+  auto json_base = unittests::CreateDictionaryValue(R"({
     'base': {
       'reboot': {
         'parameters': {'delay': 'integer'},
@@ -435,7 +434,7 @@
     }
   })");
   EXPECT_TRUE(command_manager_->LoadBaseCommands(*json_base, nullptr));
-  auto json_cmds = buffet::unittests::CreateDictionaryValue(R"({
+  auto json_cmds = unittests::CreateDictionaryValue(R"({
     'base': {
       'reboot': {
         'parameters': {'delay': {'minimum': 10}},
@@ -504,7 +503,7 @@
 
 TEST_F(DeviceRegistrationInfoTest, UpdateCommand) {
   EXPECT_TRUE(dev_reg_->Load());
-  auto json_cmds = buffet::unittests::CreateDictionaryValue(R"({
+  auto json_cmds = unittests::CreateDictionaryValue(R"({
     'robot': {
       '_jump': {
         'parameters': {'_height': 'integer'},
@@ -516,7 +515,7 @@
 
   const std::string command_url = dev_reg_->GetServiceURL("commands/1234");
 
-  auto commands_json = buffet::unittests::CreateValue(R"([{
+  auto commands_json = unittests::CreateValue(R"([{
     'name':'robot._jump',
     'id':'1234',
     'parameters': {'_height': 100}