From 5ffeac44c55c7166ab0d1ee1dede60836b0f588a Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Fri, 12 Aug 2022 14:24:49 +0000 Subject: [PATCH] Correct shared fixture methods name to meet clang-tidy requirements Signed-off-by: Mateusz Jablonski --- ...te_command_queue_with_properties_tests.cpp | 4 +- .../command_queue/command_queue_tests.cpp | 20 +++++----- .../command_queue/oom_buffer_tests.cpp | 4 +- ...nd_stream_receiver_with_aub_dump_tests.cpp | 10 ++--- .../context/context_negative_tests.cpp | 2 +- .../unit_test/gmm_helper/gmm_helper_tests.cpp | 6 +-- opencl/test/unit_test/gtpin/gtpin_tests.cpp | 18 ++++----- opencl/test/unit_test/kernel/kernel_tests.cpp | 4 +- .../test/unit_test/mem_obj/buffer_tests.cpp | 6 +-- .../mem_obj/destructor_callback_tests.cpp | 10 ++--- opencl/test/unit_test/mem_obj/image_tests.cpp | 4 +- .../mem_obj/linux/buffer_linux_tests.cpp | 6 +-- .../mem_obj/windows/buffer_windows_tests.cpp | 6 +-- .../memory_manager/memory_manager_tests.cpp | 2 +- .../linux/cl_drm_memory_manager_tests.cpp | 6 +-- .../linux/drm_va_sharing_tests.cpp | 2 +- .../windows/file_logger_win_tests.cpp | 2 +- .../os_interface/windows/wddm23_tests.cpp | 4 +- .../windows/wddm_memory_manager_tests.cpp | 4 +- .../windows/wddm_memory_manager_tests.h | 16 ++++---- .../sharings/va/va_sharing_enable_tests.cpp | 4 +- .../aub_command_stream_receiver_fixture.h | 8 ++-- .../common/fixtures/gmm_callbacks_fixture.h | 4 +- ...y_allocator_multi_device_fixture_linux.cpp | 4 +- .../fixtures/memory_allocator_fixture.h | 8 ++-- .../memory_allocator_multi_device_fixture.h | 16 ++++---- .../fixtures/memory_management_fixture.cpp | 6 +-- .../fixtures/memory_management_fixture.h | 8 ++-- .../common/fixtures/mock_aub_center_fixture.h | 4 +- ...mock_execution_environment_gmm_fixture.cpp | 8 ++-- .../mock_execution_environment_gmm_fixture.h | 4 +- .../fixtures/tbx_command_stream_fixture.cpp | 6 +-- .../fixtures/tbx_command_stream_fixture.h | 4 +- ...allocator_multi_device_fixture_windows.cpp | 4 +- .../linux/drm_memory_manager_fixture.cpp | 38 +++++++++---------- .../linux/drm_memory_manager_fixture.h | 20 +++++----- .../drm_memory_manager_prelim_fixtures.h | 10 ++--- .../os_interface/windows/gdi_dll_fixture.h | 4 +- .../os_interface/windows/wddm_fixture.h | 34 ++++++++--------- .../aub_command_stream_receiver_1_tests.cpp | 2 +- .../aub_command_stream_receiver_2_tests.cpp | 2 +- .../aub_command_stream_receiver_3_tests.cpp | 2 +- .../command_stream/aub_file_stream_tests.cpp | 2 +- .../tbx_command_stream_tests.cpp | 16 ++++---- .../windows/gmm_callbacks_tests_gen12lp.cpp | 2 +- .../gen12lp/windows/wddm_tests_gen12lp.cpp | 4 +- .../test/unit_test/gmm_helper/gmm_tests.cpp | 2 +- .../unit_test/helpers/app_resource_tests.cpp | 4 +- .../helpers/memory_management_tests.cpp | 4 +- .../internal_allocation_storage_tests.cpp | 9 +++-- ...m_memory_manager_localmem_prelim_tests.cpp | 4 +- ...memory_manager_localmem_upstream_tests.cpp | 14 +++---- .../linux/drm_memory_manager_tests.cpp | 16 ++++---- .../os_interface/os_library_tests.cpp | 2 +- .../windows/device_command_stream_tests.cpp | 18 ++++----- .../windows/wddm_preemption_tests.cpp | 6 +-- .../windows/wddm_shared_allocations_test.cpp | 12 +++--- .../windows/wddm_special_heap_test.cpp | 6 +-- .../os_interface/windows/wddm_tests.cpp | 14 +++---- .../utilities/tag_allocator_tests.cpp | 4 +- 60 files changed, 239 insertions(+), 236 deletions(-) diff --git a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp index 646cd19c3e..f060d1670b 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp @@ -55,13 +55,13 @@ struct clCreateCommandQueueWithPropertiesApi : public ApiFixture<>, void SetUp() override { platformsImpl->clear(); - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); ApiFixture::SetUp(); } void TearDown() override { ApiFixture::TearDown(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index ae18cb0f25..6370c98400 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -58,15 +58,15 @@ struct CommandQueueMemoryDevice : public MemoryManagementFixture, public ClDeviceFixture { - void SetUp() override { - MemoryManagementFixture::SetUp(); + void setUp() { + MemoryManagementFixture::setUp(); ClDeviceFixture::SetUp(); } - void TearDown() override { + void tearDown() { ClDeviceFixture::TearDown(); platformsImpl->clear(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } }; @@ -83,7 +83,7 @@ struct CommandQueueTest } void SetUp() override { - CommandQueueMemoryDevice::SetUp(); + CommandQueueMemoryDevice::setUp(); properties = GetParam(); cl_device_id device = pClDevice; @@ -94,7 +94,7 @@ struct CommandQueueTest void TearDown() override { CommandQueueFixture::TearDown(); ContextFixture::TearDown(); - CommandQueueMemoryDevice::TearDown(); + CommandQueueMemoryDevice::tearDown(); } cl_command_queue_properties properties; @@ -386,13 +386,13 @@ TEST(CommandQueue, givenCmdQueueBlockedByAbortedVirtualEventWhenUnblockingThenUp struct CommandQueueCommandStreamTest : public CommandQueueMemoryDevice, public ::testing::Test { void SetUp() override { - CommandQueueMemoryDevice::SetUp(); + CommandQueueMemoryDevice::setUp(); context.reset(new MockContext(pClDevice)); } void TearDown() override { context.reset(); - CommandQueueMemoryDevice::TearDown(); + CommandQueueMemoryDevice::tearDown(); } std::unique_ptr context; }; @@ -584,13 +584,13 @@ HWTEST_F(CommandQueueCommandStreamTest, givenMultiDispatchInfoWithSingleKernelWi struct CommandQueueIndirectHeapTest : public CommandQueueMemoryDevice, public ::testing::TestWithParam { void SetUp() override { - CommandQueueMemoryDevice::SetUp(); + CommandQueueMemoryDevice::setUp(); context.reset(new MockContext(pClDevice)); } void TearDown() override { context.reset(); - CommandQueueMemoryDevice::TearDown(); + CommandQueueMemoryDevice::tearDown(); } std::unique_ptr context; }; diff --git a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp index b837473e56..df0e13ecae 100644 --- a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp @@ -46,7 +46,7 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture, void SetUp() override { MemoryManagement::breakOnAllocationEvent = 77; - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); ClDeviceFixture::SetUp(); context = new MockContext(pClDevice); BufferDefaults::context = context; @@ -84,7 +84,7 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture, SimpleArgKernelFixture::TearDown(); CommandQueueFixture::TearDown(); ClDeviceFixture::TearDown(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } MockContext *context; diff --git 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 index f0ab78ad1d..077d804021 100644 --- 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 @@ -141,7 +141,7 @@ struct MyMockCsrWithAubDump : CommandStreamReceiverWithAUBDump { struct CommandStreamReceiverWithAubDumpTest : public ::testing::TestWithParam, MockAubCenterFixture, DeviceFixture { void SetUp() override { DeviceFixture::setUp(); - MockAubCenterFixture::SetUp(); + MockAubCenterFixture::setUp(); setMockAubCenter(pDevice->getRootDeviceEnvironmentRef()); executionEnvironment = pDevice->getExecutionEnvironment(); executionEnvironment->initializeMemoryManager(); @@ -161,7 +161,7 @@ struct CommandStreamReceiverWithAubDumpTest : public ::testing::TestWithParam, DeviceFixture { +struct CommandStreamReceiverWithAubDumpSimpleTest : Test, DeviceFixture { void SetUp() override { DeviceFixture::setUp(); - MockAubCenterFixture::SetUp(); + MockAubCenterFixture::setUp(); setMockAubCenter(pDevice->getRootDeviceEnvironmentRef()); } void TearDown() override { - MockAubCenterFixture::TearDown(); + MockAubCenterFixture::tearDown(); DeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/context/context_negative_tests.cpp b/opencl/test/unit_test/context/context_negative_tests.cpp index 9f999707be..c4259f7065 100644 --- a/opencl/test/unit_test/context/context_negative_tests.cpp +++ b/opencl/test/unit_test/context/context_negative_tests.cpp @@ -21,7 +21,7 @@ using namespace NEO; //////////////////////////////////////////////////////////////////////////////// -typedef TestLegacy ContextFailureInjection; +typedef Test ContextFailureInjection; TEST_F(ContextFailureInjection, GivenFailedAllocationInjectionWhenCreatingContextThenOutOfHostMemoryErrorIsReturned) { auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 7e684acfd2..fcaece1d52 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -35,7 +35,7 @@ #include "GL/glext.h" #include "igfxfmid.h" -using MockExecutionEnvironmentGmmFixtureTest = TestLegacy; +using MockExecutionEnvironmentGmmFixtureTest = Test; using namespace ::testing; @@ -48,7 +48,7 @@ extern bool copyInputArgs; struct GmmTests : public MockExecutionEnvironmentGmmFixtureTest { void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); + MockExecutionEnvironmentGmmFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); localPlatformDevice = rootDeviceEnvironment->getMutableHardwareInfo(); } @@ -1409,7 +1409,7 @@ struct GmmLocalMemoryTests : public ::testing::Test, MockExecutionEnvironmentGmm localPlatformDevice.featureTable.flags.ftrLocalMemory = true; } void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); + MockExecutionEnvironmentGmmFixture::setUp(); executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(&localPlatformDevice); executionEnvironment->rootDeviceEnvironments[0]->initGmm(); } diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 00d575ffea..03cc51215d 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -161,14 +161,14 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { using ContextFixture::SetUp; public: - void SetUp() override { + void setUp() { DebugManager.flags.GTPinAllocateBufferInSharedMemory.set(false); setUpImpl(); } void setUpImpl() { platformsImpl->clear(); - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); constructPlatform(); pPlatform = platform(); auto executionEnvironment = pPlatform->peekExecutionEnvironment(); @@ -200,10 +200,10 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { kernelOffset = 0; } - void TearDown() override { + void tearDown() { ContextFixture::TearDown(); platformsImpl->clear(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); NEO::isGTPinInitialized = false; } @@ -218,7 +218,7 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { DebugManagerStateRestore restore; }; -typedef TestLegacy GTPinTests; +typedef Test GTPinTests; TEST_F(GTPinTests, givenInvalidArgumentsThenGTPinInitFails) { bool isInitialized = false; @@ -2391,18 +2391,18 @@ HWTEST_F(GTPinTests, givenGtPinInitializedWhenSubmittingKernelCommandThenFlushed class GTPinFixtureWithLocalMemory : public GTPinFixture { public: - void SetUp() override { + void setUp() { DebugManager.flags.EnableLocalMemory.set(true); DebugManager.flags.GTPinAllocateBufferInSharedMemory.set(true); GTPinFixture::setUpImpl(); } - void TearDown() override { - GTPinFixture::TearDown(); + void tearDown() { + GTPinFixture::tearDown(); } DebugManagerStateRestore restore; }; -using GTPinTestsWithLocalMemory = TestLegacy; +using GTPinTestsWithLocalMemory = Test; TEST_F(GTPinTestsWithLocalMemory, whenPlatformHasNoSvmSupportThenGtPinBufferCantBeAllocatedInSharedMemory) { DebugManager.flags.GTPinAllocateBufferInSharedMemory.set(-1); diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 3f23d8f121..4c5314f156 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -666,9 +666,9 @@ TEST_F(KernelPrivateSurfaceTest, WhenPrivateSurfaceAllocationFailsThenOutOfResou delete kernel; }; auto f = new MemoryManagementFixture(); - f->SetUp(); + f->setUp(); f->injectFailures(method); - f->TearDown(); + f->tearDown(); delete f; } diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 20f8418bf9..a35760f65f 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -999,13 +999,13 @@ struct ValidHostPtr typedef BufferTest BaseClass; using BufferTest::SetUp; - using MemoryManagementFixture::SetUp; + using MemoryManagementFixture::setUp; ValidHostPtr() { } void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); BaseClass::SetUp(); ASSERT_NE(nullptr, pDevice); @@ -1014,7 +1014,7 @@ struct ValidHostPtr void TearDown() override { delete buffer; BaseClass::TearDown(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } Buffer *createBuffer() { diff --git a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp index 120d217eb8..6e7353ec36 100644 --- a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp +++ b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp @@ -20,22 +20,22 @@ class DestructorCallbackFixture : public MemoryManagementFixture { DestructorCallbackFixture() { } - void SetUp() override { - MemoryManagementFixture::SetUp(); + void setUp() { + MemoryManagementFixture::setUp(); BufferDefaults::context = new MockContext; } - void TearDown() override { + void tearDown() { delete BufferDefaults::context; platformsImpl->clear(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } protected: cl_int retVal = CL_SUCCESS; }; -typedef TestLegacy DestructorCallbackTest; +typedef Test DestructorCallbackTest; static std::vector calls(32); void CL_CALLBACK callBack1(cl_mem memObj, void *userData) { diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index b803221eba..90fb94cab7 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -715,7 +715,7 @@ struct CreateImageHostPtr } void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); BaseClass::SetUp(); } @@ -723,7 +723,7 @@ struct CreateImageHostPtr delete image; BaseClass::TearDown(); platformsImpl->clear(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } Image *createImage(cl_int &retVal) { diff --git a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp index 192b44a39e..65e1d9ccb8 100644 --- a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp +++ b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp @@ -80,13 +80,13 @@ struct ValidExportHostPtr typedef ExportBufferTests BaseClass; using ExportBufferTests::SetUp; - using MemoryManagementFixture::SetUp; + using MemoryManagementFixture::setUp; ValidExportHostPtr() { } void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); BaseClass::SetUp(); ASSERT_NE(nullptr, pDevice); @@ -95,7 +95,7 @@ struct ValidExportHostPtr void TearDown() override { delete buffer; BaseClass::TearDown(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } cl_int retVal = CL_INVALID_VALUE; diff --git a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp index f7d54f8dfd..b0af61cd8b 100644 --- a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp +++ b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp @@ -71,13 +71,13 @@ struct ValidExportHostPtr typedef ExportBufferTests BaseClass; using ExportBufferTests::SetUp; - using MemoryManagementFixture::SetUp; + using MemoryManagementFixture::setUp; ValidExportHostPtr() { } void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); BaseClass::SetUp(); ASSERT_NE(nullptr, pDevice); @@ -86,7 +86,7 @@ struct ValidExportHostPtr void TearDown() override { delete buffer; BaseClass::TearDown(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } Buffer *createBuffer() { diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index 510a0acfed..bab8eb35e9 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -58,7 +58,7 @@ using namespace NEO; -typedef TestLegacy MemoryAllocatorTest; +typedef Test MemoryAllocatorTest; TEST(MemoryManagerTest, givenDebugVariableWhenCreatingMemoryManagerThenSetSupportForMultiStorageResources) { DebugManagerStateRestore restore; diff --git a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp index 266c58775a..65b748a23c 100644 --- a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp @@ -46,14 +46,14 @@ using namespace NEO; -using DrmMemoryManagerTest = TestLegacy; +using DrmMemoryManagerTest = Test; struct ClDrmMemoryManagerTest : public DrmMemoryManagerTest { void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); executionEnvironment = MockClDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); - DrmMemoryManagerFixture::SetUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), false); + DrmMemoryManagerFixture::setUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), false); pClDevice = new MockClDevice{device}; // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) device->incRefInternal(); } diff --git a/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp index dba576be40..b72665ae9e 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp @@ -17,7 +17,7 @@ namespace NEO { -using DrmVaSharingTest = TestLegacy; +using DrmVaSharingTest = Test; TEST_F(DrmVaSharingTest, givenDrmMemoryManagerWhenSharedVaSurfaceIsImportedWithDrmPrimeFdToHandleThenDrmPrimeFdCanBeClosed) { mock->ioctl_expected.total = -1; diff --git a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index 5eb31c5a0c..4d861e2aeb 100644 --- a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp @@ -16,7 +16,7 @@ using namespace NEO; -using FileLoggerTests = TestLegacy; +using FileLoggerTests = Test; TEST_F(FileLoggerTests, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { std::string testFile = "testfile"; diff --git a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp index a40d189ef3..46c3b13feb 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -27,7 +27,7 @@ using namespace NEO; struct Wddm23TestsWithoutWddmInit : public ::testing::Test, GdiDllFixture { void SetUp() override { - GdiDllFixture::SetUp(); + GdiDllFixture::setUp(); executionEnvironment = platform()->peekExecutionEnvironment(); wddm = static_cast(Wddm::createWddm(nullptr, *executionEnvironment->rootDeviceEnvironments[0].get())); @@ -51,7 +51,7 @@ struct Wddm23TestsWithoutWddmInit : public ::testing::Test, GdiDllFixture { } void TearDown() override { - GdiDllFixture::TearDown(); + GdiDllFixture::tearDown(); } std::unique_ptr osContext; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index 8ca629664d..bd6a4cbc11 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp @@ -43,8 +43,8 @@ using namespace NEO; using namespace ::testing; -void WddmMemoryManagerFixture::SetUp() { - GdiDllFixture::SetUp(); +void WddmMemoryManagerFixture::setUp() { + GdiDllFixture::setUp(); executionEnvironment = platform()->peekExecutionEnvironment(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[rootDeviceIndex].get(); diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index 6eee128ee9..710fb8d1c0 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -32,10 +32,10 @@ using namespace ::testing; class WddmMemoryManagerFixture : public GdiDllFixture { public: - void SetUp() override; + void setUp(); - void TearDown() override { - GdiDllFixture::TearDown(); + void tearDown() { + GdiDllFixture::tearDown(); } ExecutionEnvironment *executionEnvironment; @@ -45,7 +45,7 @@ class WddmMemoryManagerFixture : public GdiDllFixture { const uint32_t rootDeviceIndex = 0u; }; -typedef ::TestLegacy WddmMemoryManagerTest; +typedef ::Test WddmMemoryManagerTest; class MockWddmMemoryManagerFixture { public: @@ -141,16 +141,16 @@ class BufferWithWddmMemory : public ::testing::Test, public WddmMemoryManagerFixture { public: protected: - void SetUp() { - WddmMemoryManagerFixture::SetUp(); + void SetUp() override { + WddmMemoryManagerFixture::setUp(); tmp = context.getMemoryManager(); context.memoryManager = memoryManager.get(); flags = 0; } - void TearDown() { + void TearDown() override { context.memoryManager = tmp; - WddmMemoryManagerFixture::TearDown(); + WddmMemoryManagerFixture::tearDown(); } MemoryManager *tmp; diff --git a/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp index 672acb26d2..9c8568945b 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp @@ -34,14 +34,14 @@ class VaSharingEnablerTests : public MemoryManagementFixture, public ::testing::Test { public: void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); factory.reset(new VaSharingBuilderFactory()); ASSERT_NE(nullptr, factory.get()); } void TearDown() override { factory.reset(nullptr); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } std::unique_ptr factory; }; diff --git a/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h b/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h index 991bf5f6bb..ab807f8e2d 100644 --- a/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h +++ b/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h @@ -12,13 +12,13 @@ namespace NEO { struct AubCommandStreamReceiverFixture : public DeviceFixture, MockAubCenterFixture { - void SetUp() { + void setUp() { DeviceFixture::setUp(); - MockAubCenterFixture::SetUp(); + MockAubCenterFixture::setUp(); setMockAubCenter(*pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]); } - void TearDown() { - MockAubCenterFixture::TearDown(); + void tearDown() { + MockAubCenterFixture::tearDown(); DeviceFixture::tearDown(); } }; diff --git a/shared/test/common/fixtures/gmm_callbacks_fixture.h b/shared/test/common/fixtures/gmm_callbacks_fixture.h index 4f689cf194..a6a88b5f70 100644 --- a/shared/test/common/fixtures/gmm_callbacks_fixture.h +++ b/shared/test/common/fixtures/gmm_callbacks_fixture.h @@ -13,12 +13,12 @@ using namespace NEO; struct GmmCallbacksFixture { - void SetUp() { + void setUp() { executionEnvironment = getExecutionEnvironmentImpl(hwInfo, 1); executionEnvironment->incRefInternal(); } - void TearDown() { + void tearDown() { executionEnvironment->decRefInternal(); } diff --git a/shared/test/common/fixtures/linux/memory_allocator_multi_device_fixture_linux.cpp b/shared/test/common/fixtures/linux/memory_allocator_multi_device_fixture_linux.cpp index 22e3a55a00..e6760a1fe2 100644 --- a/shared/test/common/fixtures/linux/memory_allocator_multi_device_fixture_linux.cpp +++ b/shared/test/common/fixtures/linux/memory_allocator_multi_device_fixture_linux.cpp @@ -11,13 +11,13 @@ using namespace NEO; -void MemoryAllocatorMultiDeviceSystemSpecificFixture::SetUp(ExecutionEnvironment &executionEnvironment) { +void MemoryAllocatorMultiDeviceSystemSpecificFixture::setUp(ExecutionEnvironment &executionEnvironment) { auto memoryManager = static_cast(executionEnvironment.memoryManager.get()); auto bufferObject = new (std::nothrow) BufferObject(&memoryManager->getDrm(0u), 3, 0, 10, MemoryManager::maxOsContextCount); memoryManager->pushSharedBufferObject(bufferObject); } -void MemoryAllocatorMultiDeviceSystemSpecificFixture::TearDown(ExecutionEnvironment &executionEnvironment) { +void MemoryAllocatorMultiDeviceSystemSpecificFixture::tearDown(ExecutionEnvironment &executionEnvironment) { auto memoryManager = static_cast(executionEnvironment.memoryManager.get()); auto bufferObject = memoryManager->sharingBufferObjects.back(); memoryManager->eraseSharedBufferObject(bufferObject); diff --git a/shared/test/common/fixtures/memory_allocator_fixture.h b/shared/test/common/fixtures/memory_allocator_fixture.h index b6c18627a7..2fb4c75448 100644 --- a/shared/test/common/fixtures/memory_allocator_fixture.h +++ b/shared/test/common/fixtures/memory_allocator_fixture.h @@ -20,8 +20,8 @@ using namespace NEO; class MemoryAllocatorFixture : public MemoryManagementFixture { public: - void SetUp() override { - MemoryManagementFixture::SetUp(); + void setUp() { + MemoryManagementFixture::setUp(); executionEnvironment = new ExecutionEnvironment(); executionEnvironment->prepareRootDeviceEnvironments(1); executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get()); @@ -38,9 +38,9 @@ class MemoryAllocatorFixture : public MemoryManagementFixture { csr->setupContext(*osContext); } - void TearDown() override { + void tearDown() { device.reset(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } protected: diff --git a/shared/test/common/fixtures/memory_allocator_multi_device_fixture.h b/shared/test/common/fixtures/memory_allocator_multi_device_fixture.h index 606edcfe98..8a15a618da 100644 --- a/shared/test/common/fixtures/memory_allocator_multi_device_fixture.h +++ b/shared/test/common/fixtures/memory_allocator_multi_device_fixture.h @@ -20,8 +20,8 @@ using namespace NEO; class MemoryAllocatorMultiDeviceSystemSpecificFixture { public: - void SetUp(ExecutionEnvironment &executionEnvironment); // NOLINT(readability-identifier-naming) - void TearDown(ExecutionEnvironment &executionEnvironment); // NOLINT(readability-identifier-naming) + void setUp(ExecutionEnvironment &executionEnvironment); + void tearDown(ExecutionEnvironment &executionEnvironment); std::unique_ptr gmm; }; @@ -30,7 +30,7 @@ template class MemoryAllocatorMultiDeviceFixture : public MemoryManagementFixture, public MemoryAllocatorMultiDeviceSystemSpecificFixture, public ::testing::TestWithParam { public: void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); isOsAgnosticMemoryManager = GetParam(); DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices); @@ -43,13 +43,13 @@ class MemoryAllocatorMultiDeviceFixture : public MemoryManagementFixture, public memoryManager = executionEnvironment->memoryManager.get(); if (!isOsAgnosticMemoryManager) { - MemoryAllocatorMultiDeviceSystemSpecificFixture::SetUp(*executionEnvironment); + MemoryAllocatorMultiDeviceSystemSpecificFixture::setUp(*executionEnvironment); } } void TearDown() override { if (!isOsAgnosticMemoryManager) { - MemoryAllocatorMultiDeviceSystemSpecificFixture::TearDown(*executionEnvironment); + MemoryAllocatorMultiDeviceSystemSpecificFixture::tearDown(*executionEnvironment); } } @@ -67,7 +67,7 @@ template class MemoryAllocatorMultiDeviceAndMultiTileFixture : public MemoryManagementFixture, public MemoryAllocatorMultiDeviceSystemSpecificFixture, public ::testing::TestWithParam { public: void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); isOsAgnosticMemoryManager = GetParam(); DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices); @@ -81,13 +81,13 @@ class MemoryAllocatorMultiDeviceAndMultiTileFixture : public MemoryManagementFix memoryManager = executionEnvironment->memoryManager.get(); if (!isOsAgnosticMemoryManager) { - MemoryAllocatorMultiDeviceSystemSpecificFixture::SetUp(*executionEnvironment); + MemoryAllocatorMultiDeviceSystemSpecificFixture::setUp(*executionEnvironment); } } void TearDown() override { if (!isOsAgnosticMemoryManager) { - MemoryAllocatorMultiDeviceSystemSpecificFixture::TearDown(*executionEnvironment); + MemoryAllocatorMultiDeviceSystemSpecificFixture::tearDown(*executionEnvironment); } } diff --git a/shared/test/common/fixtures/memory_management_fixture.cpp b/shared/test/common/fixtures/memory_management_fixture.cpp index 484f8f4a37..803df4c14d 100644 --- a/shared/test/common/fixtures/memory_management_fixture.cpp +++ b/shared/test/common/fixtures/memory_management_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,7 +30,7 @@ extern const char *frontEndDllName; extern const char *igcDllName; } // namespace Os -void MemoryManagementFixture::SetUp() { +void MemoryManagementFixture::setUp() { EXPECT_EQ(static_cast(-1), MemoryManagement::failingAllocation); MemoryManagement::indexAllocation = 0; MemoryManagement::indexDeallocation = 0; @@ -39,7 +39,7 @@ void MemoryManagementFixture::SetUp() { MemoryManagement::logTraces = MemoryManagement::captureCallStacks; } -void MemoryManagementFixture::TearDown() { +void MemoryManagementFixture::tearDown() { clearFailingAllocation(); checkForLeaks(); MemoryManagement::logTraces = false; diff --git a/shared/test/common/fixtures/memory_management_fixture.h b/shared/test/common/fixtures/memory_management_fixture.h index 1cf0b6e751..6ca5a17b25 100644 --- a/shared/test/common/fixtures/memory_management_fixture.h +++ b/shared/test/common/fixtures/memory_management_fixture.h @@ -19,18 +19,18 @@ struct MemoryManagementFixture { virtual ~MemoryManagementFixture() { MemoryManagement::detailedAllocationLoggingActive = false; }; // Typical Fixture methods - virtual void SetUp(void); // NOLINT(readability-identifier-naming) - virtual void TearDown(void); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); // Helper methods void setFailingAllocation(size_t allocation); - void clearFailingAllocation(void); + void clearFailingAllocation(); ::testing::AssertionResult assertLeak( const char *leakExpr, size_t leakIndex); - void checkForLeaks(void); + void checkForLeaks(); typedef std::function InjectedFunction; void injectFailures(InjectedFunction &method, uint32_t maxIndex = 0); diff --git a/shared/test/common/fixtures/mock_aub_center_fixture.h b/shared/test/common/fixtures/mock_aub_center_fixture.h index 2c4d2ad84d..f5dd7e0fd7 100644 --- a/shared/test/common/fixtures/mock_aub_center_fixture.h +++ b/shared/test/common/fixtures/mock_aub_center_fixture.h @@ -19,9 +19,9 @@ struct MockAubCenterFixture { MockAubCenterFixture() = default; MockAubCenterFixture(CommandStreamReceiverType commandStreamReceiverType) : commandStreamReceiverType(commandStreamReceiverType){}; - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } static void setMockAubCenter(RootDeviceEnvironment &rootDeviceEnvironment) { diff --git a/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.cpp b/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.cpp index 0f5dcd9b9e..1f2b9a986c 100644 --- a/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.cpp +++ b/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,12 +10,12 @@ #include "shared/test/common/mocks/mock_execution_environment.h" namespace NEO { -void MockExecutionEnvironmentGmmFixture::SetUp() { +void MockExecutionEnvironmentGmmFixture::setUp() { executionEnvironment = std::make_unique(); executionEnvironment->rootDeviceEnvironments[0]->initGmm(); executionEnvironment->incRefInternal(); } -void MockExecutionEnvironmentGmmFixture::TearDown() {} +void MockExecutionEnvironmentGmmFixture::tearDown() {} GmmHelper *MockExecutionEnvironmentGmmFixture::getGmmHelper() { return executionEnvironment->rootDeviceEnvironments[0]->getGmmHelper(); @@ -24,4 +24,4 @@ GmmHelper *MockExecutionEnvironmentGmmFixture::getGmmHelper() { GmmClientContext *MockExecutionEnvironmentGmmFixture::getGmmClientContext() { return executionEnvironment->rootDeviceEnvironments[0]->getGmmClientContext(); } -} // namespace NEO \ No newline at end of file +} // namespace NEO diff --git a/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h b/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h index 00963edfd7..f21f642639 100644 --- a/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h +++ b/shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h @@ -17,8 +17,8 @@ class GmmClientContext; class MockExecutionEnvironmentGmmFixture { protected: - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); std::unique_ptr executionEnvironment; diff --git a/shared/test/common/fixtures/tbx_command_stream_fixture.cpp b/shared/test/common/fixtures/tbx_command_stream_fixture.cpp index cf38f06b46..fd0fe0be82 100644 --- a/shared/test/common/fixtures/tbx_command_stream_fixture.cpp +++ b/shared/test/common/fixtures/tbx_command_stream_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ namespace NEO { -void TbxCommandStreamFixture::SetUp(MockDevice *pDevice) { +void TbxCommandStreamFixture::setUp(MockDevice *pDevice) { // Create our TBX command stream receiver based on HW type pCommandStreamReceiver = TbxCommandStreamReceiver::create("", false, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); ASSERT_NE(nullptr, pCommandStreamReceiver); @@ -23,7 +23,7 @@ void TbxCommandStreamFixture::SetUp(MockDevice *pDevice) { pDevice->resetCommandStreamReceiver(pCommandStreamReceiver); } -void TbxCommandStreamFixture::TearDown() { +void TbxCommandStreamFixture::tearDown() { delete memoryManager; } } // namespace NEO diff --git a/shared/test/common/fixtures/tbx_command_stream_fixture.h b/shared/test/common/fixtures/tbx_command_stream_fixture.h index 039778fa82..2077925821 100644 --- a/shared/test/common/fixtures/tbx_command_stream_fixture.h +++ b/shared/test/common/fixtures/tbx_command_stream_fixture.h @@ -15,8 +15,8 @@ class MemoryManager; class TbxCommandStreamFixture { public: - void SetUp(MockDevice *pDevice); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(MockDevice *pDevice); + void tearDown(); CommandStreamReceiver *pCommandStreamReceiver = nullptr; diff --git a/shared/test/common/fixtures/windows/memory_allocator_multi_device_fixture_windows.cpp b/shared/test/common/fixtures/windows/memory_allocator_multi_device_fixture_windows.cpp index 938b3eecea..3bf1c1fb06 100644 --- a/shared/test/common/fixtures/windows/memory_allocator_multi_device_fixture_windows.cpp +++ b/shared/test/common/fixtures/windows/memory_allocator_multi_device_fixture_windows.cpp @@ -17,7 +17,7 @@ using namespace NEO; -void MemoryAllocatorMultiDeviceSystemSpecificFixture::SetUp(ExecutionEnvironment &executionEnvironment) { +void MemoryAllocatorMultiDeviceSystemSpecificFixture::setUp(ExecutionEnvironment &executionEnvironment) { static D3DDDI_OPENALLOCATIONINFO allocationInfo; auto gdi = new MockGdi(); gdi->getQueryResourceInfoArgOut().NumAllocations = 1; @@ -37,4 +37,4 @@ void MemoryAllocatorMultiDeviceSystemSpecificFixture::SetUp(ExecutionEnvironment executionEnvironment.osEnvironment.reset(osEnvironment); } -void MemoryAllocatorMultiDeviceSystemSpecificFixture::TearDown(ExecutionEnvironment &executionEnvironment) {} +void MemoryAllocatorMultiDeviceSystemSpecificFixture::tearDown(ExecutionEnvironment &executionEnvironment) {} diff --git a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp index bd64679b5b..ae3dc3a78b 100644 --- a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp +++ b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp @@ -31,14 +31,14 @@ void DrmMemoryManagerBasic::SetUp() { } } -void DrmMemoryManagerFixture::SetUp() { - MemoryManagementFixture::SetUp(); +void DrmMemoryManagerFixture::setUp() { + MemoryManagementFixture::setUp(); executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); - SetUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), false); + setUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), false); } // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) -void DrmMemoryManagerFixture::SetUp(DrmMockCustom *mock, bool localMemoryEnabled) { +void DrmMemoryManagerFixture::setUp(DrmMockCustom *mock, bool localMemoryEnabled) { ASSERT_NE(nullptr, executionEnvironment); executionEnvironment->incRefInternal(); DebugManager.flags.DeferOsContextInitialization.set(0); @@ -70,7 +70,7 @@ void DrmMemoryManagerFixture::SetUp(DrmMockCustom *mock, bool localMemoryEnabled mock->reset(); } -void DrmMemoryManagerFixture::TearDown() { +void DrmMemoryManagerFixture::tearDown() { mock->testIoctls(); mock->reset(); @@ -97,26 +97,26 @@ void DrmMemoryManagerFixture::TearDown() { } mock->testIoctls(); executionEnvironment->decRefInternal(); - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); mmapVector.clear(); } -void DrmMemoryManagerWithLocalMemoryFixture::SetUp() { +void DrmMemoryManagerWithLocalMemoryFixture::setUp() { backup = std::make_unique>(&ultHwConfig); ultHwConfig.csrBaseCallCreatePreemption = false; - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); - DrmMemoryManagerFixture::SetUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), true); + DrmMemoryManagerFixture::setUp(new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]), true); } // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) -void DrmMemoryManagerWithLocalMemoryFixture::TearDown() { - DrmMemoryManagerFixture::TearDown(); +void DrmMemoryManagerWithLocalMemoryFixture::tearDown() { + DrmMemoryManagerFixture::tearDown(); } -void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::SetUp() { - SetUp(false); +void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::setUp() { + setUp(false); } -void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::SetUp(bool enableLocalMem) { +void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::setUp(bool enableLocalMem) { DebugManager.flags.DeferOsContextInitialization.set(0); executionEnvironment = new ExecutionEnvironment; @@ -146,14 +146,14 @@ void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::SetUp(bool enableLocal } device.reset(MockDevice::createWithExecutionEnvironment(defaultHwInfo.get(), executionEnvironment, rootDeviceIndex)); } -void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::TearDown() { +void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::tearDown() { } -void DrmMemoryManagerFixtureWithLocalMemoryAndWithoutQuietIoctlExpectation::SetUp() { - DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::SetUp(true); +void DrmMemoryManagerFixtureWithLocalMemoryAndWithoutQuietIoctlExpectation::setUp() { + DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::setUp(true); } -void DrmMemoryManagerFixtureWithLocalMemoryAndWithoutQuietIoctlExpectation::TearDown() { - DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::TearDown(); +void DrmMemoryManagerFixtureWithLocalMemoryAndWithoutQuietIoctlExpectation::tearDown() { + DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::tearDown(); } } // namespace NEO diff --git a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h index 44623cf5cc..0e45f5e385 100644 --- a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h +++ b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h @@ -41,9 +41,9 @@ class DrmMemoryManagerFixture : public MemoryManagementFixture { TestedDrmMemoryManager *memoryManager = nullptr; MockDevice *device = nullptr; - void SetUp() override; - void SetUp(DrmMockCustom *mock, bool localMemoryEnabled); - void TearDown() override; + void setUp(); + void setUp(DrmMockCustom *mock, bool localMemoryEnabled); + void tearDown(); protected: ExecutionEnvironment *executionEnvironment = nullptr; @@ -57,8 +57,8 @@ class DrmMemoryManagerFixture : public MemoryManagementFixture { class DrmMemoryManagerWithLocalMemoryFixture : public DrmMemoryManagerFixture { public: - void SetUp() override; - void TearDown() override; + void setUp(); + void tearDown(); std::unique_ptr> backup; }; @@ -99,9 +99,9 @@ class DrmMemoryManagerFixtureWithoutQuietIoctlExpectation { std::unique_ptr memoryManager; DrmMockCustom *mock; - void SetUp(); // NOLINT(readability-identifier-naming) - void SetUp(bool enableLocalMem); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void setUp(bool enableLocalMem); + void tearDown(); protected: ExecutionEnvironment *executionEnvironment = nullptr; @@ -114,7 +114,7 @@ class DrmMemoryManagerFixtureWithoutQuietIoctlExpectation { class DrmMemoryManagerFixtureWithLocalMemoryAndWithoutQuietIoctlExpectation : public DrmMemoryManagerFixtureWithoutQuietIoctlExpectation { public: - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); }; } // namespace NEO diff --git a/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h b/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h index 516faf7ced..76f8eae177 100644 --- a/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h +++ b/shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h @@ -83,22 +83,22 @@ class DrmMemoryManagerLocalMemoryWithCustomPrelimMockTest : public ::testing::Te class DrmMemoryManagerFixturePrelim : public DrmMemoryManagerFixture { public: - void SetUp() override { + void setUp() { regionInfo.resize(2); regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); mock = new DrmMockCustomPrelim(*executionEnvironment->rootDeviceEnvironments[0]); mock->memoryInfo.reset(new MemoryInfo(regionInfo, *mock)); - DrmMemoryManagerFixture::SetUp(mock, true); + DrmMemoryManagerFixture::setUp(mock, true); } - void TearDown() override { + void tearDown() { mock->testIoctls(); - DrmMemoryManagerFixture::TearDown(); + DrmMemoryManagerFixture::tearDown(); } std::vector regionInfo; diff --git a/shared/test/common/os_interface/windows/gdi_dll_fixture.h b/shared/test/common/os_interface/windows/gdi_dll_fixture.h index fcfe5ed730..68269dfd07 100644 --- a/shared/test/common/os_interface/windows/gdi_dll_fixture.h +++ b/shared/test/common/os_interface/windows/gdi_dll_fixture.h @@ -16,7 +16,7 @@ using namespace NEO; OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace); struct GdiDllFixture { - virtual void SetUp() { + void setUp() { const HardwareInfo *hwInfo = defaultHwInfo.get(); mockGdiDll.reset(setAdapterInfo(&hwInfo->platform, &hwInfo->gtSystemInfo, hwInfo->capabilityTable.gpuAddressSpace)); @@ -65,7 +65,7 @@ struct GdiDllFixture { *getRegisterTrimNotificationFailCallFcn() = false; } - virtual void TearDown() { + void tearDown() { *getCreateHwQueueDataFcn() = {}; *getDestroyHwQueueDataFcn() = {}; *getSubmitCommandToHwQueueDataFcn() = {}; diff --git a/shared/test/common/os_interface/windows/wddm_fixture.h b/shared/test/common/os_interface/windows/wddm_fixture.h index b3610ee010..7050834eb5 100644 --- a/shared/test/common/os_interface/windows/wddm_fixture.h +++ b/shared/test/common/os_interface/windows/wddm_fixture.h @@ -30,9 +30,9 @@ #include "shared/test/common/test_macros/hw_test.h" namespace NEO { -struct WddmFixture : public TestLegacy { +struct WddmFixture : public Test { void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); + MockExecutionEnvironmentGmmFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); auto osEnvironment = new OsEnvironmentWin(); gdi = new MockGdi(); @@ -62,9 +62,9 @@ struct WddmFixture : public TestLegacy { }; struct WddmFixtureWithMockGdiDll : public GdiDllFixture, public MockExecutionEnvironmentGmmFixture { - void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); - GdiDllFixture::SetUp(); + void setUp() { + MockExecutionEnvironmentGmmFixture::setUp(); + GdiDllFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); wddm = static_cast(Wddm::createWddm(nullptr, *rootDeviceEnvironment)); wddmMockInterface = new WddmMockInterface20(*wddm); @@ -87,8 +87,8 @@ struct WddmFixtureWithMockGdiDll : public GdiDllFixture, public MockExecutionEnv osContext->ensureContextInitialized(); } - void TearDown() override { - GdiDllFixture::TearDown(); + void tearDown() { + GdiDllFixture::tearDown(); } WddmMock *wddm = nullptr; @@ -110,9 +110,9 @@ struct NoCleanupWddmMock : WddmMock { }; struct WddmFixtureWithMockGdiDllWddmNoCleanup : public GdiDllFixture, public MockExecutionEnvironmentGmmFixture { - void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); - GdiDllFixture::SetUp(); + void setUp() { + MockExecutionEnvironmentGmmFixture::setUp(); + GdiDllFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); wddm = new NoCleanupWddmMock(*rootDeviceEnvironment); wddmMockInterface = new WddmMockInterface20(*wddm); @@ -135,8 +135,8 @@ struct WddmFixtureWithMockGdiDllWddmNoCleanup : public GdiDllFixture, public Moc osContext->ensureContextInitialized(); } - void TearDown() override { - GdiDllFixture::TearDown(); + void tearDown() { + GdiDllFixture::tearDown(); } NoCleanupWddmMock *wddm = nullptr; @@ -147,7 +147,7 @@ struct WddmFixtureWithMockGdiDllWddmNoCleanup : public GdiDllFixture, public Moc }; struct WddmInstrumentationGmmFixture : DeviceFixture { - void SetUp() { + void setUp() { DeviceFixture::setUp(); executionEnvironment = pDevice->getExecutionEnvironment(); auto rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); @@ -157,7 +157,7 @@ struct WddmInstrumentationGmmFixture : DeviceFixture { rootDeviceEnvironment->osInterface = std::make_unique(); rootDeviceEnvironment->osInterface->setDriverModel(std::unique_ptr(wddm)); } - void TearDown() { + void tearDown() { DeviceFixture::tearDown(); } @@ -167,8 +167,8 @@ struct WddmInstrumentationGmmFixture : DeviceFixture { }; using WddmTest = WddmFixture; -using WddmTestWithMockGdiDll = TestLegacy; -using WddmTestWithMockGdiDllNoCleanup = TestLegacy; -using WddmInstrumentationTest = TestLegacy; +using WddmTestWithMockGdiDll = Test; +using WddmTestWithMockGdiDllNoCleanup = Test; +using WddmInstrumentationTest = Test; using WddmTestSingle = ::testing::Test; } // namespace NEO diff --git 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 index b26c4a7de7..ffffd8506f 100644 --- 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 @@ -26,7 +26,7 @@ using namespace NEO; -using AubCommandStreamReceiverTests = TestLegacy; +using AubCommandStreamReceiverTests = Test; template struct MockAubCsrToTestDumpAubNonWritable : public AUBCommandStreamReceiverHw { diff --git 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 index ad94d2af53..7d81c46db1 100644 --- 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 @@ -33,7 +33,7 @@ using namespace NEO; -using AubCommandStreamReceiverTests = TestLegacy; +using AubCommandStreamReceiverTests = Test; struct FlatBatchBufferHelperAubTests : AubCommandStreamReceiverTests { void SetUp() override { diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp index c78dd00ffc..9a1cc70751 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp @@ -262,7 +262,7 @@ TEST_F(HardwareContextContainerTests, givenMultipleHwContextWhenSingleMethodIsCa EXPECT_FALSE(mockHwContext1->readMemoryCalled); } -using AubCommandStreamReceiverTests = TestLegacy; +using AubCommandStreamReceiverTests = Test; HWTEST_F(AubCommandStreamReceiverTests, givenGraphicsAllocationWritableWhenDumpAllocationIsCalledAndDumpFormatIsSpecifiedThenGraphicsAllocationShouldBeDumped) { DebugManagerStateRestore dbgRestore; diff --git a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp index 690974f210..c3a22a32b0 100644 --- a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -32,7 +32,7 @@ using namespace NEO; -using AubFileStreamTests = TestLegacy; +using AubFileStreamTests = Test; struct AddPatchInfoCommentsAubTests : AubFileStreamTests { void SetUp() override { diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index cbcac1b222..33ab01e483 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -40,25 +40,25 @@ struct TbxFixture : public TbxCommandStreamFixture, public DeviceFixture, public MockAubCenterFixture { - using TbxCommandStreamFixture::SetUp; + using TbxCommandStreamFixture::setUp; TbxFixture() : MockAubCenterFixture(CommandStreamReceiverType::CSR_TBX) {} - void SetUp() { + void setUp() { DeviceFixture::setUp(); setMockAubCenter(*pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]); - TbxCommandStreamFixture::SetUp(pDevice); - MockAubCenterFixture::SetUp(); + TbxCommandStreamFixture::setUp(pDevice); + MockAubCenterFixture::setUp(); } - void TearDown() { - MockAubCenterFixture::TearDown(); - TbxCommandStreamFixture::TearDown(); + void tearDown() { + MockAubCenterFixture::tearDown(); + TbxCommandStreamFixture::tearDown(); DeviceFixture::tearDown(); } }; -using TbxCommandStreamTests = TestLegacy; +using TbxCommandStreamTests = Test; using TbxCommandSteamSimpleTest = TbxCommandStreamTests; template diff --git a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index e26dd7bd60..8992993c85 100644 --- a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -21,7 +21,7 @@ using namespace NEO; -using Gen12LpGmmCallbacksTests = ::TestLegacy; +using Gen12LpGmmCallbacksTests = ::Test; template struct MockAubCsrToTestNotifyAubCapture : public AUBCommandStreamReceiverHw { diff --git a/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp index 6e3327e3cb..58982b50ea 100644 --- a/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp @@ -19,7 +19,7 @@ using namespace NEO; struct Gen12LpWddmTest : public GdiDllFixture, ::testing::Test { void SetUp() override { - GdiDllFixture::SetUp(); + GdiDllFixture::setUp(); executionEnvironment = std::make_unique(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); @@ -30,7 +30,7 @@ struct Gen12LpWddmTest : public GdiDllFixture, ::testing::Test { } void TearDown() override { - GdiDllFixture::TearDown(); + GdiDllFixture::tearDown(); } std::unique_ptr executionEnvironment; diff --git a/shared/test/unit_test/gmm_helper/gmm_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_tests.cpp index 4e350e3ebc..39f625369d 100644 --- a/shared/test/unit_test/gmm_helper/gmm_tests.cpp +++ b/shared/test/unit_test/gmm_helper/gmm_tests.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/test_macros/test.h" namespace NEO { -using GmmTests = TestLegacy; +using GmmTests = Test; TEST_F(GmmTests, givenResourceUsageTypesCacheableWhenGreateGmmThenFlagCachcableIsTrue) { StorageInfo storageInfo{}; for (auto resourceUsageType : {GMM_RESOURCE_USAGE_OCL_IMAGE, diff --git a/shared/test/unit_test/helpers/app_resource_tests.cpp b/shared/test/unit_test/helpers/app_resource_tests.cpp index cf1618cbc4..d92b34a333 100644 --- a/shared/test/unit_test/helpers/app_resource_tests.cpp +++ b/shared/test/unit_test/helpers/app_resource_tests.cpp @@ -19,13 +19,13 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/test.h" -using MockExecutionEnvironmentTagTest = TestLegacy; +using MockExecutionEnvironmentTagTest = Test; using namespace NEO; struct AppResourceTests : public MockExecutionEnvironmentTagTest { void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); + MockExecutionEnvironmentGmmFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); localPlatformDevice = rootDeviceEnvironment->getMutableHardwareInfo(); } diff --git a/shared/test/unit_test/helpers/memory_management_tests.cpp b/shared/test/unit_test/helpers/memory_management_tests.cpp index 2472280efa..0fb48d52ec 100644 --- a/shared/test/unit_test/helpers/memory_management_tests.cpp +++ b/shared/test/unit_test/helpers/memory_management_tests.cpp @@ -48,11 +48,11 @@ TEST(allocation, GivenFailingAllocationOneWhenCreatingAllocationsThenOnlyOneAllo struct MemoryManagementTest : public MemoryManagementFixture, public ::testing::Test { void SetUp() override { - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); } void TearDown() override { - MemoryManagementFixture::TearDown(); + MemoryManagementFixture::tearDown(); } }; diff --git a/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp b/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp index 24db47022b..ad15a98d07 100644 --- a/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp +++ b/shared/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp @@ -17,11 +17,14 @@ struct InternalAllocationStorageTest : public MemoryAllocatorFixture, public ::testing::Test { - using MemoryAllocatorFixture::TearDown; void SetUp() override { - MemoryAllocatorFixture::SetUp(); + MemoryAllocatorFixture::setUp(); storage = csr->getInternalAllocationStorage(); } + + void TearDown() override { + MemoryAllocatorFixture::tearDown(); + } InternalAllocationStorage *storage; }; @@ -322,4 +325,4 @@ TEST_F(InternalAllocationStorageTest, givenInternalAllocationWhenTaskCountMetsEx storage->cleanAllocationList(expectedTaskCount, TEMPORARY_ALLOCATION); EXPECT_FALSE(csr->getTemporaryAllocations().peekIsEmpty()); allocation->hostPtrTaskCountAssignment = 0; -} \ No newline at end of file +} diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp index 4c55c98657..2a3c917e96 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp @@ -1393,7 +1393,7 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenSipKernelTypeWhenAllocatingTh memoryManager->freeGraphicsMemory(sipAllocation); } -using DrmMemoryManagerFailInjectionPrelimTest = TestLegacy; +using DrmMemoryManagerFailInjectionPrelimTest = Test; TEST_F(DrmMemoryManagerFailInjectionPrelimTest, givenEnabledLocalMemoryWhenNewFailsThenAllocateInDevicePoolReturnsStatusErrorAndNullallocation) { mock->ioctl_expected.total = -1; //don't care @@ -1573,7 +1573,7 @@ TEST_F(DrmMemoryManagerCopyMemoryToAllocationPrelimTest, givenDrmMemoryManagerWh drmMemoryManger.freeGraphicsMemory(allocation); } -typedef TestLegacy DrmMemoryManagerTestPrelim; +typedef Test DrmMemoryManagerTestPrelim; TEST_F(DrmMemoryManagerTestPrelim, whenSettingNumHandlesThenTheyAreRetrievedCorrectly) { mock->ioctl_expected.primeFdToHandle = 2; diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp index db9aa82ab8..fb9eaa4337 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp @@ -33,19 +33,19 @@ class DrmMemoryManagerFixtureImpl : public DrmMemoryManagerFixture { public: DrmMockCustom *mockExp; - void SetUp() override { + void setUp() { backup = std::make_unique>(&ultHwConfig); ultHwConfig.csrBaseCallCreatePreemption = false; - MemoryManagementFixture::SetUp(); + MemoryManagementFixture::setUp(); executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); mockExp = new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]); - DrmMemoryManagerFixture::SetUp(mockExp, true); + DrmMemoryManagerFixture::setUp(mockExp, true); } - void TearDown() override { + void tearDown() { mockExp->testIoctls(); - DrmMemoryManagerFixture::TearDown(); + DrmMemoryManagerFixture::tearDown(); } std::unique_ptr> backup; }; @@ -647,7 +647,7 @@ TEST_F(DrmMemoryManagerLocalMemoryWithCustomMockTest, givenDrmMemoryManagerWithL EXPECT_EQ(nullptr, bo.peekLockedAddress()); } -using DrmMemoryManagerFailInjectionTest = TestLegacy; +using DrmMemoryManagerFailInjectionTest = Test; HWTEST2_F(DrmMemoryManagerFailInjectionTest, givenEnabledLocalMemoryWhenNewFailsThenAllocateInDevicePoolReturnsStatusErrorAndNullallocation, NonDefaultIoctlsSupported) { mock->ioctl_expected.total = -1; //don't care @@ -795,7 +795,7 @@ TEST_F(DrmMemoryManagerCopyMemoryToAllocationTest, givenDrmMemoryManagerWhenCopy drmMemoryManger.freeGraphicsMemory(allocation); } -using DrmMemoryManagerTestImpl = TestLegacy; +using DrmMemoryManagerTestImpl = Test; HWTEST2_F(DrmMemoryManagerTestImpl, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAllocationInLocalMemoryThenCallIoctlGemMapOffsetAndReturnLockedPtr, NonDefaultIoctlsSupported) { mockExp->ioctl_expected.gemCreateExt = 1; diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 1bc44c76fc..0e92e11197 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -32,11 +32,11 @@ namespace { using MemoryManagerMultiDeviceSharedHandleTest = MemoryAllocatorMultiDeviceFixture<2>; -using DrmMemoryManagerTest = TestLegacy; -using DrmMemoryManagerWithLocalMemoryTest = TestLegacy; -using DrmMemoryManagerWithExplicitExpectationsTest = TestLegacy; -using DrmMemoryManagerWithLocalMemoryAndExplicitExpectationsTest = TestLegacy; -using DrmMemoryManagerUSMHostAllocationTests = TestLegacy; +using DrmMemoryManagerTest = Test; +using DrmMemoryManagerWithLocalMemoryTest = Test; +using DrmMemoryManagerWithExplicitExpectationsTest = Test; +using DrmMemoryManagerWithLocalMemoryAndExplicitExpectationsTest = Test; +using DrmMemoryManagerUSMHostAllocationTests = Test; AllocationProperties createAllocationProperties(uint32_t rootDeviceIndex, size_t size, bool forcePin) { MockAllocationProperties properties(rootDeviceIndex, size); @@ -2140,7 +2140,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedForInternalAllocationWit memoryManager->freeGraphicsMemory(drmAllocation); } -using DrmMemoryManagerUSMHostAllocationTests = TestLegacy; +using DrmMemoryManagerUSMHostAllocationTests = Test; TEST_F(DrmMemoryManagerUSMHostAllocationTests, givenCallToAllocateGraphicsMemoryWithAlignmentWithIsHostUsmAllocationSetToFalseThenNewHostPointerIsUsedAndAllocationIsCreatedSuccesfully) { mock->ioctl_expected.gemUserptr = 1; @@ -3956,7 +3956,7 @@ TEST(DrmMemoryManagerSimpleTest, WhenDrmIsCreatedThenQueryPageFaultSupportIsCall EXPECT_TRUE(static_cast(drm.get())->queryPageFaultSupportCalled); } -using DrmMemoryManagerWithLocalMemoryTest = TestLegacy; +using DrmMemoryManagerWithLocalMemoryTest = Test; TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenDrmMemoryManagerWithLocalMemoryWhenLockResourceIsCalledOnAllocationInLocalMemoryThenReturnNullPtr) { DrmAllocation drmAllocation(rootDeviceIndex, AllocationType::UNKNOWN, nullptr, nullptr, 0u, 0u, MemoryPool::LocalMemory); @@ -3967,7 +3967,7 @@ TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenDrmMemoryManagerWithLocalMemory memoryManager->unlockResource(&drmAllocation); } -using DrmMemoryManagerTest = TestLegacy; +using DrmMemoryManagerTest = Test; TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenCopyMemoryToAllocationThenAllocationIsFilledWithCorrectData) { mock->ioctl_expected.gemUserptr = 1; diff --git a/shared/test/unit_test/os_interface/os_library_tests.cpp b/shared/test/unit_test/os_interface/os_library_tests.cpp index f87ffe11eb..31760f8f23 100644 --- a/shared/test/unit_test/os_interface/os_library_tests.cpp +++ b/shared/test/unit_test/os_interface/os_library_tests.cpp @@ -71,7 +71,7 @@ TEST(OSLibraryTest, whenSymbolNameIsInvalidThenGetProcAddressReturnsNullPointer) EXPECT_EQ(nullptr, ptr); } -using OsLibraryTestWithFailureInjection = TestLegacy; +using OsLibraryTestWithFailureInjection = Test; TEST_F(OsLibraryTestWithFailureInjection, GivenFailureInjectionWhenLibraryIsLoadedThenOnlyFailedAllocationIsNull) { InjectedFunction method = [](size_t failureIndex) { diff --git 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 index 811d311257..a91b0da16b 100644 --- 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 @@ -58,7 +58,7 @@ class WddmCommandStreamFixture { DebugManagerStateRestore stateRestore; - void SetUp() { + void setUp() { HardwareInfo *hwInfo = nullptr; DebugManager.flags.CsrDispatchMode.set(static_cast(DispatchMode::ImmediateDispatch)); auto executionEnvironment = getExecutionEnvironmentImpl(hwInfo, 1); @@ -74,7 +74,7 @@ class WddmCommandStreamFixture { csr->getOsContext().ensureContextInitialized(); } - void TearDown() { + void tearDown() { } }; @@ -172,16 +172,16 @@ class WddmCommandStreamMockGdiTest : public ::testing::Test { } }; -using WddmCommandStreamTest = ::TestLegacy; +using WddmCommandStreamTest = ::Test; using WddmDefaultTest = ::Test; -struct DeviceCommandStreamTest : ::TestLegacy, DeviceFixture { +struct DeviceCommandStreamTest : ::Test, DeviceFixture { void SetUp() override { DeviceFixture::setUp(); - MockAubCenterFixture::SetUp(); + MockAubCenterFixture::setUp(); setMockAubCenter(pDevice->getRootDeviceEnvironmentRef()); } void TearDown() override { - MockAubCenterFixture::TearDown(); + MockAubCenterFixture::tearDown(); DeviceFixture::tearDown(); } }; @@ -307,13 +307,13 @@ TEST_F(WddmCommandStreamTest, givenWdmmWhenSubmitIsCalledThenCoherencyRequiredFl } struct WddmPreemptionHeaderFixture { - void SetUp() { + void setUp() { executionEnvironment = getExecutionEnvironmentImpl(hwInfo, 1); executionEnvironment->incRefInternal(); wddm = static_cast(executionEnvironment->rootDeviceEnvironments[0]->osInterface->getDriverModel()->as()); } - void TearDown() { + void tearDown() { executionEnvironment->decRefInternal(); } @@ -322,7 +322,7 @@ struct WddmPreemptionHeaderFixture { WddmMock *wddm = nullptr; }; -using WddmPreemptionHeaderTests = ::TestLegacy; +using WddmPreemptionHeaderTests = ::Test; TEST_F(WddmPreemptionHeaderTests, givenWddmCommandStreamReceiverWhenPreemptionIsOffWhenWorkloadIsSubmittedThenHeaderDoesntHavePreemptionFieldSet) { hwInfo->capabilityTable.defaultPreemptionMode = PreemptionMode::Disabled; diff --git a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp index d7f5b8b284..2d2203e4c4 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp @@ -15,10 +15,10 @@ using namespace NEO; -class WddmPreemptionTests : public TestLegacy { +class WddmPreemptionTests : public Test { public: void SetUp() override { - WddmFixtureWithMockGdiDll::SetUp(); + WddmFixtureWithMockGdiDll::setUp(); const HardwareInfo hwInfo = *defaultHwInfo; memcpy(&hwInfoTest, &hwInfo, sizeof(hwInfoTest)); dbgRestorer = new DebugManagerStateRestore(); @@ -27,7 +27,7 @@ class WddmPreemptionTests : public TestLegacy { void TearDown() override { delete dbgRestorer; - WddmFixtureWithMockGdiDll::TearDown(); + WddmFixtureWithMockGdiDll::tearDown(); } void createAndInitWddm(unsigned int forceReturnPreemptionRegKeyValue) { diff --git a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp index 59a518d7d4..9a6e8f45b5 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp @@ -24,9 +24,9 @@ class WddmSharedAllocationsMock : public WddmMock { class WddmSharedTestsFixture : public GdiDllFixture, public MockExecutionEnvironmentGmmFixture { public: - void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); - GdiDllFixture::SetUp(); + void setUp() { + MockExecutionEnvironmentGmmFixture::setUp(); + GdiDllFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); wddm = new WddmSharedAllocationsMock(*rootDeviceEnvironment); wddmMockInterface = new WddmMockInterface20(*wddm); @@ -49,8 +49,8 @@ class WddmSharedTestsFixture : public GdiDllFixture, public MockExecutionEnviron osContext->ensureContextInitialized(); } - void TearDown() override { - GdiDllFixture::TearDown(); + void tearDown() { + GdiDllFixture::tearDown(); } WddmSharedAllocationsMock *wddm = nullptr; @@ -60,7 +60,7 @@ class WddmSharedTestsFixture : public GdiDllFixture, public MockExecutionEnviron RootDeviceEnvironment *rootDeviceEnvironment = nullptr; }; -using WdmmSharedTests = TestLegacy; +using WdmmSharedTests = Test; TEST_F(WdmmSharedTests, WhenCreatingSharedAllocationAndGetNTHandleFailedThenAllocationIsDeletedAndHandlesAreSetToZero) { init(); diff --git a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp index 49703b00c9..ae99a2356f 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp @@ -24,7 +24,7 @@ class WddmMemManagerFixture { FrontWindowMemManagerMock(NEO::ExecutionEnvironment &executionEnvironment) : MockWddmMemoryManager(executionEnvironment) {} }; - void SetUp() { + void setUp() { DebugManagerStateRestore dbgRestorer; DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(true); executionEnvironment = std::make_unique(); @@ -37,13 +37,13 @@ class WddmMemManagerFixture { wddm->callBaseMapGpuVa = false; memManager = std::unique_ptr(new FrontWindowMemManagerMock(*executionEnvironment)); } - void TearDown() { + void tearDown() { } std::unique_ptr memManager; std::unique_ptr executionEnvironment; }; -using WddmFrontWindowPoolAllocatorTests = TestLegacy; +using WddmFrontWindowPoolAllocatorTests = Test; TEST_F(WddmFrontWindowPoolAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenWddmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp index 7e63fffef7..c7538e456e 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp @@ -366,9 +366,9 @@ class WddmSkipResourceCleanupMock : public WddmMock { }; struct WddmSkipResourceCleanupFixtureWithMockGdiDll : public GdiDllFixture, public MockExecutionEnvironmentGmmFixture { - void SetUp() override { - MockExecutionEnvironmentGmmFixture::SetUp(); - GdiDllFixture::SetUp(); + void setUp() { + MockExecutionEnvironmentGmmFixture::setUp(); + GdiDllFixture::setUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); wddm = static_cast(Wddm::createWddm(nullptr, *rootDeviceEnvironment)); wddmMockInterface = new WddmMockInterface20(*wddm); @@ -391,10 +391,10 @@ struct WddmSkipResourceCleanupFixtureWithMockGdiDll : public GdiDllFixture, publ osContext->ensureContextInitialized(); } - void TearDown() override { + void tearDown() { osContext.reset(nullptr); - GdiDllFixture::TearDown(); - MockExecutionEnvironmentGmmFixture::TearDown(); + GdiDllFixture::tearDown(); + MockExecutionEnvironmentGmmFixture::tearDown(); } WddmSkipResourceCleanupMock *wddm = nullptr; @@ -404,7 +404,7 @@ struct WddmSkipResourceCleanupFixtureWithMockGdiDll : public GdiDllFixture, publ RootDeviceEnvironment *rootDeviceEnvironment = nullptr; }; -using WddmSkipResourceCleanupFixtureTests = TestLegacy; +using WddmSkipResourceCleanupFixtureTests = Test; TEST_F(WddmSkipResourceCleanupFixtureTests, givenWaitForSynchronizationObjectFromCpuWhenSkipResourceCleanupIsTrueThenSuccessIsReturnedAndGdiFunctionIsNotCalled) { VariableBackup varBackup(&waitForSynchronizationObjectFromCpuCounter); diff --git a/shared/test/unit_test/utilities/tag_allocator_tests.cpp b/shared/test/unit_test/utilities/tag_allocator_tests.cpp index 2e605a1d27..13927a9c88 100644 --- a/shared/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/shared/test/unit_test/utilities/tag_allocator_tests.cpp @@ -24,10 +24,10 @@ using namespace NEO; -struct TagAllocatorTest : public TestLegacy { +struct TagAllocatorTest : public Test { void SetUp() override { DebugManager.flags.CreateMultipleSubDevices.set(4); - MemoryAllocatorFixture::SetUp(); + MemoryAllocatorFixture::setUp(); } const DeviceBitfield deviceBitfield{0xf};