Renaming instances of "flimflam" with "shill", now that we're only

chromeos/dbus/shill_device_client_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 "base/bind.h"
 #include "base/values.h"
-#include "chromeos/dbus/flimflam_client_unittest_base.h"
-#include "chromeos/dbus/flimflam_device_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_device_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 20 matching lines @@
   ASSERT_TRUE(reader->PopString(&arg1));
   EXPECT_EQ(expected_string1, arg1);
   std::string arg2;
   ASSERT_TRUE(reader->PopString(&arg2));
   EXPECT_EQ(expected_string2, arg2);
   EXPECT_FALSE(reader->HasMoreData());
 }
 
 }  // namespace
 
-class FlimflamDeviceClientTest : public FlimflamClientUnittestBase {
+class ShillDeviceClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamDeviceClientTest()
-      : FlimflamClientUnittestBase(flimflam::kFlimflamDeviceInterface,
+  ShillDeviceClientTest()
+      : ShillClientUnittestBase(flimflam::kFlimflamDeviceInterface,
                                    dbus::ObjectPath(kExampleDevicePath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                                mock_bus_));
     // Run the message loop to run the signal connection result callback.
     message_loop_.RunAllPending();
   }
 
   virtual void TearDown() {
-    FlimflamClientUnittestBase::TearDown();
+    ShillClientUnittestBase::TearDown();
   }
 
  protected:
-  scoped_ptr<FlimflamDeviceClient> client_;
+  scoped_ptr<ShillDeviceClient> client_;
 };
 
-TEST_F(FlimflamDeviceClientTest, PropertyChanged) {
+TEST_F(ShillDeviceClientTest, PropertyChanged) {
   const bool kValue = true;
   // Create a signal.
   dbus::Signal signal(flimflam::kFlimflamDeviceInterface,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kCellularAllowRoamingProperty);
   writer.AppendVariantOfBool(kValue);
 
   // Set expectations.
   const base::FundamentalValue value(kValue);
   client_->SetPropertyChangedHandler(
       dbus::ObjectPath(kExampleDevicePath),
       base::Bind(&ExpectPropertyChanged,
                  flimflam::kCellularAllowRoamingProperty,
                  &value));
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
   // Reset the handler.
   client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleDevicePath));
 }
 
