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

chromeos/dbus/shill_manager_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_manager_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_manager_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 70 matching lines @@
       flimflam::kSSIDProperty,
       base::Value::CreateStringValue("testssid"));
   properties->SetWithoutPathExpansion(
       flimflam::kSecurityProperty,
       base::Value::CreateStringValue(flimflam::kSecurityPsk));
   return properties;
 }
 
 }  // namespace
 
-class FlimflamManagerClientTest : public FlimflamClientUnittestBase {
+class ShillManagerClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamManagerClientTest()
-      : FlimflamClientUnittestBase(
+  ShillManagerClientTest()
+      : ShillClientUnittestBase(
           flimflam::kFlimflamManagerInterface,
           dbus::ObjectPath(flimflam::kFlimflamServicePath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillManagerClient::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<FlimflamManagerClient> client_;
+  scoped_ptr<ShillManagerClient> client_;
 };
 
-TEST_F(FlimflamManagerClientTest, PropertyChanged) {
+TEST_F(ShillManagerClientTest, PropertyChanged) {
   // Create a signal.
   base::FundamentalValue kOfflineMode(true);
   dbus::Signal signal(flimflam::kFlimflamManagerInterface,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kOfflineModeProperty);
   dbus::AppendBasicTypeValueData(&writer, kOfflineMode);
 
   // Set expectations.
   client_->SetPropertyChangedHandler(base::Bind(&ExpectPropertyChanged,
                                                 flimflam::kOfflineModeProperty,
                                                 &kOfflineMode));
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
   // Reset the handler.
   client_->ResetPropertyChangedHandler();
 }
 
-TEST_F(FlimflamManagerClientTest, GetProperties) {
+TEST_F(ShillManagerClientTest, GetProperties) {
   // 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::kOfflineModeProperty);
   entry_writer.AppendVariantOfBool(true);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(flimflam::kOfflineModeProperty,
                                 base::Value::CreateBooleanValue(true));
   // Set expectations.
   PrepareForMethodCall(flimflam::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetProperties(base::Bind(&ExpectDictionaryValueResult,
                                     &value));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillManagerClientTest, CallGetPropertiesAndBlock) {
   // 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::kOfflineModeProperty);
   entry_writer.AppendVariantOfBool(true);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(flimflam::kOfflineModeProperty,
                                 base::Value::CreateBooleanValue(true));
   // Set expectations.
   PrepareForMethodCall(flimflam::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   scoped_ptr<base::DictionaryValue> result(
       client_->CallGetPropertiesAndBlock());
   EXPECT_TRUE(value.Equals(result.get()));
 }
 
-TEST_F(FlimflamManagerClientTest, SetProperty) {
+TEST_F(ShillManagerClientTest, SetProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   base::StringValue value("portal list");
   PrepareForMethodCall(flimflam::kSetPropertyFunction,
                        base::Bind(ExpectStringAndValueArguments,
                                   flimflam::kCheckPortalListProperty,
                                   &value),
                        response.get());
   // Call method.
   client_->SetProperty(flimflam::kCheckPortalListProperty,
                        value,
                        base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, RequestScan) {
+TEST_F(ShillManagerClientTest, RequestScan) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(flimflam::kRequestScanFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeWifi),
                        response.get());
   // Call method.
   client_->RequestScan(flimflam::kTypeWifi, base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, EnableTechnology) {
+TEST_F(ShillManagerClientTest, EnableTechnology) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(flimflam::kEnableTechnologyFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeWifi),
                        response.get());
   // Call method.
   client_->EnableTechnology(flimflam::kTypeWifi,
                             base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, DisableTechnology) {
+TEST_F(ShillManagerClientTest, DisableTechnology) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(flimflam::kDisableTechnologyFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeWifi),
                        response.get());
   // Call method.
   client_->DisableTechnology(flimflam::kTypeWifi,
                              base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, ConfigureService) {
+TEST_F(ShillManagerClientTest, ConfigureService) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Create the argument dictionary.
   scoped_ptr<base::DictionaryValue> arg(CreateExampleProperties());
   // Set expectations.
   PrepareForMethodCall(flimflam::kConfigureServiceFunction,
                        base::Bind(&ExpectDictionaryValueArgument, arg.get()),
                        response.get());
   // Call method.
   client_->ConfigureService(*arg, base::Bind(&ExpectNoResultValue));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, GetService) {
+TEST_F(ShillManagerClientTest, GetService) {
   // Create response.
   const dbus::ObjectPath object_path("/");
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(object_path);
   // Create the argument dictionary.
   scoped_ptr<base::DictionaryValue> arg(CreateExampleProperties());
   // Set expectations.
   PrepareForMethodCall(flimflam::kGetServiceFunction,
                        base::Bind(&ExpectDictionaryValueArgument, arg.get()),
                        response.get());
   // Call method.
   client_->GetService(*arg, base::Bind(&ExpectObjectPathResult, object_path));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos