Move files between shared/test/unit_test and /common (fixtures, helpers, mocks)

unit_test/fixtures/mock_aub_center_fixture.h -> common/fixtures unit_test/helpers/raii_hw_helper.h -> common/helpers unit_test/helpers/static_size3.h -> common/helpers unit_test/helpers/ult_limits.h -> common/helpers unit_test/memory_manager/mock_prefetch_manager.h -> common/memory_manager common/mocks/mock_aub_stream.h -> unit_test/mocks common/mocks/mock_csr_simulated_common_hw.h -> unit_test/mocks common/mocks/mock_direct_submission_diagnostic_collector.h -> unit_test/mocks common/mocks/mock_lrca_helper.h -> unit_test/mocks common/mocks/mock_tbx_stream.h -> unit_test/mocks common/mocks/linux/mock_os_context_linux.h -> unit_test/mocks/linux common/mocks/windows/mock_wddm_direct_submission.h -> unit_test/mocks/windows Related-To: NEO-6524 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2026-01-08 22:12:59 +08:00 · 2022-08-10 17:00:50 +00:00
parent 0ecc08337e
commit aed890a219
66 changed files with 82 additions and 82 deletions
--- a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp
@@ -8,8 +8,8 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/memory_manager/mock_prefetch_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/memory_manager/mock_prefetch_manager.h"

 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h"
--- a/opencl/test/unit_test/api/cl_api_tests.h
+++ b/opencl/test/unit_test/api/cl_api_tests.h
@@ -10,9 +10,9 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/ult_limits.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/ult_limits.h"

 #include "opencl/source/api/api.h"
 #include "opencl/source/command_queue/command_queue.h"
--- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp
+++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp
@@ -16,6 +16,7 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/fixtures/memory_management_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
@@ -27,7 +28,6 @@
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/event.h"
--- a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp
+++ b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp
@@ -7,10 +7,10 @@

 #include "shared/source/memory_manager/surface.h"
 #include "shared/test/common/fixtures/device_fixture.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/mock_hw_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp
@@ -14,6 +14,7 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/mocks/mock_csr.h"
@@ -21,7 +22,6 @@
 #include "shared/test/common/mocks/mock_hw_helper.h"
 #include "shared/test/common/mocks/mock_submissions_aggregator.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
@@ -9,6 +9,7 @@
 #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/mocks/mock_direct_submission_hw.h"
@@ -17,7 +18,6 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"

 #include "opencl/source/event/user_event.h"
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
@@ -18,6 +18,7 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/utilities/tag_allocator.h"
 #include "shared/test/common/fixtures/device_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
@@ -27,7 +28,6 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/platform/platform.h"
--- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp
+++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp
@@ -9,13 +9,13 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/execution_environment_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/create_command_stream.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 using namespace NEO;

--- a/opencl/test/unit_test/device/device_caps_tests.cpp
+++ b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -14,13 +14,13 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_driver_info.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/test/unit_test/fixtures/device_info_fixture.h"
--- a/opencl/test/unit_test/device/device_tests.cpp
+++ b/opencl/test/unit_test/device/device_tests.cpp
@@ -12,6 +12,7 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
@@ -24,7 +25,6 @@
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
--- a/opencl/test/unit_test/device/get_device_info_tests.cpp
+++ b/opencl/test/unit_test/device/get_device_info_tests.cpp
@@ -7,10 +7,10 @@

 #include "shared/source/helpers/get_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/mocks/mock_driver_info.h"
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/cl_device/cl_device_info_map.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
--- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp
+++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp
@@ -6,9 +6,9 @@
 */

 #include "shared/source/gen11/hw_cmds.h"
+#include "shared/test/common/helpers/static_size3.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/static_size3.h"

 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
--- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp
+++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/test/common/fixtures/memory_management_fixture.h"
+#include "shared/test/common/helpers/static_size3.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/static_size3.h"

 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
--- a/opencl/test/unit_test/kernel/cache_flush_tests.inl
+++ b/opencl/test/unit_test/kernel/cache_flush_tests.inl
@@ -14,9 +14,9 @@
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/cmd_buffer_validator.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/static_size3.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/static_size3.h"

 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
--- a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl
+++ b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl
@@ -10,9 +10,9 @@
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/test/common/helpers/cmd_buffer_validator.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/static_size3.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/static_size3.h"

 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"
--- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/compiler_interface/oclc_extensions.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/cl_device/cl_device_info_map.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
--- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
@@ -22,6 +22,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/helpers/execution_environment_helper.h"
+#include "shared/test/common/helpers/raii_hw_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/mocks/mock_csr.h"
@@ -36,7 +37,6 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/raii_hw_helper.h"

 #include "opencl/source/event/event.h"
 #include "opencl/source/helpers/dispatch_info.h"
--- a/opencl/test/unit_test/mocks/mock_program.cpp
+++ b/opencl/test/unit_test/mocks/mock_program.cpp
@@ -12,10 +12,10 @@
 #include "shared/source/helpers/hash.h"
 #include "shared/source/program/program_info_from_patchtokens.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/ult_limits.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
 #include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/unit_test/helpers/ult_limits.h"

 #include "opencl/source/context/context.h"
 #include "opencl/source/program/create.inl"
--- a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl
+++ b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl
@@ -6,8 +6,8 @@
 */

 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/ult_limits.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/ult_limits.h"

 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/tracing/tracing_api.h"
--- a/opencl/test/unit_test/platform/platform_tests.cpp
+++ b/opencl/test/unit_test/platform/platform_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/device_factory.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
@@ -20,7 +21,6 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/mocks/mock_source_level_debugger.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/sharings/sharing_factory.h"
--- a/shared/test/common/fixtures/CMakeLists.txt
+++ b/shared/test/common/fixtures/CMakeLists.txt
@@ -7,6 +7,7 @@
 target_sources(neo_libult_common PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream_fixture.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center_fixture.h
 )

 add_subdirectories()
--- a/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h
+++ b/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,7 @@
 #pragma once

 #include "shared/test/common/fixtures/device_fixture.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"

 namespace NEO {
 struct AubCommandStreamReceiverFixture : public DeviceFixture, MockAubCenterFixture {
--- a/shared/test/unit_test/fixtures/mock_aub_center_fixture.h
+++ b/shared/test/unit_test/fixtures/mock_aub_center_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/common/helpers/CMakeLists.txt
+++ b/shared/test/common/helpers/CMakeLists.txt
@@ -8,6 +8,9 @@ target_sources(neo_libult_common PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator.h
               ${CMAKE_CURRENT_SOURCE_DIR}/gtest_helpers.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/raii_hw_helper.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/static_size3.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ult_limits.h
 )

 add_subdirectories()
--- a/shared/test/unit_test/helpers/raii_hw_helper.h
+++ b/shared/test/unit_test/helpers/raii_hw_helper.h
--- a/shared/test/unit_test/helpers/static_size3.h
+++ b/shared/test/unit_test/helpers/static_size3.h
--- a/shared/test/unit_test/helpers/ult_limits.h
+++ b/shared/test/unit_test/helpers/ult_limits.h
--- a/shared/test/unit_test/memory_manager/mock_prefetch_manager.h
+++ b/shared/test/unit_test/memory_manager/mock_prefetch_manager.h
--- a/shared/test/common/mocks/CMakeLists.txt
+++ b/shared/test/common/mocks/CMakeLists.txt
@@ -21,7 +21,6 @@ set(NEO_CORE_tests_mocks
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_csr.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_file_stream.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_stream.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_subcapture_manager.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_bindless_heaps_helper.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h
@@ -35,7 +34,6 @@ set(NEO_CORE_tests_mocks
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr_simulated_common_hw.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_debugger.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.h
@@ -43,7 +41,6 @@ set(NEO_CORE_tests_mocks
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_direct_submission_diagnostic_collector.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_direct_submission_hw.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_driver_model.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_elf.h
@@ -68,7 +65,6 @@ set(NEO_CORE_tests_mocks
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_l0_debugger.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_logical_state_helper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_lrca_helper.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_operations_handler.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_migration_sync_data.h
@@ -77,14 +73,12 @@ set(NEO_CORE_tests_mocks
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_library.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_library.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_physical_address_allocator.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_sip.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_sip.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_source_level_debugger.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_submissions_aggregator.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_svm_manager.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_container.h
    ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_packet.h
    ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp
@@ -102,7 +96,6 @@ if(WIN32)
       ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mock_helpers.h
       ${CMAKE_CURRENT_SOURCE_DIR}/windows/mock_gdi_interface.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/windows/mock_gdi_interface.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/windows/mock_wddm_direct_submission.h
       ${CMAKE_CURRENT_SOURCE_DIR}/windows/mock_wddm_eudebug.h
  )
 else()
@@ -113,7 +106,6 @@ else()
       ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.h
       ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_wrappers.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_wrappers.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_os_context_linux.h
       ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_os_time_linux.h
  )
 endif()
--- a/shared/test/common/mocks/mock_device.h
+++ b/shared/test/common/mocks/mock_device.h
@@ -11,9 +11,9 @@
 #include "shared/source/device/root_device.h"
 #include "shared/source/device/sub_device.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 namespace NEO {
 class CommandStreamReceiver;
--- a/shared/test/common/mocks/mock_execution_environment.h
+++ b/shared/test/common/mocks/mock_execution_environment.h
@@ -9,7 +9,7 @@

 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/hw_helper.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"

 namespace NEO {
 extern bool useMockGmm;
--- a/shared/test/unit_test/aub/aub_helper_tests.cpp
+++ b/shared/test/unit_test/aub/aub_helper_tests.cpp
@@ -14,8 +14,8 @@
 #include "shared/source/tbx/tbx_proto.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/mocks/mock_lrca_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/unit_test/mocks/mock_lrca_helper.h"

 using namespace NEO;

--- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp
+++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/libult/ult_aub_command_stream_receiver.h"
@@ -22,7 +23,6 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 using namespace NEO;

--- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
+++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
@@ -12,6 +12,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/mocks/mock_aub_center.h"
@@ -26,7 +27,6 @@
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 #include "gtest/gtest.h"
 #include "third_party/aub_stream/headers/aubstream.h"
--- a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp
+++ b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp
@@ -10,9 +10,9 @@
 #include "shared/source/helpers/hardware_context_controller.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/mocks/mock_aub_stream.h"
-#include "shared/test/common/mocks/mock_csr_simulated_common_hw.h"
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/unit_test/mocks/mock_aub_stream.h"
+#include "shared/test/unit_test/mocks/mock_csr_simulated_common_hw.h"

 using XeHPAndLaterMockSimulatedCsrHwTests = Test<DeviceFixture>;

--- a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp
+++ b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp
@@ -16,11 +16,11 @@
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/mocks/mock_aub_manager.h"
-#include "shared/test/common/mocks/mock_csr_simulated_common_hw.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/unit_test/mocks/mock_csr_simulated_common_hw.h"

 #include <array>
 #include <memory>
--- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp
+++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp
@@ -15,6 +15,7 @@
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/test/common/fixtures/device_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/fixtures/tbx_command_stream_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
@@ -26,7 +27,6 @@
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/mocks/mock_tbx_csr.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 #include <cstdint>

--- a/shared/test/unit_test/command_stream/tbx_stream_tests.cpp
+++ b/shared/test/unit_test/command_stream/tbx_stream_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,7 @@
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/tbx/tbx_proto.h"
 #include "shared/test/common/mocks/mock_tbx_sockets.h"
-#include "shared/test/common/mocks/mock_tbx_stream.h"
+#include "shared/test/unit_test/mocks/mock_tbx_stream.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
+++ b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
@@ -18,11 +18,11 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_csr.h"
-#include "shared/test/common/mocks/mock_direct_submission_diagnostic_collector.h"
 #include "shared/test/common/mocks/mock_direct_submission_hw.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/fixtures/direct_submission_fixture.h"
+#include "shared/test/unit_test/mocks/mock_direct_submission_diagnostic_collector.h"

 using DirectSubmissionTest = Test<DirectSubmissionFixture>;

--- a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp
+++ b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp
@@ -19,11 +19,11 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_csr.h"
-#include "shared/test/common/mocks/mock_direct_submission_diagnostic_collector.h"
 #include "shared/test/common/mocks/mock_direct_submission_hw.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/fixtures/direct_submission_fixture.h"
+#include "shared/test/unit_test/mocks/mock_direct_submission_diagnostic_collector.h"

 namespace CpuIntrinsicsTests {
 extern std::atomic<uint32_t> sfenceCounter;
--- a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
+++ b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
@@ -17,8 +17,8 @@
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
-#include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
+#include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h"

 using namespace NEO;

--- a/shared/test/unit_test/fixtures/CMakeLists.txt
+++ b/shared/test/unit_test/fixtures/CMakeLists.txt
@@ -12,7 +12,6 @@ target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/front_window_fixture.h
               ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling_fixture.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling_fixture.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center_fixture.h
               ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.h
               ${CMAKE_CURRENT_SOURCE_DIR}/product_config_fixture.h
--- a/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl
+++ b/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl
@@ -8,10 +8,10 @@
 #include "shared/source/command_stream/command_stream_receiver_simulated_hw.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/mocks/mock_aub_stream.h"
-#include "shared/test/common/mocks/mock_csr_simulated_common_hw.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
+#include "shared/test/unit_test/mocks/mock_aub_stream.h"
+#include "shared/test/unit_test/mocks/mock_csr_simulated_common_hw.h"

 using namespace NEO;

--- a/shared/test/unit_test/helpers/CMakeLists.txt
+++ b/shared/test/unit_test/helpers/CMakeLists.txt
@@ -34,16 +34,13 @@ target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/memory_management_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/raii_hw_helper.h
               ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/static_size3.h
               ${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/test_debug_variables.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/ult_limits.h
 )

 if(MSVC OR COMPILER_SUPPORTS_SSE42)
--- a/shared/test/unit_test/helpers/linux/CMakeLists.txt
+++ b/shared/test/unit_test/helpers/linux/CMakeLists.txt
@@ -5,9 +5,7 @@
 #

 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_linux_tests.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_linux_tests.cpp)

  add_subdirectories()
 endif()
--- a/shared/test/unit_test/helpers/windows/CMakeLists.txt
+++ b/shared/test/unit_test/helpers/windows/CMakeLists.txt
@@ -5,9 +5,7 @@
 #

 if(WIN32)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_windows_tests.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_windows_tests.cpp)

  add_subdirectories()
 endif()
--- a/shared/test/unit_test/image/CMakeLists.txt
+++ b/shared/test/unit_test/image/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_fixture.h
               ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests.cpp
--- a/shared/test/unit_test/indirect_heap/CMakeLists.txt
+++ b/shared/test/unit_test/indirect_heap/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_tests.cpp
 )
--- a/shared/test/unit_test/kernel/CMakeLists.txt
+++ b/shared/test/unit_test/kernel/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/implicit_args_helper_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/kernel_arg_descriptor_tests.cpp
--- a/shared/test/unit_test/memory_manager/CMakeLists.txt
+++ b/shared/test/unit_test/memory_manager/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/alignment_selector_tests.cpp
--- a/shared/test/unit_test/memory_manager/page_table_tests.cpp
+++ b/shared/test/unit_test/memory_manager/page_table_tests.cpp
@@ -10,8 +10,8 @@
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/memory_manager/page_table.h"
 #include "shared/source/memory_manager/page_table.inl"
-#include "shared/test/common/mocks/mock_physical_address_allocator.h"
 #include "shared/test/common/test_macros/test.h"
+#include "shared/test/unit_test/mocks/mock_physical_address_allocator.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/memory_manager/physical_address_allocator_hw_tests.cpp
+++ b/shared/test/unit_test/memory_manager/physical_address_allocator_hw_tests.cpp
@@ -7,8 +7,8 @@

 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/memory_manager/physical_address_allocator.h"
-#include "shared/test/common/mocks/mock_physical_address_allocator.h"
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/unit_test/mocks/mock_physical_address_allocator.h"

 using namespace NEO;

--- a/shared/test/unit_test/memory_manager/physical_address_allocator_tests.cpp
+++ b/shared/test/unit_test/memory_manager/physical_address_allocator_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,7 +7,7 @@

 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/memory_manager/page_table.h"
-#include "shared/test/common/mocks/mock_physical_address_allocator.h"
+#include "shared/test/unit_test/mocks/mock_physical_address_allocator.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/mocks/CMakeLists.txt
+++ b/shared/test/unit_test/mocks/CMakeLists.txt
@@ -6,6 +6,18 @@

 target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_stream.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr_simulated_common_hw.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_direct_submission_diagnostic_collector.h
               ${CMAKE_CURRENT_SOURCE_DIR}/mock_dispatch_kernel_encoder_interface.h
               ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_lrca_helper.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_physical_address_allocator.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
 )
+
+if(WIN32)
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/windows/mock_wddm_direct_submission.h)
+else()
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_os_context_linux.h)
+endif()
--- a/shared/test/unit_test/mocks/linux/mock_os_context_linux.h
+++ b/shared/test/unit_test/mocks/linux/mock_os_context_linux.h
--- a/shared/test/unit_test/mocks/mock_aub_stream.h
+++ b/shared/test/unit_test/mocks/mock_aub_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/mocks/mock_csr_simulated_common_hw.h
+++ b/shared/test/unit_test/mocks/mock_csr_simulated_common_hw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/mocks/mock_direct_submission_diagnostic_collector.h
+++ b/shared/test/unit_test/mocks/mock_direct_submission_diagnostic_collector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/mocks/mock_lrca_helper.h
+++ b/shared/test/unit_test/mocks/mock_lrca_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/mocks/mock_physical_address_allocator.h
+++ b/shared/test/unit_test/mocks/mock_physical_address_allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/mocks/mock_tbx_stream.h
+++ b/shared/test/unit_test/mocks/mock_tbx_stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h
+++ b/shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h
--- a/shared/test/unit_test/os_interface/linux/device_command_stream_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/device_command_stream_tests.cpp
@@ -13,11 +13,11 @@
 #include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/execution_environment_helper.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp
@@ -19,9 +19,9 @@
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/common/mocks/linux/mock_os_context_linux.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
+#include "shared/test/unit_test/mocks/linux/mock_os_context_linux.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
@@ -26,6 +26,7 @@
 #include "shared/source/os_interface/windows/wddm_residency_controller.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/fixtures/memory_management_fixture.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
@@ -38,11 +39,10 @@
 #include "shared/test/common/mocks/mock_submissions_aggregator.h"
 #include "shared/test/common/mocks/mock_wddm_interface23.h"
 #include "shared/test/common/mocks/windows/mock_gdi_interface.h"
-#include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h"
 #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
+#include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h"

 #include "hw_cmds.h"

--- a/shared/test/unit_test/os_interface/windows/wddm_command_stream_l0_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/wddm_command_stream_l0_tests.cpp
@@ -32,10 +32,10 @@
 #include "shared/test/common/mocks/mock_submissions_aggregator.h"
 #include "shared/test/common/mocks/mock_wddm_interface23.h"
 #include "shared/test/common/mocks/windows/mock_gdi_interface.h"
-#include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h"
 #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h"

 namespace NEO {
 extern ApiSpecificConfig::ApiType apiTypeForUlts;