Skip to content

Commit bca8526

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Remove usage of TestLegacy from opencl tests
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 44d218e commit bca8526

File tree

350 files changed

+1295
-1315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+1295
-1315
lines changed

‎opencl/test/unit_test/accelerators/media_image_arg_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MediaImageSetArgTest : public ClDeviceFixture,
2727

2828
protected:
2929
void SetUp() override {
30-
ClDeviceFixture::SetUp();
30+
ClDeviceFixture::setUp();
3131
context = new MockContext(pClDevice);
3232

3333
pKernelInfo = std::make_unique<MockKernelInfo>();
@@ -63,7 +63,7 @@ class MediaImageSetArgTest : public ClDeviceFixture,
6363
delete pMultiDeviceKernel;
6464
program.reset();
6565
delete context;
66-
ClDeviceFixture::TearDown();
66+
ClDeviceFixture::tearDown();
6767
}
6868

6969
cl_int retVal = CL_SUCCESS;

‎opencl/test/unit_test/api/cl_api_tests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -19,7 +19,7 @@ void CL_CALLBACK notifyFuncProgram(
1919
void *userData) {
2020
*((char *)userData) = 'a';
2121
}
22-
void api_fixture_using_aligned_memory_manager::SetUp() {
22+
void ApiFixtureUsingAlignedMemoryManager::setUp() {
2323
retVal = CL_SUCCESS;
2424
retSize = 0;
2525

@@ -39,7 +39,7 @@ void api_fixture_using_aligned_memory_manager::SetUp() {
3939
ASSERT_NE(nullptr, kernel);
4040
}
4141

42-
void api_fixture_using_aligned_memory_manager::TearDown() {
42+
void ApiFixtureUsingAlignedMemoryManager::tearDown() {
4343
delete kernel;
4444
delete commandQueue;
4545
context->release();

‎opencl/test/unit_test/api/cl_api_tests.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace NEO {
2828
template <uint32_t rootDeviceIndex = 1u>
2929
struct ApiFixture {
3030

31-
virtual void SetUp() { // NOLINT(readability-identifier-naming)
31+
void setUp() {
3232
DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices);
3333
executionEnvironment = new ClExecutionEnvironment();
3434
prepareDeviceEnvironments(*executionEnvironment);
@@ -56,7 +56,7 @@ struct ApiFixture {
5656
ASSERT_NE(nullptr, pKernel);
5757
}
5858

59-
virtual void TearDown() { // NOLINT(readability-identifier-naming)
59+
void tearDown() {
6060
pMultiDeviceKernel->release();
6161
pCommandQueue->release();
6262
pContext->release();
@@ -95,17 +95,17 @@ struct ApiFixture {
9595
struct api_tests : public ApiFixture<>,
9696
public ::testing::Test {
9797
void SetUp() override {
98-
ApiFixture::SetUp();
98+
ApiFixture::setUp();
9999
}
100100
void TearDown() override {
101-
ApiFixture::TearDown();
101+
ApiFixture::tearDown();
102102
}
103103
};
104104

105-
struct api_fixture_using_aligned_memory_manager {
105+
struct ApiFixtureUsingAlignedMemoryManager {
106106
public:
107-
virtual void SetUp(); // NOLINT(readability-identifier-naming)
108-
virtual void TearDown(); // NOLINT(readability-identifier-naming)
107+
void setUp();
108+
void tearDown();
109109

110110
cl_int retVal;
111111
size_t retSize;
@@ -117,7 +117,7 @@ struct api_fixture_using_aligned_memory_manager {
117117
MockClDevice *device;
118118
};
119119

120-
using api_test_using_aligned_memory_manager = TestLegacy<api_fixture_using_aligned_memory_manager>;
120+
using api_test_using_aligned_memory_manager = Test<ApiFixtureUsingAlignedMemoryManager>;
121121

122122
void CL_CALLBACK notifyFuncProgram(
123123
cl_program program,

‎opencl/test/unit_test/api/cl_create_buffer_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ namespace ClCreateBufferTests {
2626
class ClCreateBufferTemplateTests : public ApiFixture<>,
2727
public testing::TestWithParam<uint64_t> {
2828
void SetUp() override {
29-
ApiFixture::SetUp();
29+
ApiFixture::setUp();
3030
}
3131

3232
void TearDown() override {
33-
ApiFixture::TearDown();
33+
ApiFixture::tearDown();
3434
}
3535
};
3636

‎opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ struct CommandQueueWithPropertiesTest : public ApiFixture<>,
3434

3535
void SetUp() override {
3636
std::tie(commandQueueProperties, queueSize, queuePriority, queueThrottle) = GetParam();
37-
ApiFixture::SetUp();
37+
ApiFixture::setUp();
3838
}
3939

4040
void TearDown() override {
41-
ApiFixture::TearDown();
41+
ApiFixture::tearDown();
4242
}
4343

4444
cl_command_queue_properties commandQueueProperties = 0;
@@ -56,11 +56,11 @@ struct clCreateCommandQueueWithPropertiesApi : public ApiFixture<>,
5656
void SetUp() override {
5757
platformsImpl->clear();
5858
MemoryManagementFixture::setUp();
59-
ApiFixture::SetUp();
59+
ApiFixture::setUp();
6060
}
6161

6262
void TearDown() override {
63-
ApiFixture::TearDown();
63+
ApiFixture::tearDown();
6464
MemoryManagementFixture::tearDown();
6565
}
6666
};

‎opencl/test/unit_test/api/cl_create_context_from_type_tests.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
using namespace NEO;
1414

15-
struct clCreateContextFromTypeTests : TestLegacy<PlatformFixture> {
15+
struct clCreateContextFromTypeTests : Test<PlatformFixture> {
1616
cl_int retVal = CL_DEVICE_NOT_AVAILABLE;
1717
};
1818

‎opencl/test/unit_test/api/cl_create_image_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct clCreateImageTests : public ApiFixture<>,
2828
public T {
2929

3030
void SetUp() override {
31-
ApiFixture::SetUp();
31+
ApiFixture::setUp();
3232

3333
// clang-format off
3434
imageFormat.image_channel_order = CL_RGBA;
@@ -48,7 +48,7 @@ struct clCreateImageTests : public ApiFixture<>,
4848
}
4949

5050
void TearDown() override {
51-
ApiFixture::TearDown();
51+
ApiFixture::tearDown();
5252
}
5353

5454
cl_image_format imageFormat;

‎opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ struct clCreatePerfCountersCommandQueueINTELTests : public DeviceInstrumentation
2020
public PerformanceCountersDeviceFixture,
2121
::testing::Test {
2222
void SetUp() override {
23-
PerformanceCountersDeviceFixture::SetUp();
24-
DeviceInstrumentationFixture::SetUp(true);
23+
PerformanceCountersDeviceFixture::setUp();
24+
DeviceInstrumentationFixture::setUp(true);
2525

2626
deviceId = device.get();
2727
retVal = CL_SUCCESS;
2828
context = std::unique_ptr<Context>(Context::create<MockContext>(nullptr, ClDeviceVector(&deviceId, 1),
2929
nullptr, nullptr, retVal));
3030
}
3131
void TearDown() override {
32-
PerformanceCountersDeviceFixture::TearDown();
32+
PerformanceCountersDeviceFixture::tearDown();
3333
}
3434

3535
std::unique_ptr<Context> context;

‎opencl/test/unit_test/api/cl_create_pipe_tests.inl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ namespace ClCreatePipeTests {
2525

2626
class ClCreatePipeWithParamTests : public ApiFixture<>, public testing::TestWithParam<uint64_t> {
2727
void SetUp() override {
28-
ApiFixture::SetUp();
28+
ApiFixture::setUp();
2929
}
3030
void TearDown() override {
31-
ApiFixture::TearDown();
31+
ApiFixture::tearDown();
3232
}
3333
VariableBackup<bool> supportsPipesBackup{&defaultHwInfo->capabilityTable.supportsPipes, true};
3434
};
3535

3636
class ClCreatePipeWithParamNegativeTests : public ApiFixture<>, public testing::TestWithParam<uint64_t> {
3737
void SetUp() override {
38-
ApiFixture::SetUp();
38+
ApiFixture::setUp();
3939
}
4040
void TearDown() override {
41-
ApiFixture::TearDown();
41+
ApiFixture::tearDown();
4242
}
4343
VariableBackup<bool> supportsPipesBackup{&defaultHwInfo->capabilityTable.supportsPipes, true};
4444
};

‎opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -23,11 +23,11 @@ struct SamplerWithPropertiesTest : public ApiFixture<>,
2323

2424
void SetUp() override {
2525
std::tie(NormalizdProperties, AddressingProperties, FilterProperties) = GetParam();
26-
ApiFixture::SetUp();
26+
ApiFixture::setUp();
2727
}
2828

2929
void TearDown() override {
30-
ApiFixture::TearDown();
30+
ApiFixture::tearDown();
3131
}
3232

3333
cl_sampler_properties NormalizdProperties = 0;

0 commit comments

Comments
 (0)