Remove usage of TestLegacy from opencl tests

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp

@@ -60,7 +60,7 @@ class DrmGemCloseWorkerFixture {
     DrmMockForWorker *drmMock;
     uint32_t deadCnt = deadCntInit;
 
-    void SetUp() { // NOLINT(readability-identifier-naming)
+    void setUp() {
         this->drmMock = new DrmMockForWorker(*executionEnvironment.rootDeviceEnvironments[0]);
 
         auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo();
@@ -79,7 +79,7 @@ class DrmGemCloseWorkerFixture {
         this->drmMock->gem_close_expected = 0;
     }
 
-    void TearDown() { // NOLINT(readability-identifier-naming)
+    void tearDown() {
         if (this->drmMock->gem_close_expected >= 0) {
             EXPECT_EQ(this->drmMock->gem_close_expected, this->drmMock->gem_close_cnt);
         }
@@ -97,7 +97,7 @@ class DrmGemCloseWorkerFixture {
     MockExecutionEnvironment executionEnvironment;
 };
 
-typedef TestLegacy<DrmGemCloseWorkerFixture> DrmGemCloseWorkerTests;
+typedef Test<DrmGemCloseWorkerFixture> DrmGemCloseWorkerTests;
 
 TEST_F(DrmGemCloseWorkerTests, WhenClosingGemThenSucceeds) {
     this->drmMock->gem_close_expected = 1;

opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp

@@ -36,9 +36,9 @@ std::unique_ptr<PerformanceCounters> MockPerformanceCounters::create() {
 }
 
 //////////////////////////////////////////////////////
-// PerformanceCountersFixture::SetUp
+// PerformanceCountersFixture::setUp
 //////////////////////////////////////////////////////
-void PerformanceCountersFixture::SetUp() {
+void PerformanceCountersFixture::setUp() {
     device = std::make_unique<MockClDevice>(new MockDevice());
     context = std::make_unique<MockContext>(device.get());
     queue = std::make_unique<MockCommandQueue>(context.get(), device.get(), &queueProperties, false);
@@ -48,8 +48,8 @@ void PerformanceCountersFixture::SetUp() {
 }
 
 //////////////////////////////////////////////////////
-// PerformanceCountersFixture::TearDown
+// PerformanceCountersFixture::tearDown
 //////////////////////////////////////////////////////
-void PerformanceCountersFixture::TearDown() {
+void PerformanceCountersFixture::tearDown() {
 }
 } // namespace NEO

opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,11 +19,11 @@ struct PerformanceCountersLinuxTest : public PerformanceCountersFixture,
                                       public ::testing::Test {
   public:
     void SetUp() override {
-        PerformanceCountersFixture::SetUp();
+        PerformanceCountersFixture::setUp();
     }
 
     void TearDown() override {
-        PerformanceCountersFixture::TearDown();
+        PerformanceCountersFixture::tearDown();
     }
 };
 

opencl/test/unit_test/os_interface/mock_performance_counters.cpp

@@ -319,32 +319,32 @@ StatusCode MockMetricsLibraryValidInterface::GetData(GetReportData_1_0 *data) {
 }
 
 //////////////////////////////////////////////////////
-// PerformanceCountersDeviceFixture::SetUp
+// PerformanceCountersDeviceFixture::setUp
 //////////////////////////////////////////////////////
-void PerformanceCountersDeviceFixture::SetUp() {
+void PerformanceCountersDeviceFixture::setUp() {
     createFunc = Device::createPerformanceCountersFunc;
     Device::createPerformanceCountersFunc = [](Device *) { return MockPerformanceCounters::create(); };
 }
 
 //////////////////////////////////////////////////////
-// PerformanceCountersDeviceFixture::TearDown
+// PerformanceCountersDeviceFixture::tearDown
 //////////////////////////////////////////////////////
-void PerformanceCountersDeviceFixture::TearDown() {
+void PerformanceCountersDeviceFixture::tearDown() {
     Device::createPerformanceCountersFunc = createFunc;
 }
 
 //////////////////////////////////////////////////////
 // PerformanceCountersMetricsLibraryFixture::SetUp
 //////////////////////////////////////////////////////
-void PerformanceCountersMetricsLibraryFixture::SetUp() {
-    PerformanceCountersFixture::SetUp();
+void PerformanceCountersMetricsLibraryFixture::setUp() {
+    PerformanceCountersFixture::setUp();
 }
 
 //////////////////////////////////////////////////////
 // PerformanceCountersMetricsLibraryFixture::TearDown
 //////////////////////////////////////////////////////
-void PerformanceCountersMetricsLibraryFixture::TearDown() {
-    PerformanceCountersFixture::TearDown();
+void PerformanceCountersMetricsLibraryFixture::tearDown() {
+    PerformanceCountersFixture::tearDown();
 }
 
 //////////////////////////////////////////////////////

opencl/test/unit_test/os_interface/mock_performance_counters.h

@@ -209,8 +209,8 @@ class MockPerformanceCounters {
 // PerformanceCountersDeviceFixture
 //////////////////////////////////////////////////////
 struct PerformanceCountersDeviceFixture {
-    virtual void SetUp();    // NOLINT(readability-identifier-naming)
-    virtual void TearDown(); // NOLINT(readability-identifier-naming)
+    void setUp();
+    void tearDown();
     decltype(&PerformanceCounters::create) createFunc;
 };
 
@@ -222,8 +222,8 @@ struct RootDeviceEnvironment;
 struct PerformanceCountersFixture {
     PerformanceCountersFixture();
     ~PerformanceCountersFixture();
-    virtual void SetUp();    // NOLINT(readability-identifier-naming)
-    virtual void TearDown(); // NOLINT(readability-identifier-naming)
+    void setUp();
+    void tearDown();
     cl_queue_properties queueProperties = {};
     std::unique_ptr<MockClDevice> device;
     std::unique_ptr<MockContext> context;
@@ -238,8 +238,8 @@ struct PerformanceCountersFixture {
 //////////////////////////////////////////////////////
 struct PerformanceCountersMetricsLibraryFixture : PerformanceCountersFixture {
 
-    void SetUp() override;
-    void TearDown() override;
+    void setUp();
+    void tearDown();
 
     PerformanceCounters *initDeviceWithPerformanceCounters(const bool validMetricsLibraryApi, const bool mockMatricsLibrary);
 };

opencl/test/unit_test/os_interface/performance_counters_tests.cpp

@@ -25,20 +25,20 @@ struct PerformanceCountersDeviceTest : public PerformanceCountersDeviceFixture,
                                        public DeviceInstrumentationFixture,
                                        public ::testing::Test {
     void SetUp() override {
-        PerformanceCountersDeviceFixture::SetUp();
+        PerformanceCountersDeviceFixture::setUp();
     }
     void TearDown() override {
-        PerformanceCountersDeviceFixture::TearDown();
+        PerformanceCountersDeviceFixture::tearDown();
     }
 };
 
 TEST_F(PerformanceCountersDeviceTest, GivenEnabledInstrumentationWhenGettingPerformanceCountersThenNonNullPtrIsReturned) {
-    DeviceInstrumentationFixture::SetUp(true);
+    DeviceInstrumentationFixture::setUp(true);
     EXPECT_NE(nullptr, device->getPerformanceCounters());
 }
 
 TEST_F(PerformanceCountersDeviceTest, GivenDisabledInstrumentationWhenGettingPerformanceCountersThenNullPtrIsReturned) {
-    DeviceInstrumentationFixture::SetUp(false);
+    DeviceInstrumentationFixture::setUp(false);
     EXPECT_EQ(nullptr, device->getPerformanceCounters());
 }
 
@@ -46,11 +46,11 @@ struct PerformanceCountersTest : public PerformanceCountersFixture,
                                  public ::testing::Test {
   public:
     void SetUp() override {
-        PerformanceCountersFixture::SetUp();
+        PerformanceCountersFixture::setUp();
     }
 
     void TearDown() override {
-        PerformanceCountersFixture::TearDown();
+        PerformanceCountersFixture::tearDown();
     }
 };
 
@@ -212,7 +212,7 @@ struct PerformanceCountersMetricsLibraryTest : public PerformanceCountersMetrics
 
   public:
     void SetUp() override {
-        PerformanceCountersMetricsLibraryFixture::SetUp();
+        PerformanceCountersMetricsLibraryFixture::setUp();
         auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
         osContext = std::make_unique<MockOsContext>(0, EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(hwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0],
                                                                                                     PreemptionHelper::getDefaultPreemptionMode(*hwInfo)));
@@ -220,7 +220,7 @@ struct PerformanceCountersMetricsLibraryTest : public PerformanceCountersMetrics
     }
 
     void TearDown() override {
-        PerformanceCountersMetricsLibraryFixture::TearDown();
+        PerformanceCountersMetricsLibraryFixture::tearDown();
     }
     std::unique_ptr<OsContext> osContext;
 };

opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp

@@ -37,9 +37,9 @@ std::unique_ptr<PerformanceCounters> MockPerformanceCounters::create() {
 }
 
 //////////////////////////////////////////////////////
-// PerformanceCountersFixture::SetUp
+// PerformanceCountersFixture::setUp
 //////////////////////////////////////////////////////
-void PerformanceCountersFixture::SetUp() {
+void PerformanceCountersFixture::setUp() {
     device = std::make_unique<MockClDevice>(new MockDevice());
     context = std::make_unique<MockContext>(device.get());
     queue = std::make_unique<MockCommandQueue>(context.get(), device.get(), &queueProperties, false);
@@ -49,9 +49,9 @@ void PerformanceCountersFixture::SetUp() {
 }
 
 //////////////////////////////////////////////////////
-// PerformanceCountersFixture::TearDown
+// PerformanceCountersFixture::tearDown
 //////////////////////////////////////////////////////
-void PerformanceCountersFixture::TearDown() {
+void PerformanceCountersFixture::tearDown() {
 }
 
 } // namespace NEO

opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,10 +17,10 @@ struct PerformanceCountersWinTest : public PerformanceCountersFixture,
                                     public ::testing::Test {
   public:
     void SetUp() override {
-        PerformanceCountersFixture::SetUp();
+        PerformanceCountersFixture::setUp();
     }
 
     void TearDown() override {
-        PerformanceCountersFixture::TearDown();
+        PerformanceCountersFixture::tearDown();
     }
 };

opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h

@@ -90,7 +90,7 @@ class MockWddmMemoryManagerFixture {
     MockGdi *gdi = nullptr;
 };
 
-typedef ::TestLegacy<MockWddmMemoryManagerFixture> WddmMemoryManagerResidencyTest;
+typedef ::Test<MockWddmMemoryManagerFixture> WddmMemoryManagerResidencyTest;
 
 class ExecutionEnvironmentFixture : public ::testing::Test {
   public: