Submission for C++ Readability

device/bluetooth/bluetooth_chromeos_unittest.cc

 // Copyright 2013 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/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
@@ skipping 121 matching lines @@
   int request_passkey_count_;
   int display_pincode_count_;
   int display_passkey_count_;
   int keys_entered_count_;
   int confirm_passkey_count_;
   int authorize_pairing_count_;
   uint32 last_passkey_;
   uint32 last_entered_;
   std::string last_pincode_;
 
   private:

[omoikane, 2015/05/22 23:55:28]

These lines should be shifted 1 space left.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Class_Format

[Marie Janssen, 2015/06/18 21:08:35]

Done.

    // Some tests use a message loop since background processing is simulated;
    // break out of those loops.
    void QuitMessageLoop() {
      if (base::MessageLoop::current() &&
          base::MessageLoop::current()->is_running())
        base::MessageLoop::current()->Quit();
    }
 };
 
 class BluetoothChromeOSTest : public testing::Test {
@@ skipping 1490 matching lines @@
   EXPECT_EQ(0, error_callback_count_);
   callback_count_ = 0;
 
   ASSERT_TRUE(adapter_->IsPowered());
   ASSERT_TRUE(adapter_->IsDiscovering());
   ASSERT_EQ((size_t)1, discovery_sessions_.size());
   ASSERT_TRUE(discovery_sessions_[0]->IsActive());
   EXPECT_EQ(1, observer.discovering_changed_count());
   observer.Reset();
 
   auto nullInstance = scoped_ptr<BluetoothDiscoveryFilter>();

[omoikane, 2015/05/22 23:55:28]

This variable should be renamed to follow naming convention for local variables.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Variable_Names

[Marie Janssen, 2015/06/18 21:08:35]

Done.

   nullInstance.reset();
   ASSERT_EQ(discovery_sessions_[0]->GetDiscoveryFilter(), nullInstance.get());
 
   auto filter = fake_bluetooth_adapter_client_->GetDiscoveryFilter();
   EXPECT_EQ(nullptr, filter);
 
   BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
       BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
   df->SetRSSI(-60);
   df->AddUUID(BluetoothUUID("1000"));
@@ skipping 902 matching lines @@
   // One call for DisplayPasskey() and one for KeysEntered().
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.display_passkey_count_);
   EXPECT_EQ(123456U, pairing_delegate.last_passkey_);
   EXPECT_EQ(1, pairing_delegate.keys_entered_count_);
   EXPECT_EQ(0U, pairing_delegate.last_entered_);
 
   EXPECT_TRUE(device->IsConnecting());
 
   // One call to KeysEntered() for each key, including [enter].
   for(int i = 1; i <= 7; ++i) {

[omoikane, 2015/05/22 23:55:28]

Need extra space after "for".

[Marie Janssen, 2015/06/18 21:08:35]

Done.

     message_loop_.Run();
 
     EXPECT_EQ(2 + i, pairing_delegate.call_count_);
     EXPECT_EQ(1 + i, pairing_delegate.keys_entered_count_);
     EXPECT_EQ(static_cast<uint32_t>(i), pairing_delegate.last_entered_);
   }
 
   message_loop_.Run();
 
   // 8 KeysEntered notifications (0 to 7, inclusive) and one aditional call for
@@ skipping 1447 matching lines @@
   adapter_->Shutdown();
   adapter_chrome_os->OnStopDiscoveryError(GetErrorCallback(), "", "");
 
   // 1 error reported to RemoveDiscoverySession because of OnStopDiscoveryError,
   // and kNumberOfDiscoverySessions errors queued with AddDiscoverySession.
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1 + kNumberOfDiscoverySessions, error_callback_count_);
 }
 
 }  // namespace chromeos
+