3 files changed, 11 insertions, 19 deletions
diff --git a/src/components/dbus/test/test_dbus_adapter.cc b/src/components/dbus/test/test_dbus_adapter.cc
index c5922dfdcb..74a6de1aa9 100644
--- a/src/components/dbus/test/test_dbus_adapter.cc
+++ b/src/components/dbus/test/test_dbus_adapter.cc
@@ -42,20 +42,18 @@ namespace test {
 namespace components {
 namespace dbus {
 
-class DBusAdapterTest : public ::testing::Test {
-};
+class DBusAdapterTest : public ::testing::Test {};
 
 TEST_F(DBusAdapterTest, Initialization) {
   const std::string kSdlServiceName = "test.ford.sdl.core";
   const std::string kSdlObjectPath = "/";
   const std::string kHmiServiceName = "test.ford.sdl.hmi";
   const std::string kHmiObjectPath = "/";
-  ::dbus::DBusAdapter adapter(kSdlServiceName, kSdlObjectPath,
-                            kHmiServiceName, kHmiObjectPath);
+  ::dbus::DBusAdapter adapter(
+      kSdlServiceName, kSdlObjectPath, kHmiServiceName, kHmiObjectPath);
   EXPECT_TRUE(adapter.Init());
 }
 
 }  // namespace dbus
 }  // namespace components
 }  // namespace test
-
diff --git a/src/components/dbus/test/test_dbus_message_controller.cc b/src/components/dbus/test/test_dbus_message_controller.cc
index f0056db4c9..5c5d4e69d5 100644
--- a/src/components/dbus/test/test_dbus_message_controller.cc
+++ b/src/components/dbus/test/test_dbus_message_controller.cc
@@ -66,13 +66,9 @@ class DBusMessageControllerTest : public ::testing::Test {
   MockDBusMessageController* controller_;
   MockSubscriber* subscriber_;
 
-  static void SetUpTestCase() {
+  static void SetUpTestCase() {}
 
-  }
-
-  static void TearDownTestCase() {
-
-  }
+  static void TearDownTestCase() {}
 
   virtual void SetUp() {
     const std::string kService = "sdl.core.test_api";
@@ -83,7 +79,7 @@ class DBusMessageControllerTest : public ::testing::Test {
     ASSERT_TRUE(subscriber_->Start());
   }
 
-  virtual void TearDown() {
+  void TearDown() OVERRIDE {
     delete controller_;
     delete subscriber_;
   }
@@ -94,7 +90,8 @@ class DBusMessageControllerTest : public ::testing::Test {
     timespec elapsed;
     clock_gettime(CLOCK_REALTIME, &elapsed);
     elapsed.tv_sec += seconds;
-    return pthread_cond_timedwait(&test_cond, &test_mutex, &elapsed) != ETIMEDOUT;
+    return pthread_cond_timedwait(&test_cond, &test_mutex, &elapsed) !=
+           ETIMEDOUT;
   }
 };
 
@@ -110,12 +107,10 @@ TEST_F(DBusMessageControllerTest, Receive) {
 
 TEST_F(DBusMessageControllerTest, DISABLED_Send) {
   const std::string kText = "Test message for signal DBus";
-//  EXPECT_CALL(*subscriber_, Receive(kText)).Times(1);
+  //  EXPECT_CALL(*subscriber_, Receive(kText)).Times(1);
   controller_->Send(kText);
 }
 
 }  // namespace hmi_message_handler
 }  // namespace components
 }  // namespace test
-
-
diff --git a/src/components/dbus/test/test_schema.cc b/src/components/dbus/test/test_schema.cc
index ecbd4b1bfd..37831279b9 100644
--- a/src/components/dbus/test/test_schema.cc
+++ b/src/components/dbus/test/test_schema.cc
@@ -103,7 +103,8 @@ TEST_F(DBusSchemaTest, GetListArg) {
 
   const MessageId kIdWrong = static_cast<const MessageId>(test_negative_value);
   const MessageName kNameWrong("TestInterface", "TestMessage");
-  const MessageType kTypeWrong = static_cast<const MessageType>(test_negative_value);
+  const MessageType kTypeWrong =
+      static_cast<const MessageType>(test_negative_value);
   const ListArgs kExpListWrong;
   argsName = schema_->getListArgs(kNameWrong, kTypeWrong);
   EXPECT_EQ(kExpListWrong, argsName);
@@ -115,5 +116,3 @@ TEST_F(DBusSchemaTest, GetListArg) {
 }  // namespace dbus
 }  // namespace components
 }  // namespace test
-
-