-TEST_F(FlimflamDeviceClientTest, GetProperties) {
+TEST_F(ShillDeviceClientTest, GetProperties) {
   const bool kValue = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(NULL);
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(flimflam::kCellularAllowRoamingProperty);
   entry_writer.AppendVariantOfBool(kValue);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Set expectations.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(flimflam::kCellularAllowRoamingProperty,
                                 base::Value::CreateBooleanValue(kValue));
   PrepareForMethodCall(flimflam::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetProperties(dbus::ObjectPath(kExampleDevicePath),
                          base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillDeviceClientTest, CallGetPropertiesAndBlock) {
   const bool kValue = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(NULL);
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(flimflam::kCellularAllowRoamingProperty);
   entry_writer.AppendVariantOfBool(kValue);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Set expectations.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(flimflam::kCellularAllowRoamingProperty,
                                 base::Value::CreateBooleanValue(kValue));
   PrepareForMethodCall(flimflam::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   scoped_ptr<base::DictionaryValue> result(
       client_->CallGetPropertiesAndBlock(dbus::ObjectPath(kExampleDevicePath)));
   ASSERT_TRUE(result.get());
   EXPECT_TRUE(result->Equals(&value));
 }
 
-TEST_F(FlimflamDeviceClientTest, ProposeScan) {
+TEST_F(ShillDeviceClientTest, ProposeScan) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kProposeScanFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->ProposeScan(dbus::ObjectPath(kExampleDevicePath),
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, SetProperty) {
+TEST_F(ShillDeviceClientTest, SetProperty) {
   const bool kValue = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   const base::FundamentalValue value(kValue);
   PrepareForMethodCall(flimflam::kSetPropertyFunction,
                        base::Bind(&ExpectStringAndValueArguments,
                                   flimflam::kCellularAllowRoamingProperty,
                                   &value),
                        response.get());
   // Call method.
   client_->SetProperty(dbus::ObjectPath(kExampleDevicePath),
                        flimflam::kCellularAllowRoamingProperty,
                        value,
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, ClearProperty) {
+TEST_F(ShillDeviceClientTest, ClearProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kClearPropertyFunction,
                        base::Bind(&ExpectStringArgument,
                                   flimflam::kCellularAllowRoamingProperty),
                        response.get());
   // Call method.
   client_->ClearProperty(dbus::ObjectPath(kExampleDevicePath),
                          flimflam::kCellularAllowRoamingProperty,
                          base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, AddIPConfig) {
+TEST_F(ShillDeviceClientTest, AddIPConfig) {
   const dbus::ObjectPath expected_result("/result/path");
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(expected_result);
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kAddIPConfigFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeDHCP),
                        response.get());
   // Call method.
   client_->AddIPConfig(dbus::ObjectPath(kExampleDevicePath),
                        flimflam::kTypeDHCP,
                        base::Bind(&ExpectObjectPathResult, expected_result));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, CallAddIPConfigAndBlock) {
+TEST_F(ShillDeviceClientTest, CallAddIPConfigAndBlock) {
   const dbus::ObjectPath expected_result("/result/path");
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(expected_result);
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kAddIPConfigFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeDHCP),
                        response.get());
   // Call method.
   const dbus::ObjectPath result = client_->CallAddIPConfigAndBlock(
       dbus::ObjectPath(kExampleDevicePath), flimflam::kTypeDHCP);
   EXPECT_EQ(expected_result, result);
 }
 
-TEST_F(FlimflamDeviceClientTest, RequirePin) {
+TEST_F(ShillDeviceClientTest, RequirePin) {
   const char kPin[] = "123456";
   const bool kRequired = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(flimflam::kRequirePinFunction,
                        base::Bind(&ExpectStringAndBoolArguments,
                                   kPin,
                                   kRequired),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->RequirePin(dbus::ObjectPath(kExampleDevicePath),
                       kPin,
                       kRequired,
                       mock_closure.GetCallback(),
                       mock_error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, EnterPin) {
+TEST_F(ShillDeviceClientTest, EnterPin) {
   const char kPin[] = "123456";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(flimflam::kEnterPinFunction,
                        base::Bind(&ExpectStringArgument,
                                   kPin),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->EnterPin(dbus::ObjectPath(kExampleDevicePath),
                     kPin,
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, UnblockPin) {
+TEST_F(ShillDeviceClientTest, UnblockPin) {
   const char kPuk[] = "987654";
   const char kPin[] = "123456";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(flimflam::kUnblockPinFunction,
                        base::Bind(&ExpectTwoStringArguments, kPuk, kPin),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->UnblockPin(dbus::ObjectPath(kExampleDevicePath),
                       kPuk,
                       kPin,
                       mock_closure.GetCallback(),
                       mock_error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, ChangePin) {
+TEST_F(ShillDeviceClientTest, ChangePin) {
   const char kOldPin[] = "123456";
   const char kNewPin[] = "234567";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(flimflam::kChangePinFunction,
                        base::Bind(&ExpectTwoStringArguments,
                                   kOldPin,
                                   kNewPin),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->ChangePin(dbus::ObjectPath(kExampleDevicePath),
                      kOldPin,
                      kNewPin,
                      mock_closure.GetCallback(),
                      mock_error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, Register) {
+TEST_F(ShillDeviceClientTest, Register) {
   const char kNetworkId[] = "networkid";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
   MockErrorCallback mock_error_callback;
   PrepareForMethodCall(flimflam::kRegisterFunction,
                        base::Bind(&ExpectStringArgument, kNetworkId),
                        response.get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   // Call method.
   client_->Register(dbus::ObjectPath(kExampleDevicePath),
                     kNetworkId,
                     mock_closure.GetCallback(),
                     mock_error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos