Moved mocks to correct dir

Related tasks APPLINK-30588 APPLINK-30974

12 files changed, 9 insertions, 65 deletions

diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc
index c971d497b3..6efef83052 100644
--- a/src/components/application_manager/test/usage_statistics_test.cc
+++ b/src/components/application_manager/test/usage_statistics_test.cc
@@ -35,7 +35,7 @@
 #include "gmock/gmock.h"
 #include "smart_objects/enum_schema_item.h"
 #include "policy/usage_statistics/mock_statistics_manager.h"
-#include "mock_app_stopwatch.h"
+#include "policy/usage_statistics/mock_app_stopwatch.h"
 #include "utils/make_shared.h"
 #include "utils/shared_ptr.h"
 
diff --git a/src/components/policy/test/include/mock_app_stopwatch.h b/src/components/policy/test/include/mock_app_stopwatch.h
deleted file mode 100644
index 3c876a3ace..0000000000
--- a/src/components/policy/test/include/mock_app_stopwatch.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SRC_COMPONENTS_POLICY_TEST_INCLUDE_MOCK_APP_STOPWATCH_H_
-#define SRC_COMPONENTS_POLICY_TEST_INCLUDE_MOCK_APP_STOPWATCH_H_
-
-#include "gmock/gmock.h"
-#include "policy/usage_statistics/app_stopwatch.h"
-#include "policy/usage_statistics/statistics_manager.h"
-
-namespace test {
-namespace components {
-namespace usage_statistics_test {
-
-class MockAppStopwatch : public usage_statistics::AppStopwatch {
- public:
-  MOCK_METHOD1(Start, void(usage_statistics::AppStopwatchId stopwatch_type));
-  MOCK_METHOD1(Switch, void(usage_statistics::AppStopwatchId stopwatch_type));
-  MOCK_METHOD0(WriteTime, void());
-};
-
-}  // namespace usage_statistics_test
-}  // namespace components
-}  // namespace test
-
-#endif  // SRC_COMPONENTS_POLICY_TEST_INCLUDE_MOCK_APP_STOPWATCH_H_
diff --git a/src/components/policy/test/include/driver_dbms.h b/src/components/policy/test/include/policy/driver_dbms.h
index b92895a5f1..b92895a5f1 100644
--- a/src/components/policy/test/include/driver_dbms.h
+++ b/src/components/policy/test/include/policy/driver_dbms.h
diff --git a/src/components/policy/test/include/mock_cache_manager.h b/src/components/policy/test/include/policy/mock_cache_manager.h
index 907e3f7711..907e3f7711 100644
--- a/src/components/policy/test/include/mock_cache_manager.h
+++ b/src/components/policy/test/include/policy/mock_cache_manager.h
diff --git a/src/components/policy/test/include/mock_policy_listener.h b/src/components/policy/test/include/policy/mock_policy_listener.h
index b160c43fac..b160c43fac 100644
--- a/src/components/policy/test/include/mock_policy_listener.h
+++ b/src/components/policy/test/include/policy/mock_policy_listener.h
diff --git a/src/components/policy/test/include/mock_policy_manager.h b/src/components/policy/test/include/policy/mock_policy_manager.h
index b49f297fc4..b49f297fc4 100644
--- a/src/components/policy/test/include/mock_policy_manager.h
+++ b/src/components/policy/test/include/policy/mock_policy_manager.h
diff --git a/src/components/policy/test/include/mock_pt_ext_representation.h b/src/components/policy/test/include/policy/mock_pt_ext_representation.h
index fd7a3585f1..fd7a3585f1 100644
--- a/src/components/policy/test/include/mock_pt_ext_representation.h
+++ b/src/components/policy/test/include/policy/mock_pt_ext_representation.h
diff --git a/src/components/policy/test/include/mock_pt_representation.h b/src/components/policy/test/include/policy/mock_pt_representation.h
index 6f323963c0..6f323963c0 100644
--- a/src/components/policy/test/include/mock_pt_representation.h
+++ b/src/components/policy/test/include/policy/mock_pt_representation.h
diff --git a/src/components/policy/test/include/mock_update_status_manager.h b/src/components/policy/test/include/policy/mock_update_status_manager.h
index 6b7c705b1c..6b7c705b1c 100644
--- a/src/components/policy/test/include/mock_update_status_manager.h
+++ b/src/components/policy/test/include/policy/mock_update_status_manager.h
diff --git a/src/components/policy/test/policy_manager_impl_test.cc b/src/components/policy/test/policy_manager_impl_test.cc
index d1833cfdad..9ec9131c05 100644
--- a/src/components/policy/test/policy_manager_impl_test.cc
+++ b/src/components/policy/test/policy_manager_impl_test.cc
@@ -39,14 +39,14 @@
 #include "json/writer.h"
 #include "gtest/gtest.h"
 
-#include "policy/policy_manager_impl.h"
 #include "config_profile/profile.h"
+#include "policy/policy_manager_impl.h"
 #include "policy/policy_table/enums.h"
 #include "policy/policy_table/types.h"
 #include "policy/mock_policy_settings.h"
-#include "mock_policy_listener.h"
-#include "mock_cache_manager.h"
-#include "mock_update_status_manager.h"
+#include "policy/mock_policy_listener.h"
+#include "policy/mock_cache_manager.h"
+#include "policy/mock_update_status_manager.h"
 
 #include "utils/macro.h"
 #include "utils/file_system.h"
diff --git a/src/components/policy/test/sql_pt_representation_test.cc b/src/components/policy/test/sql_pt_representation_test.cc
index b5ff9b5ec9..ce59d37d1c 100644
--- a/src/components/policy/test/sql_pt_representation_test.cc
+++ b/src/components/policy/test/sql_pt_representation_test.cc
@@ -38,20 +38,18 @@
 #include <sys/stat.h>
 
 #include "gtest/gtest.h"
-#include "policy/test/include/driver_dbms.h"
+#include "policy/driver_dbms.h"
 #include "policy/sql_pt_representation.h"
 #include "policy/policy_types.h"
 #include "policy/mock_policy_settings.h"
+#include "policy/policy_table/types.h"
+#include "policy/policy_table/enums.h"
 #include "json/writer.h"
 #include "json/reader.h"
 #include "rpc_base/rpc_base.h"
-#include "policy/mock_policy_settings.h"
 #include "utils/shared_ptr.h"
 #include "utils/make_shared.h"
 #include "utils/file_system.h"
-#include "policy/policy_table/types.h"
-#include "policy/policy_table/enums.h"
-#include "rpc_base/rpc_base.h"
 #include "utils/sqlite_wrapper/sql_database.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
diff --git a/src/components/policy/test/update_status_manager_test.cc b/src/components/policy/test/update_status_manager_test.cc
index eb27b360d1..ce18adc67a 100644
--- a/src/components/policy/test/update_status_manager_test.cc
+++ b/src/components/policy/test/update_status_manager_test.cc
@@ -31,7 +31,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "mock_policy_listener.h"
+#include "policy/mock_policy_listener.h"
 #include "policy/policy_manager_impl.h"
 #include "policy/update_status_manager.h"