From 55fad237b817bd0d2eeb6b3c230f046e44013f21 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 28 May 2024 15:09:20 +0000 Subject: [PATCH] test: update gtest API usage use *_TEST_SUITE* instead of *_TEST_CASE* Signed-off-by: Mateusz Jablonski --- .../sources/debugger/test_l0_debugger_1.cpp | 2 +- .../sources/debugger/test_l0_debugger_2.cpp | 2 +- .../test_l0_debugger_sba_tracking.cpp | 2 +- .../helper/properties_parser_tests.cpp | 4 +- .../unit_tests/sources/image/test_image.cpp | 2 +- .../unit_tests/sources/kernel/test_kernel.cpp | 2 +- .../sources/kernel/test_kernel_2.cpp | 4 +- .../sources/sampler/test_sampler.cpp | 10 +-- .../xe_hpc_core/test_device_xe_hpc_core.cpp | 4 +- .../linux/xe/test_debug_api_linux_xe.cpp | 2 +- .../metrics/test_metric_oa_enumeration_1.cpp | 12 +-- .../unit_test/api/cl_create_buffer_tests.cpp | 12 +-- ...te_command_queue_with_properties_tests.cpp | 28 +++---- .../unit_test/api/cl_create_image_tests.cpp | 44 +++++------ .../unit_test/api/cl_create_pipe_tests.inl | 6 +- ...l_create_sampler_with_properties_tests.inl | 14 ++-- .../api/cl_create_sub_buffer_tests.inl | 6 +- .../unit_test/api/cl_enqueue_image_tests.inl | 4 +- .../api/cl_enqueue_map_buffer_tests.inl | 6 +- .../unit_test/api/cl_enqueue_marker_tests.inl | 4 +- .../api/cl_enqueue_read_buffer_rect_tests.inl | 4 +- .../api/cl_enqueue_read_buffer_tests.inl | 4 +- .../api/cl_get_device_info_tests.inl | 4 +- ...cl_get_kernel_sub_group_info_khr_tests.inl | 20 ++--- .../cl_get_kernel_sub_group_info_tests.inl | 38 +++++----- .../cl_get_kernel_work_group_info_tests.inl | 2 +- .../api/cl_get_platform_info_tests.inl | 14 ++-- .../unit_test/api/cl_release_event_tests.inl | 22 +++--- .../test/unit_test/api/cl_svm_alloc_tests.inl | 8 +- .../api/gl/cl_get_gl_device_info_tests.cpp | 4 +- .../aub_mem_dump/cl_aub_alloc_dump_tests.cpp | 20 ++--- .../compression_aub_tests_xehp_and_later.cpp | 16 ++-- .../enqueue_copy_buffer_aub_tests.cpp | 26 +++---- .../enqueue_copy_buffer_rect_aub_tests.cpp | 20 ++--- .../enqueue_copy_image_aub_tests.cpp | 30 ++++---- .../enqueue_fill_buffer_aub_tests.cpp | 14 ++-- .../enqueue_fill_image_aub_tests.cpp | 24 +++--- .../enqueue_kernel_aub_tests.cpp | 4 +- .../enqueue_map_image_aub_tests.cpp | 4 +- .../enqueue_read_buffer_aub_tests.cpp | 16 ++-- .../enqueue_read_buffer_rect_aub_tests.cpp | 12 +-- .../enqueue_read_image_aub_tests.cpp | 6 +- ...enqueue_verify_memory_buffer_aub_tests.cpp | 12 +-- .../enqueue_verify_memory_image_aub_tests.cpp | 8 +- .../enqueue_write_buffer_aub_tests.cpp | 14 ++-- .../enqueue_write_buffer_rect_aub_tests.cpp | 10 +-- .../enqueue_write_image_aub_tests.cpp | 34 ++++----- ..._walker_partition_tests_xehp_and_later.cpp | 2 +- .../mem_obj/create_image_aub_tests.cpp | 6 +- .../unified_memory_copy_aub_tests.cpp | 10 +-- .../copy_engine_aub_tests_xe_hpc_core.cpp | 6 +- ...less_compression_aub_tests_xe_hpc_core.cpp | 18 ++--- ...ateless_compression_in_sba_xe_hpg_core.cpp | 16 ++-- .../unit_test/built_ins/built_in_tests.cpp | 6 +- .../command_queue/command_queue_tests.cpp | 26 +++---- .../command_queue/dispatch_walker_tests.cpp | 6 +- .../enqueue_copy_buffer_to_image_tests.cpp | 6 +- .../enqueue_copy_image_tests.cpp | 12 +-- .../enqueue_copy_image_to_buffer_tests.cpp | 6 +- .../enqueue_fill_buffer_negative_tests.cpp | 8 +- .../command_queue/enqueue_kernel_2_tests.cpp | 28 +++---- .../command_queue/enqueue_map_image_tests.cpp | 4 +- .../enqueue_read_image_tests.cpp | 4 +- .../enqueue_svm_mem_fill_tests.cpp | 6 +- .../command_queue/enqueue_waitlist_tests.cpp | 6 +- .../enqueue_write_image_tests.cpp | 6 +- .../get_command_queue_info_tests.cpp | 4 +- .../command_queue/oom_buffer_tests.cpp | 4 +- .../command_queue/oom_image_tests.cpp | 4 +- .../unit_test/command_queue/oom_tests.cpp | 4 +- .../command_queue/ooq_task_tests.cpp | 12 +-- .../command_queue/work_group_size_tests.cpp | 34 ++++----- ...and_stream_receiver_flush_task_1_tests.cpp | 4 +- .../command_stream_receiver_hw_1_tests.cpp | 10 +-- .../create_command_stream_receiver_tests.cpp | 2 +- .../test/unit_test/context/context_tests.cpp | 6 +- .../driver_diagnostics_enqueue_tests.cpp | 10 +-- .../context/driver_diagnostics_tests.cpp | 8 +- .../get_supported_image_formats_tests.cpp | 10 +-- .../test/unit_test/d3d_sharing/d3d9_tests.cpp | 4 +- .../unit_test/d3d_sharing/d3d_aux_tests.cpp | 22 +++--- .../unit_test/d3d_sharing/d3d_tests_part1.cpp | 74 +++++++++---------- .../unit_test/d3d_sharing/d3d_tests_part2.cpp | 64 ++++++++-------- opencl/test/unit_test/device/device_tests.cpp | 2 +- .../device/get_device_info_size_tests.cpp | 4 +- .../device/get_device_info_tests.cpp | 4 +- opencl/test/unit_test/event/event_tests.cpp | 6 +- .../gmm_helper/gmm_helper_tests_ocl.cpp | 2 +- .../unit_test/helpers/base_object_tests.cpp | 4 +- .../test/unit_test/helpers/mipmap_tests.cpp | 48 ++++++------ .../unit_test/helpers/validator_tests.cpp | 20 ++--- .../unit_test/kernel/kernel_arg_svm_tests.cpp | 2 +- .../kernel/kernel_immediate_arg_tests.cpp | 4 +- .../unit_test/kernel/kernel_slm_tests.cpp | 4 +- opencl/test/unit_test/kernel/kernel_tests.cpp | 6 +- .../test/unit_test/mem_obj/buffer_tests.cpp | 10 +-- .../mem_obj/create_image_format_tests.cpp | 8 +- .../test/unit_test/mem_obj/image1d_tests.cpp | 4 +- .../test/unit_test/mem_obj/image2d_tests.cpp | 4 +- .../mem_obj/image_array_size_tests.cpp | 10 +-- .../unit_test/mem_obj/image_format_tests.cpp | 4 +- .../mem_obj/image_redescribe_tests.cpp | 4 +- .../unit_test/mem_obj/image_snorm_tests.cpp | 6 +- opencl/test/unit_test/mem_obj/image_tests.cpp | 30 ++++---- .../unit_test/mem_obj/image_tiled_tests.cpp | 6 +- .../mem_obj/image_validate_tests.cpp | 54 +++++++------- .../mem_obj/map_operations_handler_tests.cpp | 8 +- .../mem_obj/mem_obj_destruction_tests.cpp | 4 +- .../mem_obj/packed_yuv_image_tests.cpp | 4 +- .../unit_test/mem_obj/zero_copy_tests.cpp | 4 +- .../deferred_deleter_clear_queue_mt_tests.cpp | 8 +- .../pvc/offline_compiler_tests_pvc.cpp | 6 +- .../dg2/offline_compiler_tests_dg2.cpp | 4 +- .../mtl/offline_compiler_tests_mtl.cpp | 4 +- .../performance_counters_tests.cpp | 4 +- opencl/test/unit_test/program/kernel_data.cpp | 8 +- .../program/process_elf_binary_tests.cpp | 8 +- .../test/unit_test/program/program_tests.cpp | 2 +- .../sampler/get_sampler_info_tests.cpp | 4 +- .../sampler/sampler_set_arg_tests.cpp | 20 ++--- .../test/unit_test/sampler/sampler_tests.cpp | 26 +++---- .../sharings/gl/linux/gl_types_tests.cpp | 6 +- .../windows/gl_create_from_texture_tests.cpp | 4 +- .../sharings/gl/windows/gl_texture_tests.cpp | 2 +- .../sharings/gl/windows/gl_types_tests.cpp | 6 +- .../sharings/va/va_base_object_tests.cpp | 4 +- .../command_container_tests.cpp | 2 +- .../command_stream_receiver_tests.cpp | 2 +- ...nd_stream_receiver_with_aub_dump_tests.cpp | 2 +- .../unit_test/debugger/test_l0_debugger.cpp | 4 +- .../test_l0_debugger_single_address_space.cpp | 2 +- .../linux/product_helper_tests_icllp.cpp | 4 +- .../lkf/linux/product_helper_tests_lkf.cpp | 4 +- .../adlp/linux/product_helper_tests_adlp.cpp | 4 +- .../gen12lp/dg1/hw_info_tests_dg1.cpp | 4 +- .../dg1/linux/product_helper_tests_dg1.cpp | 4 +- .../linux/product_helper_tests_tgllp.cpp | 4 +- .../bdw/linux/product_helper_tests_bdw.cpp | 4 +- .../bxt/linux/product_helper_tests_bxt.cpp | 4 +- .../cfl/linux/product_helper_tests_cfl.cpp | 4 +- .../glk/linux/product_helper_tests_glk.cpp | 4 +- .../kbl/linux/product_helper_tests_kbl.cpp | 4 +- .../skl/linux/product_helper_tests_skl.cpp | 4 +- .../helpers/aligned_memory_tests.cpp | 10 +-- .../unit_test/helpers/app_resource_tests.cpp | 2 +- .../unit_test/helpers/basic_math_tests.cpp | 8 +- .../helpers/blit_commands_helper_tests.cpp | 28 +++---- .../unit_test/helpers/flattened_id_tests.cpp | 16 ++-- .../test/unit_test/helpers/local_id_tests.cpp | 20 ++--- .../test/unit_test/helpers/matcher_tests.cpp | 8 +- ...est_blit_commands_helper_pvc_and_later.cpp | 12 +-- ...nager_allocate_in_preferred_pool_tests.cpp | 42 +++++------ .../memory_manager_multi_device_tests.cpp | 4 +- .../memory_manager/memory_manager_tests.cpp | 6 +- .../memory_manager/surface_tests.cpp | 4 +- ...m_memory_manager_localmem_prelim_tests.cpp | 6 +- .../linux/drm_memory_manager_tests.cpp | 6 +- .../windows/device_command_stream_tests.cpp | 2 +- .../unit_test/preemption/preemption_tests.cpp | 6 +- .../unit_test/program/printf_helper_tests.cpp | 68 ++++++++--------- .../utilities/software_tags_manager_tests.cpp | 2 +- .../arl/hw_aot_config_tests_arl.cpp | 10 +-- .../mtl/hw_aot_config_tests_mtl.cpp | 10 +-- 163 files changed, 865 insertions(+), 865 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp index c3e025ca4d..5e320d0747 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp @@ -645,7 +645,7 @@ HWTEST2_F(L0DebuggerTest, givenDebugIsActiveThenDisableL3CacheInGmmHelperIsSet, EXPECT_EQ(disableL3CacheForDebug, static_cast(neoDevice->getGmmHelper())->allResourcesUncached); } -INSTANTIATE_TEST_CASE_P(SBAModesForDebugger, L0DebuggerParameterizedTests, ::testing::Values(0, 1)); +INSTANTIATE_TEST_SUITE_P(SBAModesForDebugger, L0DebuggerParameterizedTests, ::testing::Values(0, 1)); struct MockKernelImmutableData : public KernelImmutableData { using KernelImmutableData::isaGraphicsAllocation; diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp index 63ad75224c..90d8dbe3a6 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp @@ -646,7 +646,7 @@ HWTEST_P(L0DebuggerWithBlitterTest, givenDebuggingEnabledWhenCommandListIsExecut commandQueue->destroy(); } -INSTANTIATE_TEST_CASE_P(SBAModesForDebugger, L0DebuggerWithBlitterTest, ::testing::Values(0, 1)); +INSTANTIATE_TEST_SUITE_P(SBAModesForDebugger, L0DebuggerWithBlitterTest, ::testing::Values(0, 1)); } // namespace ult } // namespace L0 diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp index 81ac052205..d3f7bda202 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp @@ -395,7 +395,7 @@ HWTEST2_F(L0DebuggerTest, givenDebugerEnabledWhenPrepareAndSubmitBatchBufferThen EXPECT_TRUE(isLeftoverZeroed); } -INSTANTIATE_TEST_CASE_P(SBAModesForDebugger, L0DebuggerParameterizedTests, ::testing::Values(0, 1)); +INSTANTIATE_TEST_SUITE_P(SBAModesForDebugger, L0DebuggerParameterizedTests, ::testing::Values(0, 1)); struct L0DebuggerSingleAddressSpace : public Test { void SetUp() override { diff --git a/level_zero/core/test/unit_tests/sources/helper/properties_parser_tests.cpp b/level_zero/core/test/unit_tests/sources/helper/properties_parser_tests.cpp index 6966c8f8b8..5e56b8f49a 100644 --- a/level_zero/core/test/unit_tests/sources/helper/properties_parser_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/helper/properties_parser_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -32,7 +32,7 @@ std::pair validTypes[] = { {ZE_IMAGE_TYPE_1DARRAY, NEO::ImageType::image1DArray}, {ZE_IMAGE_TYPE_BUFFER, NEO::ImageType::image1DBuffer}}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( imageTypeFlags, ImageStaticFunctionConvertTypeTest, testing::ValuesIn(validTypes)); diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index a094008fe5..7ce6f41e2c 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -789,7 +789,7 @@ std::pair validFormats[] = { {ZE_IMAGE_FORMAT_LAYOUT_RGBP, ZE_IMAGE_FORMAT_TYPE_UNORM}, {ZE_IMAGE_FORMAT_LAYOUT_BRGP, ZE_IMAGE_FORMAT_TYPE_UNORM}}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( validImageFormats, TestImageFormats, testing::ValuesIn(validFormats)); diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index 41755a9f7f..fc1bd20bb9 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -841,7 +841,7 @@ std::pair kernelIsaCopyingPairs[] = { {1, 1}, {static_cast(MemoryConstants::pageSize64k + 1), 0}}; // pageSize64 is a common upper-bound for both system and local memory -INSTANTIATE_TEST_CASE_P(, KernelIsaCopyingMomentTest, testing::ValuesIn(kernelIsaCopyingPairs)); +INSTANTIATE_TEST_SUITE_P(, KernelIsaCopyingMomentTest, testing::ValuesIn(kernelIsaCopyingPairs)); TEST_P(KernelIsaCopyingMomentTest, givenInternalModuleWhenKernelIsCreatedThenIsaCopiedDuringLinkingOnlyIfCanFitInACommonParentPage) { auto [testKernelHeapSize, numberOfCopiesToAllocationAtModuleInitialization] = GetParam(); diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp index c12a9a7f98..a617427703 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp @@ -228,8 +228,8 @@ class KernelImpSuggestGroupSize : public DeviceFixture, public ::testing::TestWi } }; -INSTANTIATE_TEST_CASE_P(, KernelImpSuggestGroupSize, - ::testing::Values(4, 7, 8, 16, 32, 192, 1024, 4097, 16000)); +INSTANTIATE_TEST_SUITE_P(, KernelImpSuggestGroupSize, + ::testing::Values(4, 7, 8, 16, 32, 192, 1024, 4097, 16000)); TEST_P(KernelImpSuggestGroupSize, WhenSuggestingGroupThenProperGroupSizeChosen) { DebugManagerStateRestore restorer; diff --git a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp index 58d72cc158..20cf5e5083 100644 --- a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp +++ b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -146,10 +146,10 @@ HWTEST2_P(SamplerCreateTest, givenDifferentDescriptorValuesThenSamplerIsCorrectl sampler->destroy(); } -INSTANTIATE_TEST_CASE_P(SamplerDescCombinations, SamplerCreateTest, - ::testing::Combine(samplerAddressMode, - samplerFilterMode, - samplerIsNormalized)); +INSTANTIATE_TEST_SUITE_P(SamplerDescCombinations, SamplerCreateTest, + ::testing::Combine(samplerAddressMode, + samplerFilterMode, + samplerIsNormalized)); using ContextCreateSamplerTest = Test; diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp index 9cde788c45..c2cd50d0ad 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -740,7 +740,7 @@ HWTEST2_P(CommandQueueGroupTestXeHpc, givenVaryingBlitterSupportAndCCSThenBCSGro } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CommandQueueGroupTestXeHpcValues, CommandQueueGroupTestXeHpc, testing::Values(0, 1, 2, 3)); diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp index ff95a3aaf4..5e117fd18f 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp @@ -1291,7 +1291,7 @@ static uint64_t metadataTypes[] = WORK_IN_PROGRESS_DRM_XE_DEBUG_METADATA_SIP_AREA, DRM_XE_DEBUG_METADATA_ELF_BINARY}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MetadataOpEventUfenceTest, DebugApiLinuxTestXeMetadataOpEventTest, testing::ValuesIn(metadataTypes)); diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp index 94afca88fc..fe8163add2 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -2497,8 +2497,8 @@ getListOfMetricTypes() { return metricTypes; } -INSTANTIATE_TEST_CASE_P(parameterizedMetricEnumerationTestMetricTypes, MetricEnumerationTestMetricTypes, - ::testing::ValuesIn(getListOfMetricTypes())); +INSTANTIATE_TEST_SUITE_P(parameterizedMetricEnumerationTestMetricTypes, MetricEnumerationTestMetricTypes, + ::testing::ValuesIn(getListOfMetricTypes())); class MetricEnumerationTestInformationTypes : public MetricEnumerationTest, public ::testing::WithParamInterface { @@ -2604,9 +2604,9 @@ getListOfInfoTypes() { return infoTypes; } -INSTANTIATE_TEST_CASE_P(parameterizedMetricEnumerationTestInformationTypes, - MetricEnumerationTestInformationTypes, - ::testing::ValuesIn(getListOfInfoTypes())); +INSTANTIATE_TEST_SUITE_P(parameterizedMetricEnumerationTestInformationTypes, + MetricEnumerationTestInformationTypes, + ::testing::ValuesIn(getListOfInfoTypes())); TEST_F(MetricEnumerationTest, givenMetricSetWhenActivateIsCalledActivateReturnsTrue) { diff --git a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp index 5afcb6bf4e..4153cd7243 100644 --- a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -64,7 +64,7 @@ static cl_mem_flags validFlags[] = { CL_MEM_HOST_NO_ACCESS, CL_MEM_FORCE_HOST_MEMORY_INTEL}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateBufferCheckFlags, ClCreateBufferValidFlagsTests, testing::ValuesIn(validFlags)); @@ -100,7 +100,7 @@ cl_mem_flags invalidFlags[] = { 0xffcc, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateBufferCheckFlags, clCreateBufferInvalidFlagsTests, testing::ValuesIn(invalidFlags)); @@ -122,7 +122,7 @@ static cl_mem_flags validFlagsIntel[] = { CL_MEM_LOCALLY_UNCACHED_SURFACE_STATE_RESOURCE, CL_MEM_48BIT_RESOURCE_INTEL}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateBufferCheckFlagsIntel, clCreateBufferValidFlagsIntelTests, testing::ValuesIn(validFlagsIntel)); @@ -141,7 +141,7 @@ cl_mem_flags invalidFlagsIntel[] = { 0xffcc, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateBufferCheckFlagsIntel, clCreateBufferInvalidFlagsIntelTests, testing::ValuesIn(invalidFlagsIntel)); @@ -576,7 +576,7 @@ static cl_mem_flags validFlagsForMultiDeviceContextBuffer[] = { CL_MEM_USE_HOST_PTR, CL_MEM_COPY_HOST_PTR, 0}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateBufferWithMultiDeviceContextCheckFlags, clCreateBufferWithMultiDeviceContextTests, testing::ValuesIn(validFlagsForMultiDeviceContextBuffer)); 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 87b6c18879..a63d8d30ea 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -159,13 +159,13 @@ cl_queue_throttle_khr queueThrottles[] = CL_QUEUE_THROTTLE_MED_KHR, CL_QUEUE_THROTTLE_HIGH_KHR}; -INSTANTIATE_TEST_CASE_P(api, - clCreateCommandQueueWithPropertiesTests, - ::testing::Combine( - ::testing::ValuesIn(commandQueueProperties), - ::testing::ValuesIn(queueSizes), - ::testing::ValuesIn(queuePriorities), - ::testing::ValuesIn(queueThrottles))); +INSTANTIATE_TEST_SUITE_P(api, + clCreateCommandQueueWithPropertiesTests, + ::testing::Combine( + ::testing::ValuesIn(commandQueueProperties), + ::testing::ValuesIn(queueSizes), + ::testing::ValuesIn(queuePriorities), + ::testing::ValuesIn(queueThrottles))); TEST_F(ClCreateCommandQueueWithPropertiesApi, GivenNullContextWhenCreatingCommandQueueWithPropertiesThenInvalidContextErrorIsReturned) { cl_int retVal = CL_SUCCESS; @@ -496,9 +496,9 @@ TEST_P(ClCreateCommandQueueWithPropertiesApiPriority, GivenValidPriorityWhenCrea EXPECT_EQ(retVal, CL_SUCCESS); } -INSTANTIATE_TEST_CASE_P(AllValidPriorities, - ClCreateCommandQueueWithPropertiesApiPriority, - ::testing::ValuesIn(priorityParams)); +INSTANTIATE_TEST_SUITE_P(AllValidPriorities, + ClCreateCommandQueueWithPropertiesApiPriority, + ::testing::ValuesIn(priorityParams)); std::pair throttleParams[3]{ std::make_pair(CL_QUEUE_THROTTLE_LOW_KHR, QueueThrottle::LOW), @@ -523,8 +523,8 @@ TEST_P(ClCreateCommandQueueWithPropertiesApiThrottle, GivenThrottlePropertiesWhe EXPECT_EQ(retVal, CL_SUCCESS); } -INSTANTIATE_TEST_CASE_P(AllValidThrottleValues, - ClCreateCommandQueueWithPropertiesApiThrottle, - ::testing::ValuesIn(throttleParams)); +INSTANTIATE_TEST_SUITE_P(AllValidThrottleValues, + ClCreateCommandQueueWithPropertiesApiThrottle, + ::testing::ValuesIn(throttleParams)); } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp index ac14dd3939..d5e0e29832 100644 --- a/opencl/test/unit_test/api/cl_create_image_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -642,9 +642,9 @@ static cl_mem_flags validFlags[] = { CL_MEM_ACCESS_FLAGS_UNRESTRICTED_INTEL, }; -INSTANTIATE_TEST_CASE_P(CreateImageWithFlags, - clCreateImageValidFlags, - ::testing::ValuesIn(validFlags)); +INSTANTIATE_TEST_SUITE_P(CreateImageWithFlags, + clCreateImageValidFlags, + ::testing::ValuesIn(validFlags)); TEST_P(clCreateImageValidFlags, GivenValidFlagsWhenCreatingImageThenImageIsCreatedAndSuccessReturned) { REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext); @@ -688,9 +688,9 @@ static cl_mem_flags invalidFlagsCombinations[] = { CL_MEM_NO_ACCESS_INTEL | CL_MEM_WRITE_ONLY, CL_MEM_NO_ACCESS_INTEL | CL_MEM_READ_ONLY}; -INSTANTIATE_TEST_CASE_P(CreateImageWithFlags, - clCreateImageInvalidFlags, - ::testing::ValuesIn(invalidFlagsCombinations)); +INSTANTIATE_TEST_SUITE_P(CreateImageWithFlags, + clCreateImageInvalidFlags, + ::testing::ValuesIn(invalidFlagsCombinations)); TEST_P(clCreateImageInvalidFlags, GivenInvalidFlagsCombinationsWhenCreatingImageThenInvalidValueErrorIsReturned) { REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext); @@ -753,9 +753,9 @@ static ImageFlags flagsWithUnrestrictedIntel[] = { typedef ClCreateImageTests<::testing::TestWithParam> clCreateImageFlagsUnrestrictedIntel; -INSTANTIATE_TEST_CASE_P(CreateImageWithFlags, - clCreateImageFlagsUnrestrictedIntel, - ::testing::ValuesIn(flagsWithUnrestrictedIntel)); +INSTANTIATE_TEST_SUITE_P(CreateImageWithFlags, + clCreateImageFlagsUnrestrictedIntel, + ::testing::ValuesIn(flagsWithUnrestrictedIntel)); TEST_P(clCreateImageFlagsUnrestrictedIntel, GivenFlagsIncludingUnrestrictedIntelWhenCreatingImageThenImageIsCreatedAndSuccessReturned) { REQUIRE_IMAGES_OR_SKIP(pContext); @@ -804,9 +804,9 @@ static ImageFlags validFlagsAndParentFlags[] = { typedef ClCreateImageTests<::testing::TestWithParam> clCreateImageValidFlagsAndParentFlagsCombinations; -INSTANTIATE_TEST_CASE_P(CreateImageWithFlags, - clCreateImageValidFlagsAndParentFlagsCombinations, - ::testing::ValuesIn(validFlagsAndParentFlags)); +INSTANTIATE_TEST_SUITE_P(CreateImageWithFlags, + clCreateImageValidFlagsAndParentFlagsCombinations, + ::testing::ValuesIn(validFlagsAndParentFlags)); TEST_P(clCreateImageValidFlagsAndParentFlagsCombinations, GivenValidFlagsAndParentFlagsWhenCreatingImageThenImageIsCreatedAndSuccessReturned) { REQUIRE_IMAGES_OR_SKIP(pContext); @@ -860,9 +860,9 @@ static ImageFlags invalidFlagsAndParentFlags[] = { typedef ClCreateImageTests<::testing::TestWithParam> clCreateImageInvalidFlagsAndParentFlagsCombinations; -INSTANTIATE_TEST_CASE_P(CreateImageWithFlags, - clCreateImageInvalidFlagsAndParentFlagsCombinations, - ::testing::ValuesIn(invalidFlagsAndParentFlags)); +INSTANTIATE_TEST_SUITE_P(CreateImageWithFlags, + clCreateImageInvalidFlagsAndParentFlagsCombinations, + ::testing::ValuesIn(invalidFlagsAndParentFlags)); TEST_P(clCreateImageInvalidFlagsAndParentFlagsCombinations, GivenInvalidFlagsAndParentFlagsWhenCreatingImageThenInvalidMemObjectErrorIsReturned) { REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext); @@ -912,9 +912,9 @@ ImageSizes validImage2DSizes[] = {{64, 64, 1}, {3, 3, 1}, {8192, 1, 1}, {117, 39 typedef ClCreateImageTests<::testing::TestWithParam> clCreateImageValidSizesTest; -INSTANTIATE_TEST_CASE_P(validImage2DSizes, - clCreateImageValidSizesTest, - ::testing::ValuesIn(validImage2DSizes)); +INSTANTIATE_TEST_SUITE_P(validImage2DSizes, + clCreateImageValidSizesTest, + ::testing::ValuesIn(validImage2DSizes)); TEST_P(clCreateImageValidSizesTest, GivenValidSizesWhenCreatingImageThenImageIsCreatedAndSuccessReturned) { REQUIRE_IMAGE_SUPPORT_OR_SKIP(pContext); @@ -1358,9 +1358,9 @@ TEST_P(ClCreateNon2dImageFromImageTest, GivenImage2dWhenCreatingImageFromNon2dIm EXPECT_EQ(nullptr, imageFromImageObject); } -INSTANTIATE_TEST_CASE_P(clCreateNon2dImageFromImageTests, - ClCreateNon2dImageFromImageTest, - ::testing::ValuesIn(non2dImageTypes)); +INSTANTIATE_TEST_SUITE_P(clCreateNon2dImageFromImageTests, + ClCreateNon2dImageFromImageTest, + ::testing::ValuesIn(non2dImageTypes)); using clCreateImageWithMultiDeviceContextTests = MultiRootDeviceFixture; diff --git a/opencl/test/unit_test/api/cl_create_pipe_tests.inl b/opencl/test/unit_test/api/cl_create_pipe_tests.inl index cabb246fcb..ac57280432 100644 --- a/opencl/test/unit_test/api/cl_create_pipe_tests.inl +++ b/opencl/test/unit_test/api/cl_create_pipe_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -91,12 +91,12 @@ static cl_mem_flags invalidFlags[] = { CL_MEM_USE_HOST_PTR | CL_MEM_ALLOC_HOST_PTR, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreatePipeCheckFlags, ClCreatePipeWithParamTests, testing::ValuesIn(validFlags)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreatePipeCheckFlagsNegative, ClCreatePipeWithParamNegativeTests, testing::ValuesIn(invalidFlags)); diff --git a/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl b/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl index a2fd58702a..a23c90807d 100644 --- a/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -233,12 +233,12 @@ static cl_sampler_properties filterProperties[] = CL_FILTER_LINEAR, }; -INSTANTIATE_TEST_CASE_P(api, - ClCreateSamplerWithPropertiesTests2, - ::testing::Combine( - ::testing::ValuesIn(normalizdProperties), - ::testing::ValuesIn(addressingProperties), - ::testing::ValuesIn(filterProperties))); +INSTANTIATE_TEST_SUITE_P(api, + ClCreateSamplerWithPropertiesTests2, + ::testing::Combine( + ::testing::ValuesIn(normalizdProperties), + ::testing::ValuesIn(addressingProperties), + ::testing::ValuesIn(filterProperties))); TEST_F(ClCreateSamplerWithPropertiesTests, GivenMipMapDataWhenCreatingSamplerWithPropertiesThenSamplerIsCreatedAndCorrectlyPopulated) { SamplerLodProperty minLodProperty; diff --git a/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl index 98cd2d9b34..749974f476 100644 --- a/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -66,7 +66,7 @@ static cl_mem_flags validFlags[] = { CL_MEM_HOST_NO_ACCESS, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateSubBufferCheckFlags, ClCreateSubBufferValidFlagsNoHostPtrTests, testing::ValuesIn(validFlags)); @@ -96,7 +96,7 @@ cl_mem_flags invalidFlags[] = { 0xffcc, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateSubBufferCheckFlags, ClCreateSubBufferInvalidFlagsHostPtrTests, testing::ValuesIn(invalidFlags)); diff --git a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl index fc6294e507..49c503296d 100644 --- a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -200,7 +200,7 @@ ImageEnqueueCall enqueueFunctions[8] = { &ValidateRegionAndOriginTests::mapImage, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ValidateRegionAndOriginTests, ValidateRegionAndOriginTests, ::testing::ValuesIn(enqueueFunctions)); diff --git a/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl index fd2368c69d..2cee4d592e 100644 --- a/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -194,7 +194,7 @@ static cl_mem_flags noReadAccessFlags[] = { CL_MEM_USE_HOST_PTR | CL_MEM_HOST_WRITE_ONLY, CL_MEM_USE_HOST_PTR | CL_MEM_HOST_NO_ACCESS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( EnqueueMapBufferFlagsTests_Create, EnqueueMapReadBufferTests, testing::ValuesIn(noReadAccessFlags)); @@ -223,7 +223,7 @@ static cl_mem_flags noWriteAccessFlags[] = { CL_MEM_USE_HOST_PTR | CL_MEM_HOST_READ_ONLY, CL_MEM_USE_HOST_PTR | CL_MEM_HOST_NO_ACCESS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( EnqueueMapBufferFlagsTests_Create, EnqueueMapWriteBufferTests, testing::ValuesIn(noWriteAccessFlags)); diff --git a/opencl/test/unit_test/api/cl_enqueue_marker_tests.inl b/opencl/test/unit_test/api/cl_enqueue_marker_tests.inl index 3ba0df86fb..3c6a760f52 100644 --- a/opencl/test/unit_test/api/cl_enqueue_marker_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_marker_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -57,7 +57,7 @@ static unsigned int commandWithoutKernelTypes[] = { CL_COMMAND_SVM_UNMAP, CL_COMMAND_SVM_FREE}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( commandWithoutKernelTypes, CommandWithoutKernelTypesTests, testing::ValuesIn(commandWithoutKernelTypes)); diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl index cdc9ade40a..2d40fcfe63 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -334,7 +334,7 @@ static cl_mem_flags readBufferRectFlags[] = { CL_MEM_USE_HOST_PTR | CL_MEM_HOST_WRITE_ONLY, CL_MEM_USE_HOST_PTR | CL_MEM_HOST_NO_ACCESS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( EnqueueReadBufferRectFlagsTests_Create, EnqueueReadReadBufferRectTests, testing::ValuesIn(readBufferRectFlags)); diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl index 29acd94edc..0dae41c530 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -129,7 +129,7 @@ static cl_mem_flags readBufferFlags[] = { CL_MEM_USE_HOST_PTR | CL_MEM_HOST_WRITE_ONLY, CL_MEM_USE_HOST_PTR | CL_MEM_HOST_NO_ACCESS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( EnqueueReadBufferFlagsTests_Create, EnqueueReadReadBufferTests, testing::ValuesIn(readBufferFlags)); diff --git a/opencl/test/unit_test/api/cl_get_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl index 47caa978a0..ac3e70dc03 100644 --- a/opencl/test/unit_test/api/cl_get_device_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_info_tests.inl @@ -413,7 +413,7 @@ static cl_device_info deviceInfoStrParams[] = CL_DEVICE_VERSION, CL_DRIVER_VERSION}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( api, GetDeviceInfoStr, testing::ValuesIn(deviceInfoStrParams)); @@ -451,7 +451,7 @@ cl_device_info devicePreferredVector[] = { CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( api, GetDeviceInfoVectorWidth, testing::ValuesIn(devicePreferredVector)); diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl index 251b82a2f3..c7e939daaf 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -66,9 +66,9 @@ struct TestParam { typedef KernelSubGroupInfoKhrParamFixture KernelSubGroupInfoKhrReturnSizeTest; -INSTANTIATE_TEST_CASE_P(wgs, - KernelSubGroupInfoKhrReturnSizeTest, - ::testing::ValuesIn(kernelSubGroupInfoKhrWGS)); +INSTANTIATE_TEST_SUITE_P(wgs, + KernelSubGroupInfoKhrReturnSizeTest, + ::testing::ValuesIn(kernelSubGroupInfoKhrWGS)); TEST_P(KernelSubGroupInfoKhrReturnSizeTest, GivenLwsParameterWhenGettingMaxSubGroupSizeThenCorrectValueIsReturned) { paramValueSizeRet = 0; @@ -91,9 +91,9 @@ TEST_P(KernelSubGroupInfoKhrReturnSizeTest, GivenLwsParameterWhenGettingMaxSubGr typedef KernelSubGroupInfoKhrParamFixture KernelSubGroupInfoKhrReturnCountTest; -INSTANTIATE_TEST_CASE_P(wgs, - KernelSubGroupInfoKhrReturnCountTest, - ::testing::ValuesIn(kernelSubGroupInfoKhrWGS)); +INSTANTIATE_TEST_SUITE_P(wgs, + KernelSubGroupInfoKhrReturnCountTest, + ::testing::ValuesIn(kernelSubGroupInfoKhrWGS)); TEST_P(KernelSubGroupInfoKhrReturnCountTest, GivenLwsParameterWhenGettingSubGroupCountThenCorrectValueIsReturned) { paramValueSizeRet = 0; @@ -226,9 +226,9 @@ uint32_t /*cl_kernel_sub_group_info_khr*/ kernelSubGroupInfoKhrInputParams[] = { typedef KernelSubGroupInfoKhrParamFixture KernelSubGroupInfoKhrInputParamsTest; -INSTANTIATE_TEST_CASE_P(KernelSubGroupInfoKhrInputParams, - KernelSubGroupInfoKhrInputParamsTest, - ::testing::ValuesIn(kernelSubGroupInfoKhrInputParams)); +INSTANTIATE_TEST_SUITE_P(KernelSubGroupInfoKhrInputParams, + KernelSubGroupInfoKhrInputParamsTest, + ::testing::ValuesIn(kernelSubGroupInfoKhrInputParams)); TEST_P(KernelSubGroupInfoKhrInputParamsTest, GivenInvalidInputWhenGettingKernelSubGroupInfoThenInvalidValueErrorIsReturned) { // work dim == 0 diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl index ba13c60148..2f38a3efb8 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -87,11 +87,11 @@ static struct WorkSizeParam { typedef KernelSubGroupInfoParamFixture> KernelSubGroupInfoReturnSizeTest; -INSTANTIATE_TEST_CASE_P(wgs, - KernelSubGroupInfoReturnSizeTest, - ::testing::Combine( - ::testing::ValuesIn(kernelSubGroupInfoWGS), - ::testing::ValuesIn(workDimensions))); +INSTANTIATE_TEST_SUITE_P(wgs, + KernelSubGroupInfoReturnSizeTest, + ::testing::Combine( + ::testing::ValuesIn(kernelSubGroupInfoWGS), + ::testing::ValuesIn(workDimensions))); TEST_P(KernelSubGroupInfoReturnSizeTest, GivenWorkGroupSizeWhenGettingMaxSubGroupSizeThenReturnIsCalculatedCorrectly) { REQUIRE_OCL_21_OR_SKIP(defaultHwInfo); @@ -129,11 +129,11 @@ TEST_P(KernelSubGroupInfoReturnSizeTest, GivenWorkGroupSizeWhenGettingMaxSubGrou typedef KernelSubGroupInfoParamFixture> KernelSubGroupInfoReturnCountTest; -INSTANTIATE_TEST_CASE_P(wgs, - KernelSubGroupInfoReturnCountTest, - ::testing::Combine( - ::testing::ValuesIn(kernelSubGroupInfoWGS), - ::testing::ValuesIn(workDimensions))); +INSTANTIATE_TEST_SUITE_P(wgs, + KernelSubGroupInfoReturnCountTest, + ::testing::Combine( + ::testing::ValuesIn(kernelSubGroupInfoWGS), + ::testing::ValuesIn(workDimensions))); TEST_P(KernelSubGroupInfoReturnCountTest, GivenWorkGroupSizeWhenGettingSubGroupCountThenReturnIsCalculatedCorrectly) { REQUIRE_OCL_21_OR_SKIP(defaultHwInfo); @@ -185,11 +185,11 @@ static size_t subGroupsNumbers[] = {0, 1, 10, 12, 21, 33, 67, 99}; typedef KernelSubGroupInfoParamFixture> KernelSubGroupInfoReturnLocalSizeTest; -INSTANTIATE_TEST_CASE_P(sgn, - KernelSubGroupInfoReturnLocalSizeTest, - ::testing::Combine( - ::testing::ValuesIn(subGroupsNumbers), - ::testing::ValuesIn(workDimensions))); +INSTANTIATE_TEST_SUITE_P(sgn, + KernelSubGroupInfoReturnLocalSizeTest, + ::testing::Combine( + ::testing::ValuesIn(subGroupsNumbers), + ::testing::ValuesIn(workDimensions))); TEST_P(KernelSubGroupInfoReturnLocalSizeTest, GivenWorkGroupSizeWhenGettingLocalSizeThenReturnIsCalculatedCorrectly) { REQUIRE_OCL_21_OR_SKIP(defaultHwInfo); @@ -382,9 +382,9 @@ uint32_t /*cl_kernel_sub_group_info*/ kernelSubGroupInfoInputParams[] = { typedef KernelSubGroupInfoParamFixture KernelSubGroupInfoInputParamsTest; -INSTANTIATE_TEST_CASE_P(KernelSubGroupInfoInputParams, - KernelSubGroupInfoInputParamsTest, - ::testing::ValuesIn(kernelSubGroupInfoInputParams)); +INSTANTIATE_TEST_SUITE_P(KernelSubGroupInfoInputParams, + KernelSubGroupInfoInputParamsTest, + ::testing::ValuesIn(kernelSubGroupInfoInputParams)); TEST_P(KernelSubGroupInfoInputParamsTest, GivenOpenClVersionLowerThan21WhenGettingKenrelSubGroupInfoThenInvalidOperationErrorIsReturned) { bool requireOpenCL21 = (GetParam() == CL_KERNEL_LOCAL_SIZE_FOR_SUB_GROUP_COUNT) || diff --git a/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl index d29f35bc94..c7ca6d547e 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl @@ -146,7 +146,7 @@ static cl_kernel_work_group_info paramNames[] = { CL_KERNEL_SPILL_MEM_SIZE_INTEL, CL_KERNEL_PRIVATE_MEM_SIZE}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( api, ClGetKernelWorkGroupInfoTests, testing::ValuesIn(paramNames)); diff --git a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl index 3ad02f35df..1bf1f1d31e 100644 --- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -92,9 +92,9 @@ TEST_P(ClGetPlatformInfoParameterizedTests, GivenClPlatformVersionWhenGettingPla EXPECT_EQ(expectedNumericPlatformVersion, platformNumericVersion); } -INSTANTIATE_TEST_CASE_P(OCLVersions, - ClGetPlatformInfoParameterizedTests, - ::testing::Values(12, 21, 30)); +INSTANTIATE_TEST_SUITE_P(OCLVersions, + ClGetPlatformInfoParameterizedTests, + ::testing::Values(12, 21, 30)); TEST_F(ClGetPlatformInfoTests, GivenClPlatformNameWhenGettingPlatformInfoStringThenCorrectStringIsReturned) { paramValue = getPlatformInfoString(pPlatform, CL_PLATFORM_NAME); @@ -293,7 +293,7 @@ const cl_platform_info platformInfoTestValues[] = CL_PLATFORM_ICD_SUFFIX_KHR, }; -INSTANTIATE_TEST_CASE_P(api, - GetPlatformInfoTests, - ::testing::ValuesIn(platformInfoTestValues)); +INSTANTIATE_TEST_SUITE_P(api, + GetPlatformInfoTests, + ::testing::ValuesIn(platformInfoTestValues)); } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_release_event_tests.inl b/opencl/test/unit_test/api/cl_release_event_tests.inl index f75d29c027..941f7f7675 100644 --- a/opencl/test/unit_test/api/cl_release_event_tests.inl +++ b/opencl/test/unit_test/api/cl_release_event_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -144,15 +144,15 @@ cl_int expectValidStatus[] = {CL_SUCCESS}; cl_int invalidStatus[] = {CL_QUEUED, CL_SUBMITTED, 12}; cl_int expectInvalidStatus[] = {CL_INVALID_VALUE}; -INSTANTIATE_TEST_CASE_P(SetValidStatus, - clEventStatusTests, - ::testing::Combine( - ::testing::ValuesIn(validStatus), - ::testing::ValuesIn(expectValidStatus))); +INSTANTIATE_TEST_SUITE_P(SetValidStatus, + clEventStatusTests, + ::testing::Combine( + ::testing::ValuesIn(validStatus), + ::testing::ValuesIn(expectValidStatus))); -INSTANTIATE_TEST_CASE_P(SetInvalidStatus, - clEventStatusTests, - ::testing::Combine( - ::testing::ValuesIn(invalidStatus), - ::testing::ValuesIn(expectInvalidStatus))); +INSTANTIATE_TEST_SUITE_P(SetInvalidStatus, + clEventStatusTests, + ::testing::Combine( + ::testing::ValuesIn(invalidStatus), + ::testing::ValuesIn(expectInvalidStatus))); } // namespace ClReleaseEventTests diff --git a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl index 9ca16355d9..31b1c376c1 100644 --- a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl +++ b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -107,14 +107,14 @@ static cl_mem_flags svmAllocValidFlags[] = { CL_MEM_READ_ONLY | CL_MEM_SVM_FINE_GRAIN_BUFFER, CL_MEM_READ_ONLY | CL_MEM_SVM_FINE_GRAIN_BUFFER | CL_MEM_SVM_ATOMICS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( SVMAllocCheckFlags, ClSVMAllocValidFlagsTests, testing::ValuesIn(svmAllocValidFlags)); using ClSVMAllocFtrFlagsTests = ClSvmAllocTemplateTests; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( SVMAllocCheckFlagsFtrFlags, ClSVMAllocFtrFlagsTests, testing::ValuesIn(svmAllocValidFlags)); @@ -167,7 +167,7 @@ cl_mem_flags svmAllocInvalidFlags[] = { CL_MEM_SVM_ATOMICS, 0xffcc}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( SVMAllocCheckFlags, ClSVMAllocInvalidFlagsTests, testing::ValuesIn(svmAllocInvalidFlags)); diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp index 2f1763a7d2..5b87f28c7a 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -87,6 +87,6 @@ static cl_device_info deviceInfoStrParams[] = { CL_DEVICE_BUILT_IN_KERNELS, CL_DEVICE_EXTENSIONS, CL_DEVICE_LATEST_CONFORMANCE_VERSION_PASSED, CL_DEVICE_NAME, CL_DEVICE_OPENCL_C_VERSION, CL_DEVICE_PROFILE, CL_DEVICE_VENDOR, CL_DEVICE_VERSION, CL_DRIVER_VERSION}; -INSTANTIATE_TEST_CASE_P(api, GetDeviceGlInfoStr, testing::ValuesIn(deviceInfoStrParams)); +INSTANTIATE_TEST_SUITE_P(api, GetDeviceGlInfoStr, testing::ValuesIn(deviceInfoStrParams)); } // namespace ULT diff --git a/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp index 3929111ad2..431966a79c 100644 --- a/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp @@ -353,13 +353,13 @@ HWTEST_P(AubSurfaceDumpTests, givenGraphicsAllocationWhenGetDumpSurfaceIsCalledA } } -INSTANTIATE_TEST_CASE_P(GetDumpSurfaceTest, - AubSurfaceDumpTests, - ::testing::Combine( - ::testing::Bool(), // isCompressed - ::testing::Values( // dumpFormat - AubAllocDump::DumpFormat::NONE, - AubAllocDump::DumpFormat::BUFFER_BIN, - AubAllocDump::DumpFormat::BUFFER_TRE, - AubAllocDump::DumpFormat::IMAGE_BMP, - AubAllocDump::DumpFormat::IMAGE_TRE))); +INSTANTIATE_TEST_SUITE_P(GetDumpSurfaceTest, + AubSurfaceDumpTests, + ::testing::Combine( + ::testing::Bool(), // isCompressed + ::testing::Values( // dumpFormat + AubAllocDump::DumpFormat::NONE, + AubAllocDump::DumpFormat::BUFFER_BIN, + AubAllocDump::DumpFormat::BUFFER_TRE, + AubAllocDump::DumpFormat::IMAGE_BMP, + AubAllocDump::DumpFormat::IMAGE_TRE))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp index 0ae94299ec..4f85aaad4e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp @@ -305,10 +305,10 @@ HWTEST2_P(CompressionLocalXeHPAndLater, givenCompressedImageWhenReadingThenResul givenCompressedImageWhenReadingThenResultsAreCorrect(); } -INSTANTIATE_TEST_CASE_P(, - CompressionLocalXeHPAndLater, - ::testing::Values(aub_stream::ENGINE_RCS, - aub_stream::ENGINE_CCS)); +INSTANTIATE_TEST_SUITE_P(, + CompressionLocalXeHPAndLater, + ::testing::Values(aub_stream::ENGINE_RCS, + aub_stream::ENGINE_CCS)); using CompressionSystemXeHPAndLater = CompressionXeHPAndLater; HWTEST2_P(CompressionSystemXeHPAndLater, GENERATEONLY_givenCompressedBuffersWhenWritingAndCopyingThenResultsAreCorrect, CompressionSystemAubsSupportedMatcher) { @@ -321,7 +321,7 @@ HWTEST2_P(CompressionSystemXeHPAndLater, givenCompressedImageWhenReadingThenResu givenCompressedImageWhenReadingThenResultsAreCorrect(); } -INSTANTIATE_TEST_CASE_P(, - CompressionSystemXeHPAndLater, - ::testing::Values(aub_stream::ENGINE_RCS, - aub_stream::ENGINE_CCS)); +INSTANTIATE_TEST_SUITE_P(, + CompressionSystemXeHPAndLater, + ::testing::Values(aub_stream::ENGINE_RCS, + aub_stream::ENGINE_CCS)); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp index 7e990216bd..cb3727af5e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp @@ -98,16 +98,16 @@ HWTEST_P(AUBCopyBuffer, WhenCopyingThenExpectationsMet) { delete dstBuffer; } -INSTANTIATE_TEST_CASE_P(AUBCopyBuffer_simple, - AUBCopyBuffer, - ::testing::Combine( - ::testing::Values( // srcOffset - 0 * sizeof(cl_float), - 1 * sizeof(cl_float), - 2 * sizeof(cl_float), - 3 * sizeof(cl_float)), - ::testing::Values( // dstOffset - 0 * sizeof(cl_float), - 1 * sizeof(cl_float), - 2 * sizeof(cl_float), - 3 * sizeof(cl_float)))); +INSTANTIATE_TEST_SUITE_P(AUBCopyBuffer_simple, + AUBCopyBuffer, + ::testing::Combine( + ::testing::Values( // srcOffset + 0 * sizeof(cl_float), + 1 * sizeof(cl_float), + 2 * sizeof(cl_float), + 3 * sizeof(cl_float)), + ::testing::Values( // dstOffset + 0 * sizeof(cl_float), + 1 * sizeof(cl_float), + 2 * sizeof(cl_float), + 3 * sizeof(cl_float)))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp index d55bdfc618..4d97af9361 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp @@ -134,13 +134,13 @@ HWTEST_P(AUBCopyBufferRect, WhenCopyingThenExpectationsMet) { static size_t zero[] = {0}; -INSTANTIATE_TEST_CASE_P(AUBCopyBufferRect, - AUBCopyBufferRect, - ::testing::Combine( - ::testing::Values(0, 3), // srcOrigin - ::testing::ValuesIn(zero), - ::testing::Values(0, 7), - ::testing::Values(0, 3), // dstPrigin - ::testing::ValuesIn(zero), - ::testing::Values(0, 7), - ::testing::Values(true, false))); +INSTANTIATE_TEST_SUITE_P(AUBCopyBufferRect, + AUBCopyBufferRect, + ::testing::Combine( + ::testing::Values(0, 3), // srcOrigin + ::testing::ValuesIn(zero), + ::testing::Values(0, 7), + ::testing::Values(0, 3), // dstPrigin + ::testing::ValuesIn(zero), + ::testing::Values(0, 7), + ::testing::Values(true, false))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index d47ef4116d..37924fd83c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -172,13 +172,13 @@ HWTEST2_P(AUBCopyImageCCS, WhenCopyingThenExpectationsMet, ImagesSupportedMatche runAubTest(); } -INSTANTIATE_TEST_CASE_P(AUBCopyImage_simple, - AUBCopyImageCCS, - ::testing::Combine( - ::testing::Values( // srcOffset - 0u, 1u, 2u), - ::testing::Values( // dstOffset - 0u, 1u, 2u))); +INSTANTIATE_TEST_SUITE_P(AUBCopyImage_simple, + AUBCopyImageCCS, + ::testing::Combine( + ::testing::Values( // srcOffset + 0u, 1u, 2u), + ::testing::Values( // dstOffset + 0u, 1u, 2u))); using AUBCopyImageBCS = AUBCopyImage; @@ -187,10 +187,10 @@ HWTEST2_P(AUBCopyImageBCS, WhenCopyingWithBlitterEnabledThenExpectationsMet, Ima ASSERT_EQ(pCmdQ->peekLatestSentEnqueueOperation(), EnqueueProperties::Operation::blit); } -INSTANTIATE_TEST_CASE_P(AUBCopyImage_simple, - AUBCopyImageBCS, - ::testing::Combine( - ::testing::Values( // srcOffset - 0u, 1u, 2u), - ::testing::Values( // dstOffset - 0u, 1u, 2u))); +INSTANTIATE_TEST_SUITE_P(AUBCopyImage_simple, + AUBCopyImageBCS, + ::testing::Combine( + ::testing::Values( // srcOffset + 0u, 1u, 2u), + ::testing::Values( // dstOffset + 0u, 1u, 2u))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp index 05cb521552..04727c06c3 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp @@ -142,10 +142,10 @@ HWTEST_F(AUBFillBuffer, givenFillBufferWhenSeveralSubmissionsWithoutPollForCompl } } -INSTANTIATE_TEST_CASE_P(AUBFillBuffer_simple, - AUBFillBuffer, - ::testing::Values( - 0 * sizeof(cl_float), - 1 * sizeof(cl_float), - 2 * sizeof(cl_float), - 3 * sizeof(cl_float))); +INSTANTIATE_TEST_SUITE_P(AUBFillBuffer_simple, + AUBFillBuffer, + ::testing::Values( + 0 * sizeof(cl_float), + 1 * sizeof(cl_float), + 2 * sizeof(cl_float), + 3 * sizeof(cl_float))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index 8c40b66016..2aead90d5e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -253,14 +253,14 @@ HWTEST_P(AubFillImage, WhenFillingThenExpectationsMet) { delete[] srcMemory; } -INSTANTIATE_TEST_CASE_P(AubFillImage_simple, - AubFillImage, - ::testing::Combine( - ::testing::ValuesIn(fillChannelTypes), - ::testing::Values( // channels - CL_R, - CL_RG, - CL_RGBA, - CL_sRGBA, - CL_sBGRA), - ::testing::ValuesIn(imageParams))); +INSTANTIATE_TEST_SUITE_P(AubFillImage_simple, + AubFillImage, + ::testing::Combine( + ::testing::ValuesIn(fillChannelTypes), + ::testing::Values( // channels + CL_R, + CL_RG, + CL_RGBA, + CL_sRGBA, + CL_sBGRA), + ::testing::ValuesIn(imageParams))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index b1320cbd7d..f1a1528191 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -251,7 +251,7 @@ HWTEST_P(AUBHelloWorldIntegrateTest, WhenEnqueingKernelThenExpectationsAreMet) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AUB, AUBHelloWorldIntegrateTest, ::testing::Combine( @@ -419,7 +419,7 @@ HWTEST_P(AUBSimpleArgIntegrateTest, WhenEnqueingKernelThenExpectationsAreMet) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AUB, AUBSimpleArgIntegrateTest, ::testing::Combine( diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index cb87ccaeb6..2db9e11d04 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -219,7 +219,7 @@ HWTEST_P(AUBMapImage, WhenMappingAndUnmappingThenExpectationsAreMet) { delete[] expected; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AUBMapImage_simple, AUBMapImage, ::testing::Combine(::testing::Values( // formats CL_UNORM_INT8, CL_SIGNED_INT16, CL_UNSIGNED_INT32, diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp index e36d3a8ec3..f9ecf2eed5 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -99,13 +99,13 @@ HWTEST_P(AUBReadBuffer, WhenReadingBufferThenExpectationsAreMet) { } } -INSTANTIATE_TEST_CASE_P(AUBReadBuffer_simple, - AUBReadBuffer, - ::testing::Values( - 0 * sizeof(cl_float), - 1 * sizeof(cl_float), - 2 * sizeof(cl_float), - 3 * sizeof(cl_float))); +INSTANTIATE_TEST_SUITE_P(AUBReadBuffer_simple, + AUBReadBuffer, + ::testing::Values( + 0 * sizeof(cl_float), + 1 * sizeof(cl_float), + 2 * sizeof(cl_float), + 3 * sizeof(cl_float))); HWTEST_F(AUBReadBuffer, GivenReserveCanonicalGpuAddressWhenReadingBufferThenExpectationsAreMet) { if (!getAubTestsConfig().testCanonicalAddress) { diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp index 110db8954e..e74a8937ee 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -107,11 +107,11 @@ HWTEST_P(AUBReadBufferRect, Given3dWhenReadingBufferThenExpectationsAreMet) { ::alignedFree(srcMemory); ::alignedFree(destMemory); } -INSTANTIATE_TEST_CASE_P(AUBReadBufferRect_simple, - AUBReadBufferRect, - ::testing::Combine( - ::testing::Values(0, 1, 2, 3, 4), - ::testing::Values(0, 1, 2, 3, 4))); +INSTANTIATE_TEST_SUITE_P(AUBReadBufferRect_simple, + AUBReadBufferRect, + ::testing::Combine( + ::testing::Values(0, 1, 2, 3, 4), + ::testing::Values(0, 1, 2, 3, 4))); struct AUBReadBufferRectUnaligned : public CommandEnqueueAUBFixture, diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index dc61641723..b272676bef 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -310,7 +310,7 @@ HWTEST2_P(AUBReadImageCCS, GivenUnalignedMemoryWhenReadingImageThenExpectationsA testReadImageUnaligned(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AUBReadImage_simple, AUBReadImageCCS, ::testing::Combine(::testing::Values( // formats CL_UNORM_INT8, CL_SIGNED_INT16, CL_UNSIGNED_INT32, @@ -348,7 +348,7 @@ HWTEST2_P(AUBReadImageBCS, GivenUnalignedMemoryWhenReadingImageWithBlitterEnable ASSERT_EQ(pCmdQ->peekLatestSentEnqueueOperation(), EnqueueProperties::Operation::blit); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AUBReadImage_simple, AUBReadImageBCS, ::testing::Combine(::testing::Values( // formats CL_UNORM_INT8, CL_SIGNED_INT16, CL_UNSIGNED_INT32, diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp index 1fb1900f37..d810de7be1 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -117,8 +117,8 @@ HWTEST_P(VerifyMemoryBufferHw, givenDifferentBuffersWhenValidatingMemoryThenSucc clFinish(pCmdQ); } -INSTANTIATE_TEST_CASE_P(VerifyMemoryBuffer, - VerifyMemoryBufferHw, - ::testing::Combine( - ::testing::ValuesIn(testDataSizeTable), - ::testing::ValuesIn(testFlagsTable))); +INSTANTIATE_TEST_SUITE_P(VerifyMemoryBuffer, + VerifyMemoryBufferHw, + ::testing::Combine( + ::testing::ValuesIn(testDataSizeTable), + ::testing::ValuesIn(testFlagsTable))); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index 635c0bdb7c..942f0e3cb0 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -142,6 +142,6 @@ HWTEST_P(VerifyMemoryImageHw, givenDifferentImagesWhenValidatingMemoryThenSucces } } -INSTANTIATE_TEST_CASE_P(VerifyMemoryImage, - VerifyMemoryImageHw, - ::testing::ValuesIn(testInput)); +INSTANTIATE_TEST_SUITE_P(VerifyMemoryImage, + VerifyMemoryImageHw, + ::testing::ValuesIn(testInput)); diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp index d2234bd527..fd1a97ea9b 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp @@ -103,13 +103,13 @@ HWTEST_P(AUBWriteBuffer, WhenWritingBufferThenExpectationsAreMet) { delete[] zeroMemory; } -INSTANTIATE_TEST_CASE_P(AUBWriteBuffer_simple, - AUBWriteBuffer, - ::testing::Values( - 0 * sizeof(cl_float), - 1 * sizeof(cl_float), - 2 * sizeof(cl_float), - 3 * sizeof(cl_float))); +INSTANTIATE_TEST_SUITE_P(AUBWriteBuffer_simple, + AUBWriteBuffer, + ::testing::Values( + 0 * sizeof(cl_float), + 1 * sizeof(cl_float), + 2 * sizeof(cl_float), + 3 * sizeof(cl_float))); struct AUBWriteBufferUnaligned : public CommandEnqueueAUBFixture, diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp index 88928648fa..45e132fe54 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp @@ -105,11 +105,11 @@ HWTEST_P(AUBWriteBufferRect, Given3dWhenWritingBufferThenExpectationsAreMet) { ::alignedFree(srcMemory); ::alignedFree(destMemory); } -INSTANTIATE_TEST_CASE_P(AUBWriteBufferRect_simple, - AUBWriteBufferRect, - ::testing::Combine( - ::testing::Values(0u, 1u, 2u, 3u, 4u), - ::testing::Values(0u, 1u, 2u, 3u, 4u))); +INSTANTIATE_TEST_SUITE_P(AUBWriteBufferRect_simple, + AUBWriteBufferRect, + ::testing::Combine( + ::testing::Values(0u, 1u, 2u, 3u, 4u), + ::testing::Values(0u, 1u, 2u, 3u, 4u))); struct AUBWriteBufferRectUnaligned : public CommandEnqueueAUBFixture, diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index a2f757fc88..3b8ba8d8ef 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -308,14 +308,14 @@ HWTEST2_P(AUBWriteImageCCS, GivenUnalignedMemoryWhenWritingImageThenExpectations testWriteImageUnaligned(); } -INSTANTIATE_TEST_CASE_P(AUBWriteImage_simple, AUBWriteImageCCS, - ::testing::Combine(::testing::Values( // formats - CL_UNORM_INT8, CL_SIGNED_INT16, - CL_UNSIGNED_INT32, CL_HALF_FLOAT, - CL_FLOAT), - ::testing::Values( // channels - CL_R, CL_RG, CL_RGBA), - ::testing::ValuesIn(writeImageParams))); +INSTANTIATE_TEST_SUITE_P(AUBWriteImage_simple, AUBWriteImageCCS, + ::testing::Combine(::testing::Values( // formats + CL_UNORM_INT8, CL_SIGNED_INT16, + CL_UNSIGNED_INT32, CL_HALF_FLOAT, + CL_FLOAT), + ::testing::Values( // channels + CL_R, CL_RG, CL_RGBA), + ::testing::ValuesIn(writeImageParams))); using AUBWriteImageBCS = AUBWriteImage; @@ -345,11 +345,11 @@ HWTEST2_P(AUBWriteImageBCS, GivenUnalignedMemoryWhenWritingImageWithBlitterEnabl ASSERT_EQ(pCmdQ->peekLatestSentEnqueueOperation(), EnqueueProperties::Operation::blit); } -INSTANTIATE_TEST_CASE_P(AUBWriteImage_simple, AUBWriteImageBCS, - ::testing::Combine(::testing::Values( // formats - CL_UNORM_INT8, CL_SIGNED_INT16, - CL_UNSIGNED_INT32, CL_HALF_FLOAT, - CL_FLOAT), - ::testing::Values( // channels - CL_R, CL_RG, CL_RGBA), - ::testing::ValuesIn(writeImageParams))); +INSTANTIATE_TEST_SUITE_P(AUBWriteImage_simple, AUBWriteImageBCS, + ::testing::Combine(::testing::Values( // formats + CL_UNORM_INT8, CL_SIGNED_INT16, + CL_UNSIGNED_INT32, CL_HALF_FLOAT, + CL_FLOAT), + ::testing::Values( // channels + CL_R, CL_RG, CL_RGBA), + ::testing::ValuesIn(writeImageParams))); diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp index 1977cb5213..f0fac7fb21 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp @@ -1181,7 +1181,7 @@ HWCMDTEST_P(IGFX_XE_HP_CORE, AubWalkerPartitionTest, whenPartitionsAreUsedWithVa clReleaseEvent(event); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AUBWPARID, AubWalkerPartitionTest, ::testing::Combine( diff --git a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp index 8389718719..dcfd6a853e 100644 --- a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -271,12 +271,12 @@ static cl_mem_flags copyHostPtrFlags[] = { using UseHostPtrTest = AUBCreateImageHostPtr; using CopyHostPtrTest = AUBCreateImageHostPtr; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImgTest_UseHostPtr, UseHostPtrTest, testing::ValuesIn(useHostPtrFlags)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImgTest_CopyHostPtr, CopyHostPtrTest, testing::ValuesIn(copyHostPtrFlags)); diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp index 59ac694a31..5eaab020de 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -53,8 +53,8 @@ InternalMemoryType memoryTypes[] = {InternalMemoryType::hostUnifiedMemory, InternalMemoryType::sharedUnifiedMemory, InternalMemoryType::notSpecified}; -INSTANTIATE_TEST_CASE_P(UnifiedMemoryCopyAubTest, - UnifiedMemoryCopyAubTest, - ::testing::Combine(::testing::ValuesIn(memoryTypes), - ::testing::ValuesIn(memoryTypes))); +INSTANTIATE_TEST_SUITE_P(UnifiedMemoryCopyAubTest, + UnifiedMemoryCopyAubTest, + ::testing::Combine(::testing::ValuesIn(memoryTypes), + ::testing::ValuesIn(memoryTypes))); } // namespace NEO diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp index 5ba27385ad..97823488ab 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -35,7 +35,7 @@ constexpr uint32_t allSupportedCopyEngines[] = { using OneTileXeHpcTests = CopyEnginesXeHpcFixture<1, XeHpcCoreFamily>; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MemCopyBcsCmd, OneTileXeHpcTests, testing::ValuesIn(allSupportedCopyEngines)); @@ -86,7 +86,7 @@ XE_HPC_CORETEST_P(OneTileXeHpcTests, givenCopyBufferRectWithBigSizesWhenHostPtrB using OneTileSystemMemoryXeHpcTests = CopyEnginesXeHpcFixture<1, XeHpcCoreFamily, false>; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MemCopyBcsCmd, OneTileSystemMemoryXeHpcTests, testing::ValuesIn(allSupportedCopyEngines)); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp index 04767b0caa..bfa7e43a37 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp @@ -69,9 +69,9 @@ XE_HPC_CORETEST_P(UmStatelessCompression, givenDeviceMemAllocWhenStatelessCompre EXPECT_EQ(CL_SUCCESS, retVal); } -INSTANTIATE_TEST_CASE_P(, - UmStatelessCompression, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(, + UmStatelessCompression, + ::testing::Bool()); class UmStatelessCompressionWithBlitter : public MulticontextOclAubFixture, public ::testing::Test, @@ -127,9 +127,9 @@ XE_HPC_CORETEST_P(UmStatelessCompressionWithBlitter, givenDeviceMemAllocWhenItIs EXPECT_EQ(CL_SUCCESS, retVal); } -INSTANTIATE_TEST_CASE_P(, - UmStatelessCompressionWithBlitter, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(, + UmStatelessCompressionWithBlitter, + ::testing::Bool()); class UmStatelessCompressionWithStatefulAccess : public ProgramFixture, public MulticontextOclAubFixture, @@ -210,6 +210,6 @@ XE_HPC_CORETEST_P(UmStatelessCompressionWithStatefulAccess, givenDeviceMemAllocW EXPECT_EQ(CL_SUCCESS, retVal); } -INSTANTIATE_TEST_CASE_P(, - UmStatelessCompressionWithStatefulAccess, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(, + UmStatelessCompressionWithStatefulAccess, + ::testing::Bool()); diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp index 2e5712315d..d9fbfd374b 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp @@ -248,10 +248,10 @@ XE_HPG_CORETEST_P(XeHpgCoreStatelessCompressionInSBA, givenUncompressibleHostMem EXPECT_EQ(CL_SUCCESS, retVal); } -INSTANTIATE_TEST_CASE_P(, - XeHpgCoreStatelessCompressionInSBA, - ::testing::Values(aub_stream::ENGINE_RCS, - aub_stream::ENGINE_CCS)); +INSTANTIATE_TEST_SUITE_P(, + XeHpgCoreStatelessCompressionInSBA, + ::testing::Values(aub_stream::ENGINE_RCS, + aub_stream::ENGINE_CCS)); struct XeHpgCoreUmStatelessCompressionInSBA : public KernelAUBFixture, public ::testing::Test, @@ -475,10 +475,10 @@ XE_HPG_CORETEST_P(XeHpgCoreUmStatelessCompressionInSBA, givenKernelExecInfoWhenI EXPECT_EQ(CL_SUCCESS, retVal); } -INSTANTIATE_TEST_CASE_P(, - XeHpgCoreUmStatelessCompressionInSBA, - ::testing::Values(aub_stream::ENGINE_RCS, - aub_stream::ENGINE_CCS)); +INSTANTIATE_TEST_SUITE_P(, + XeHpgCoreUmStatelessCompressionInSBA, + ::testing::Values(aub_stream::ENGINE_RCS, + aub_stream::ENGINE_CCS)); struct XeHpgCoreStatelessCompressionInSBAWithBCS : public MulticontextOclAubFixture, public StatelessCopyKernelFixture, diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index dc9a17cd56..7cbf384d34 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -173,9 +173,9 @@ class MockAuxBuilInOp : public BuiltInOp { using BaseClass::BuiltInOp; }; -INSTANTIATE_TEST_CASE_P(, - AuxBuiltInTests, - testing::ValuesIn({KernelObjForAuxTranslation::Type::memObj, KernelObjForAuxTranslation::Type::gfxAlloc})); +INSTANTIATE_TEST_SUITE_P(, + AuxBuiltInTests, + testing::ValuesIn({KernelObjForAuxTranslation::Type::memObj, KernelObjForAuxTranslation::Type::gfxAlloc})); HWCMDTEST_P(IGFX_XE_HP_CORE, AuxBuiltInTests, givenXeHpCoreCommandsAndAuxTranslationKernelWhenSettingKernelArgsThenSetValidMocs) { 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 1ea0d5ffaf..53ed25b14e 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -129,9 +129,9 @@ TEST_P(CommandQueueTest, GivenNonFailingAllocationWhenCreatingCommandQueueThenCo injectFailures(method); } -INSTANTIATE_TEST_CASE_P(CommandQueue, - CommandQueueTest, - ::testing::ValuesIn(allCommandQueueProperties)); +INSTANTIATE_TEST_SUITE_P(CommandQueue, + CommandQueueTest, + ::testing::ValuesIn(allCommandQueueProperties)); TEST(CommandQueue, WhenGettingErrorCodeFromTaskCountThenProperValueIsReturned) { EXPECT_EQ(CL_SUCCESS, CommandQueue::getErrorCodeFromTaskCount(0)); @@ -351,15 +351,15 @@ TEST(CommandQueue, whenCommandQueueWithInternalUsageIsCreatedThenInternalBcsEngi } } -INSTANTIATE_TEST_CASE_P(uint32_t, - CommandQueueWithBlitOperationsTests, - ::testing::Values(CL_COMMAND_WRITE_BUFFER, - CL_COMMAND_WRITE_BUFFER_RECT, - CL_COMMAND_READ_BUFFER, - CL_COMMAND_READ_BUFFER_RECT, - CL_COMMAND_COPY_BUFFER, - CL_COMMAND_COPY_BUFFER_RECT, - CL_COMMAND_SVM_MEMCPY)); +INSTANTIATE_TEST_SUITE_P(uint32_t, + CommandQueueWithBlitOperationsTests, + ::testing::Values(CL_COMMAND_WRITE_BUFFER, + CL_COMMAND_WRITE_BUFFER_RECT, + CL_COMMAND_READ_BUFFER, + CL_COMMAND_READ_BUFFER_RECT, + CL_COMMAND_COPY_BUFFER, + CL_COMMAND_COPY_BUFFER_RECT, + CL_COMMAND_SVM_MEMCPY)); TEST(CommandQueue, givenCmdQueueBlockedByReadyVirtualEventWhenUnblockingThenUpdateFlushTaskFromEvent) { auto mockDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); @@ -882,7 +882,7 @@ TEST_P(CommandQueueIndirectHeapTest, givenCommandQueueWhenGetHeapMemoryIsCalledW pDevice->getMemoryManager()->freeGraphicsMemory(indirectHeap->getGraphicsAllocation()); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Device, CommandQueueIndirectHeapTest, testing::Values( diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 550ce6e52d..2a07ded899 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -103,9 +103,9 @@ struct DispatchWalkerTestForAuxTranslation : DispatchWalkerTest, public ::testin KernelObjForAuxTranslation::Type kernelObjType; }; -INSTANTIATE_TEST_CASE_P(, - DispatchWalkerTestForAuxTranslation, - testing::ValuesIn({KernelObjForAuxTranslation::Type::memObj, KernelObjForAuxTranslation::Type::gfxAlloc})); +INSTANTIATE_TEST_SUITE_P(, + DispatchWalkerTestForAuxTranslation, + testing::ValuesIn({KernelObjForAuxTranslation::Type::memObj, KernelObjForAuxTranslation::Type::gfxAlloc})); HWTEST_F(DispatchWalkerTest, WhenGettingComputeDimensionsThenCorrectNumberOfDimensionsIsReturned) { const size_t workItems1D[] = {100, 1, 1}; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 8d706e0fc0..4f41c8db35 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -287,8 +287,8 @@ HWTEST_P(MipMapCopyBufferToImageTest, GivenImageWithMipLevelNonZeroWhenCopyBuffe EXPECT_NE(nullptr, newBuilder); } -INSTANTIATE_TEST_CASE_P(MipMapCopyBufferToImageTest_GivenImageWithMipLevelNonZeroWhenCopyBufferToImageIsCalledThenProperMipLevelIsSet, - MipMapCopyBufferToImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); +INSTANTIATE_TEST_SUITE_P(MipMapCopyBufferToImageTest_GivenImageWithMipLevelNonZeroWhenCopyBufferToImageIsCalledThenProperMipLevelIsSet, + MipMapCopyBufferToImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); struct EnqueueCopyBufferToImageHw : public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index 109e876cd0..8fb2b186e2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -339,11 +339,11 @@ HWTEST_P(MipMapCopyImageTest, GivenImagesWithNonZeroMipLevelsWhenCopyImageIsCall uint32_t types[] = {CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D}; -INSTANTIATE_TEST_CASE_P(MipMapCopyImageTest_GivenImagesWithNonZeroMipLevelsWhenCopyImageIsCalledThenProperMipLevelsAreSet, - MipMapCopyImageTest, - ::testing::Combine( - ::testing::ValuesIn(types), - ::testing::ValuesIn(types))); +INSTANTIATE_TEST_SUITE_P(MipMapCopyImageTest_GivenImagesWithNonZeroMipLevelsWhenCopyImageIsCalledThenProperMipLevelsAreSet, + MipMapCopyImageTest, + ::testing::Combine( + ::testing::ValuesIn(types), + ::testing::ValuesIn(types))); using OneMipLevelCopyImageImageTests = Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 11d67b4cad..cc76ef25a5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -280,8 +280,8 @@ HWTEST_P(MipMapCopyImageToBufferTest, GivenImageWithMipLevelNonZeroWhenCopyImage EXPECT_NE(nullptr, newBuilder); } -INSTANTIATE_TEST_CASE_P(MipMapCopyImageToBufferTest_GivenImageWithMipLevelNonZeroWhenCopyImageToBufferIsCalledThenProperMipLevelIsSet, - MipMapCopyImageToBufferTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); +INSTANTIATE_TEST_SUITE_P(MipMapCopyImageToBufferTest_GivenImageWithMipLevelNonZeroWhenCopyImageToBufferIsCalledThenProperMipLevelIsSet, + MipMapCopyImageToBufferTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); struct EnqueueCopyImageToBufferHw : public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp index 83b4522bb0..7005b74edb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -163,7 +163,7 @@ TEST_P(InvalidPatternSize, GivenInvalidPatternSizeWhenFillingBufferThenInvalidVa EXPECT_EQ(CL_INVALID_VALUE, retVal); } -INSTANTIATE_TEST_CASE_P(EnqueueFillBuffer, - InvalidPatternSize, - ::testing::Values(0, 3, 5, 256, 512, 1024)); +INSTANTIATE_TEST_SUITE_P(EnqueueFillBuffer, + InvalidPatternSize, + ::testing::Values(0, 3, 5, 256, 512, 1024)); } // namespace ULT diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index 0d138c0d48..6fccf9bf8a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -294,13 +294,13 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueWorkItemTestsWithLimitedParamSet, WhenEnquein validateMediaVFEState(&pDevice->getHardwareInfo(), cmdMediaVfeState, cmdList, itorMediaVfeState); } -INSTANTIATE_TEST_CASE_P(EnqueueKernel, - EnqueueWorkItemTests, - ::testing::ValuesIn(testParamTable)); +INSTANTIATE_TEST_SUITE_P(EnqueueKernel, + EnqueueWorkItemTests, + ::testing::ValuesIn(testParamTable)); -INSTANTIATE_TEST_CASE_P(EnqueueKernel, - EnqueueWorkItemTestsWithLimitedParamSet, - ::testing::ValuesIn(oneEntryTestParamTable)); +INSTANTIATE_TEST_SUITE_P(EnqueueKernel, + EnqueueWorkItemTestsWithLimitedParamSet, + ::testing::ValuesIn(oneEntryTestParamTable)); typedef EnqueueKernelTypeTest EnqueueScratchSpaceTests; @@ -437,9 +437,9 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueScratchSpaceTests, GivenKernelRequiringScratc EXPECT_TRUE(csr.getAllocationsForReuse().peekIsEmpty()); } -INSTANTIATE_TEST_CASE_P(EnqueueKernel, - EnqueueScratchSpaceTests, - ::testing::ValuesIn(testParamTable2)); +INSTANTIATE_TEST_SUITE_P(EnqueueKernel, + EnqueueScratchSpaceTests, + ::testing::ValuesIn(testParamTable2)); typedef EnqueueKernelTypeTest EnqueueKernelWithScratch; @@ -528,8 +528,8 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueKernelWithScratch, givenDeviceForcing32bitAll } } -INSTANTIATE_TEST_CASE_P(EnqueueKernel, - EnqueueKernelWithScratch, testing::Values(1)); +INSTANTIATE_TEST_SUITE_P(EnqueueKernel, + EnqueueKernelWithScratch, testing::Values(1)); TestParam testParamPrintf[] = { {1, 1, 1, 1, 1, 1}}; @@ -719,9 +719,9 @@ HWTEST_P(EnqueueKernelPrintfTest, GivenKernelWithPrintfWithStringMapDisbaledAndI EXPECT_STREQ("", output.c_str()); } -INSTANTIATE_TEST_CASE_P(EnqueueKernel, - EnqueueKernelPrintfTest, - ::testing::ValuesIn(testParamPrintf)); +INSTANTIATE_TEST_SUITE_P(EnqueueKernel, + EnqueueKernelPrintfTest, + ::testing::ValuesIn(testParamPrintf)); using EnqueueKernelTests = ::testing::Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp index 64ba7b1dae..04dcc926b8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp @@ -182,8 +182,8 @@ TEST_P(MipMapMapImageParamsTest, givenAllocatedMapPtrWhenMapsWithDifferentMipMap EXPECT_EQ(ptr2, ptrOffset(ptr1, mapOffset)); } -INSTANTIATE_TEST_CASE_P(MipMapMapImageParamsTest_givenAllocatedMapPtrAndMapWithDifferentMipMapsIsCalledThenReturnDifferentPointers, - MipMapMapImageParamsTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); +INSTANTIATE_TEST_SUITE_P(MipMapMapImageParamsTest_givenAllocatedMapPtrAndMapWithDifferentMipMapsIsCalledThenReturnDifferentPointers, + MipMapMapImageParamsTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); template struct MockedImage : public ImageHw { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index 5df8ea8545..d0debcbaa3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -1024,8 +1024,8 @@ HWTEST_P(MipMapReadImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalled EXPECT_NE(nullptr, newBuilder); } -INSTANTIATE_TEST_CASE_P(MipMapReadImageTest_GivenImageWithMipLevelNonZeroWhenWriteImageIsCalledThenProperMipLevelIsSet, - MipMapReadImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); +INSTANTIATE_TEST_SUITE_P(MipMapReadImageTest_GivenImageWithMipLevelNonZeroWhenWriteImageIsCalledThenProperMipLevelIsSet, + MipMapReadImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); using NegativeFailAllocationTest = Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 24978c2061..0baf12edef 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -215,9 +215,9 @@ HWTEST_P(EnqueueSvmMemFillTest, givenEnqueueSVMMemFillWhenUsingFillBufferBuilder EXPECT_STREQ("FillBufferMiddle", kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); } -INSTANTIATE_TEST_CASE_P(size_t, - EnqueueSvmMemFillTest, - ::testing::Values(1, 2, 4, 8, 16, 32, 64, 128)); +INSTANTIATE_TEST_SUITE_P(size_t, + EnqueueSvmMemFillTest, + ::testing::Values(1, 2, 4, 8, 16, 32, 64, 128)); struct EnqueueSvmMemFillHw : public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp index bdd115c0bd..ec78938e74 100644 --- a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -233,12 +233,12 @@ ExecuteEnqueue twoEnqueueMap[] = &EnqueueWaitlistTest::twoEnqueueMapBuffer, &EnqueueWaitlistTest::twoEnqueueMapImage}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( UnblockedEvent, EnqueueWaitlistTest, ::testing::ValuesIn(enqueues)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( TwoEnqueueMap, EnqueueWaitlistTestTwoMapEnqueues, ::testing::ValuesIn(twoEnqueueMap)); diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index e1e4e73efd..46bb8eefce 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -483,8 +483,8 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle EXPECT_NE(nullptr, newBuilder); } -INSTANTIATE_TEST_CASE_P(MipMapWriteImageTest_GivenImageWithMipLevelNonZeroWhenReadImageIsCalledThenProperMipLevelIsSet, - MipMapWriteImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); +INSTANTIATE_TEST_SUITE_P(MipMapWriteImageTest_GivenImageWithMipLevelNonZeroWhenReadImageIsCalledThenProperMipLevelIsSet, + MipMapWriteImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); using NegativeFailAllocationTest = Test; diff --git a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp index f1e1dbbc79..9fa50ad58d 100644 --- a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -120,7 +120,7 @@ TEST_P(GetCommandQueueInfoTest, GivenInvalidParameterWhenGettingCommandQueueInfo EXPECT_EQ(CL_INVALID_VALUE, retVal); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GetCommandQueueInfoTest, GetCommandQueueInfoTest, ::testing::ValuesIn(defaultCommandQueueProperties)); 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 3e63af2ff2..61b2aad9d5 100644 --- a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -270,7 +270,7 @@ HWTEST_P(OOMCommandQueueBufferTest, GivenSimpleArgWhenEnqueingKernelThenMaxAvail EXPECT_EQ(CL_SUCCESS, retVal2); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OOM, OOMCommandQueueBufferTest, testing::ValuesIn(oomSettings)); diff --git a/opencl/test/unit_test/command_queue/oom_image_tests.cpp b/opencl/test/unit_test/command_queue/oom_image_tests.cpp index 8e8f7324ba..4361fb5535 100644 --- a/opencl/test/unit_test/command_queue/oom_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -178,7 +178,7 @@ HWTEST_P(OOMCommandQueueImageTest, WhenWritingImageThenMaxAvailableSpaceIsNotExc EXPECT_EQ(CL_SUCCESS, retVal2); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OOM, OOMCommandQueueImageTest, testing::ValuesIn(oomSettings)); diff --git a/opencl/test/unit_test/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index cd72344eb2..82cd5f3fe3 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -132,7 +132,7 @@ HWTEST_P(OOMCommandQueueTest, WhenEnqueingBarrierThenMaxAvailableSpaceIsNotExcee delete (Event *)eventReturned; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OOM, OOMCommandQueueTest, testing::ValuesIn(oomSettings)); diff --git a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp index 8f1376d4c6..be7d0ff9ec 100644 --- a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp +++ b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -41,7 +41,7 @@ struct OOQTaskTypedTests : public HelloWorldTest { DebugManagerStateRestore stateRestore; }; -TYPED_TEST_CASE_P(OOQTaskTypedTests); +TYPED_TEST_SUITE_P(OOQTaskTypedTests); bool isBlockingCall(unsigned int cmdType) { if (cmdType == CL_COMMAND_WRITE_BUFFER || @@ -116,12 +116,12 @@ typedef ::testing::Types< EnqueueWriteImageHelper<>> EnqueueParams; -REGISTER_TYPED_TEST_CASE_P(OOQTaskTypedTests, - givenNonBlockingCallWhenDoneOnOutOfOrderQueueThenTaskLevelDoesntChange, - givenTaskWhenEnqueuedOnOutOfOrderQueueThenTaskCountIsUpdated); +REGISTER_TYPED_TEST_SUITE_P(OOQTaskTypedTests, + givenNonBlockingCallWhenDoneOnOutOfOrderQueueThenTaskLevelDoesntChange, + givenTaskWhenEnqueuedOnOutOfOrderQueueThenTaskCountIsUpdated); // Instantiate all of these parameterized tests -INSTANTIATE_TYPED_TEST_CASE_P(OOQ, OOQTaskTypedTests, EnqueueParams); +INSTANTIATE_TYPED_TEST_SUITE_P(OOQ, OOQTaskTypedTests, EnqueueParams); typedef OOQTaskTypedTests> OOQTaskTests; diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp index 73cd9f891c..701d2c5909 100644 --- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -300,11 +300,11 @@ static size_t workItemCases1D[] = { 1023, 1024, 1025, 1400, 1401, 1402}; -INSTANTIATE_TEST_CASE_P(wgs, - WorkGroupSizeChannels, - ::testing::Combine( - ::testing::ValuesIn(simdSizes), - ::testing::ValuesIn(workItemCases1D))); +INSTANTIATE_TEST_SUITE_P(wgs, + WorkGroupSizeChannels, + ::testing::Combine( + ::testing::ValuesIn(simdSizes), + ::testing::ValuesIn(workItemCases1D))); // ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== // ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== @@ -322,12 +322,12 @@ HWCMDTEST_P(IGFX_GEN8_CORE, WorkGroupSize2D, GivenUsingXandYWorkGroupDimensionsW static size_t workItemCases2D[] = {1, 2, 3, 7, 15, 31, 63, 127, 255, 511, 1007, 1023, 2047}; -INSTANTIATE_TEST_CASE_P(wgs, - WorkGroupSize2D, - ::testing::Combine( - ::testing::ValuesIn(simdSizes), - ::testing::ValuesIn(workItemCases2D), - ::testing::ValuesIn(workItemCases2D))); +INSTANTIATE_TEST_SUITE_P(wgs, + WorkGroupSize2D, + ::testing::Combine( + ::testing::ValuesIn(simdSizes), + ::testing::ValuesIn(workItemCases2D), + ::testing::ValuesIn(workItemCases2D))); // ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== // ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== struct Region { @@ -351,8 +351,8 @@ Region regionCases[] = { {{9, 9, 10}} // This test case was hit by some AUBCopyBufferRect regressions }; -INSTANTIATE_TEST_CASE_P(wgs, - WorkGroupSizeRegion, - ::testing::Combine( - ::testing::ValuesIn(simdSizes), - ::testing::ValuesIn(regionCases))); +INSTANTIATE_TEST_SUITE_P(wgs, + WorkGroupSizeRegion, + ::testing::Combine( + ::testing::ValuesIn(simdSizes), + ::testing::ValuesIn(regionCases))); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index 67aa6e9a95..0c3be5ce9e 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -1328,7 +1328,7 @@ HWTEST_P(CommandStreamReceiverFlushTaskMemoryCompressionTests, givenCsrWithMemor } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CommandStreamReceiverFlushTaskMemoryCompressionTestsValues, CommandStreamReceiverFlushTaskMemoryCompressionTests, testing::Values(MemoryCompressionState::notApplicable, MemoryCompressionState::disabled, MemoryCompressionState::enabled)); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index 3de6ee2765..976a76cb25 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -1664,11 +1664,11 @@ HWTEST_P(BcsDetaliedTestsWithParams, givenBltSizeWithLeftoverWhenDispatchedThenP } } -INSTANTIATE_TEST_CASE_P(BcsDetaliedTest, - BcsDetaliedTestsWithParams, - ::testing::Combine( - ::testing::ValuesIn(blitterProperties), - ::testing::Values(BlitterConstants::BlitDirection::hostPtrToBuffer, BlitterConstants::BlitDirection::bufferToHostPtr))); +INSTANTIATE_TEST_SUITE_P(BcsDetaliedTest, + BcsDetaliedTestsWithParams, + ::testing::Combine( + ::testing::ValuesIn(blitterProperties), + ::testing::Values(BlitterConstants::BlitDirection::hostPtrToBuffer, BlitterConstants::BlitDirection::bufferToHostPtr))); HWCMDTEST_F(IGFX_GEN8_CORE, UltCommandStreamReceiverTest, WhenProgrammingActivePartitionsThenExpectNoAction) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); diff --git a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp index 314f76d17d..529958ca58 100644 --- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp @@ -55,7 +55,7 @@ static CommandStreamReceiverType commandStreamReceiverTypes[] = { CommandStreamReceiverType::nullAub, CommandStreamReceiverType::typesNum}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateCommandStreamReceiverTest_Create, CreateCommandStreamReceiverTest, testing::ValuesIn(commandStreamReceiverTypes)); diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 6eae2f4639..d009cc4aaa 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -348,9 +348,9 @@ TEST_P(ContextWithAsyncDeleterTest, givenContextWithMemoryManagerWhenAsyncDelete EXPECT_EQ(0, deleter->getClientsNum()); } -INSTANTIATE_TEST_CASE_P(ContextTests, - ContextWithAsyncDeleterTest, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(ContextTests, + ContextWithAsyncDeleterTest, + ::testing::Bool()); TEST(DefaultContext, givenDefaultContextWhenItIsQueriedForTypeThenDefaultTypeIsReturned) { MockContext context; diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index 2eec560552..bbc25fa895 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -815,26 +815,26 @@ TEST_F(PerformanceHintEnqueueKernelPrintfTest, GivenKernelWithPrintfWhenEnqueueK const int validDimensions[] = {0, 1, 2}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintEnqueueReadBufferTest, testing::Combine( ::testing::Bool(), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintEnqueueReadImageTest, testing::Combine( ::testing::Bool(), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintEnqueueMapTest, testing::Bool()); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintEnqueueKernelBadSizeTest, testing::ValuesIn(validDimensions)); diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp index 3d703a387c..294b3d611a 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp @@ -928,12 +928,12 @@ TEST_P(PerformanceHintKernelTest, GivenPrivateSurfaceWhenKernelIsInitializedThen } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, VerboseLevelTest, testing::ValuesIn(diagnosticsVerboseLevels)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintBufferTest, testing::Combine( @@ -941,14 +941,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Bool(), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintCommandQueueTest, testing::Combine( ::testing::Bool(), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DriverDiagnosticsTests, PerformanceHintKernelTest, testing::Bool()); diff --git a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp index 1bcd51c863..a2f5e3ffd4 100644 --- a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp +++ b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -455,14 +455,14 @@ cl_mem_object_type getSupportedImageFormats[] = { CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Context, GetSupportedImageFormatsTest, ::testing::Combine( ::testing::ValuesIn(getSupportedImageFormatsFlags), ::testing::ValuesIn(getSupportedImageFormats))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Context, PackedYuvExtensionSupportedImageFormatsTest, ::testing::Combine( @@ -481,14 +481,14 @@ cl_mem_object_type nv12ExtensionSupportedImageFormats[] = { CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE2D}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Context, NV12ExtensionSupportedImageFormatsTest, ::testing::Combine( ::testing::ValuesIn(nv12ExtensionSupportedImageFormatsFlags), ::testing::ValuesIn(nv12ExtensionSupportedImageFormats))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Context, NV12ExtensionUnsupportedImageFormatsTest, ::testing::Combine( diff --git a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index 42ddde4d4c..f1059cb717 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -1284,7 +1284,7 @@ struct D3D9ImageFormatTests public ::testing::Test { }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( D3D9ImageFormatTests, D3D9ImageFormatTests, testing::ValuesIn(D3D9Formats::allImageFormats)); diff --git a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp index 97213ea6ba..473448424a 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp @@ -23,7 +23,7 @@ namespace NEO { template class D3DAuxTests : public D3DTests {}; -TYPED_TEST_CASE_P(D3DAuxTests); +TYPED_TEST_SUITE_P(D3DAuxTests); TYPED_TEST_P(D3DAuxTests, given2dSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetAsCompressed) { this->mockSharingFcns->mockTexture2dDesc.MiscFlags = D3DResourceFlags::MISC_SHARED; @@ -187,16 +187,16 @@ TYPED_TEST_P(D3DAuxTests, given3dNonSharableTextureWithUnifiedAuxFlagsWhenCreati EXPECT_EQ(1u, this->mockSharingFcns->getTexture3dDescCalled); } -REGISTER_TYPED_TEST_CASE_P(D3DAuxTests, - given2dSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetAsCompressed, - given2dSharableTextureWithUnifiedAuxFlagsWhenFailOnAuxMappingThenDontSetAsCompressed, - given2dSharableTextureWithoutUnifiedAuxFlagsWhenCreatingThenDontMapAuxTable, - given2dNonSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetCompressed, - given3dSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetAsCompressed, - given3dSharableTextureWithUnifiedAuxFlagsWhenFailOnAuxMappingThenDontSetAsCompressed, - given3dSharableTextureWithoutUnifiedAuxFlagsWhenCreatingThenDontMapAuxTable, - given3dNonSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetCompressed); +REGISTER_TYPED_TEST_SUITE_P(D3DAuxTests, + given2dSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetAsCompressed, + given2dSharableTextureWithUnifiedAuxFlagsWhenFailOnAuxMappingThenDontSetAsCompressed, + given2dSharableTextureWithoutUnifiedAuxFlagsWhenCreatingThenDontMapAuxTable, + given2dNonSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetCompressed, + given3dSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetAsCompressed, + given3dSharableTextureWithUnifiedAuxFlagsWhenFailOnAuxMappingThenDontSetAsCompressed, + given3dSharableTextureWithoutUnifiedAuxFlagsWhenCreatingThenDontMapAuxTable, + given3dNonSharableTextureWithUnifiedAuxFlagsWhenCreatingThenMapAuxTableAndSetCompressed); -INSTANTIATE_TYPED_TEST_CASE_P(D3DSharingTests, D3DAuxTests, D3DTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(D3DSharingTests, D3DAuxTests, D3DTypes); } // namespace NEO diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp index abf7d90a46..9bf55531eb 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "gtest/gtest.h" namespace NEO { -TYPED_TEST_CASE_P(D3DTests); +TYPED_TEST_SUITE_P(D3DTests); TYPED_TEST_P(D3DTests, GivenSpecificDeviceSetWhenGettingDeviceIDsFromD3DThenOnlySelectedDevicesAreReturned) { cl_device_id expectedDevice = *this->devices; @@ -774,42 +774,42 @@ TYPED_TEST_P(D3DTests, givenReadWriteFormatWhenLookingForSurfaceFormatThenReturn } } -REGISTER_TYPED_TEST_CASE_P(D3DTests, - GivenSpecificDeviceSetWhenGettingDeviceIDsFromD3DThenOnlySelectedDevicesAreReturned, - GivenSpecificDeviceSourceWhenGettingDeviceIDsFromD3DThenOnlySelectedDevicesAreReturned, - givenNonIntelVendorWhenGetDeviceIdIsCalledThenReturnError, - WhenCreatingFromD3DBufferKhrApiThenValidBufferIsReturned, - WhenCreatingFromD3D2dTextureKhrApiThenValidImageIsReturned, - WhenCreatingFromD3D3dTextureKhrApiThenValidImageIsReturned, - givenSharedResourceFlagWhenCreateBufferThenStagingBufferEqualsPassedBuffer, - givenNonSharedResourceFlagWhenCreateBufferThenCreateNewStagingBuffer, - givenNonSharedResourceBufferWhenAcquiredThenCopySubregion, - givenSharedResourceBufferWhenAcquiredThenDontCopySubregion, - givenSharedResourceBufferAndInteropUserSyncDisabledWhenAcquiredThenFlushOnAcquire, - WhenGettingPreferD3DSharedResourcesThenCorrectValueIsReturned, - WhenGettingD3DResourceInfoFromMemObjThenCorrectInfoIsReturned, - WhenGettingD3DSubresourceInfoFromMemObjThenCorrectInfoIsReturned, - givenTheSameD3DBufferWhenNextCreateIsCalledThenFail, - givenD3DTextureWithTheSameSubresourceWhenNextCreateIsCalledThenFail, - givenInvalidSubresourceWhenCreateTexture2dIsCalledThenFail, - givenInvalidSubresourceWhenCreateTexture3dIsCalledThenFail, - givenReadonlyFormatWhenLookingForSurfaceFormatThenReturnValidFormat, - givenWriteOnlyFormatWhenLookingForSurfaceFormatThenReturnValidFormat, - givenReadWriteFormatWhenLookingForSurfaceFormatThenReturnValidFormat, - givenNV12FormatAndEvenPlaneWhen2dCreatedThenSetPlaneParams, - givenSharedObjectFromInvalidContextWhen2dCreatedThenReturnCorrectCode, - givenSharedObjectFromInvalidContextAndNTHandleWhen2dCreatedThenReturnCorrectCode, - givenSharedObjectAndAlocationFailedWhen2dCreatedThenReturnCorrectCode, - givenSharedObjectAndNTHandleAndAllocationFailedWhen2dCreatedThenReturnCorrectCode, - givenP010FormatAndEvenPlaneWhen2dCreatedThenSetPlaneParams, - givenP016FormatAndEvenPlaneWhen2dCreatedThenSetPlaneParams, - givenNV12FormatAndOddPlaneWhen2dCreatedThenSetPlaneParams, - givenP010FormatAndOddPlaneWhen2dCreatedThenSetPlaneParams, - givenP016FormatAndOddPlaneWhen2dCreatedThenSetPlaneParams, - givenPackedFormatWhenLookingForSurfaceFormatWithPackedNotSupportedThenReturnNull, - givenPackedFormatWhenLookingForSurfaceFormatWithPackedSupportedThenReturnValidFormat); +REGISTER_TYPED_TEST_SUITE_P(D3DTests, + GivenSpecificDeviceSetWhenGettingDeviceIDsFromD3DThenOnlySelectedDevicesAreReturned, + GivenSpecificDeviceSourceWhenGettingDeviceIDsFromD3DThenOnlySelectedDevicesAreReturned, + givenNonIntelVendorWhenGetDeviceIdIsCalledThenReturnError, + WhenCreatingFromD3DBufferKhrApiThenValidBufferIsReturned, + WhenCreatingFromD3D2dTextureKhrApiThenValidImageIsReturned, + WhenCreatingFromD3D3dTextureKhrApiThenValidImageIsReturned, + givenSharedResourceFlagWhenCreateBufferThenStagingBufferEqualsPassedBuffer, + givenNonSharedResourceFlagWhenCreateBufferThenCreateNewStagingBuffer, + givenNonSharedResourceBufferWhenAcquiredThenCopySubregion, + givenSharedResourceBufferWhenAcquiredThenDontCopySubregion, + givenSharedResourceBufferAndInteropUserSyncDisabledWhenAcquiredThenFlushOnAcquire, + WhenGettingPreferD3DSharedResourcesThenCorrectValueIsReturned, + WhenGettingD3DResourceInfoFromMemObjThenCorrectInfoIsReturned, + WhenGettingD3DSubresourceInfoFromMemObjThenCorrectInfoIsReturned, + givenTheSameD3DBufferWhenNextCreateIsCalledThenFail, + givenD3DTextureWithTheSameSubresourceWhenNextCreateIsCalledThenFail, + givenInvalidSubresourceWhenCreateTexture2dIsCalledThenFail, + givenInvalidSubresourceWhenCreateTexture3dIsCalledThenFail, + givenReadonlyFormatWhenLookingForSurfaceFormatThenReturnValidFormat, + givenWriteOnlyFormatWhenLookingForSurfaceFormatThenReturnValidFormat, + givenReadWriteFormatWhenLookingForSurfaceFormatThenReturnValidFormat, + givenNV12FormatAndEvenPlaneWhen2dCreatedThenSetPlaneParams, + givenSharedObjectFromInvalidContextWhen2dCreatedThenReturnCorrectCode, + givenSharedObjectFromInvalidContextAndNTHandleWhen2dCreatedThenReturnCorrectCode, + givenSharedObjectAndAlocationFailedWhen2dCreatedThenReturnCorrectCode, + givenSharedObjectAndNTHandleAndAllocationFailedWhen2dCreatedThenReturnCorrectCode, + givenP010FormatAndEvenPlaneWhen2dCreatedThenSetPlaneParams, + givenP016FormatAndEvenPlaneWhen2dCreatedThenSetPlaneParams, + givenNV12FormatAndOddPlaneWhen2dCreatedThenSetPlaneParams, + givenP010FormatAndOddPlaneWhen2dCreatedThenSetPlaneParams, + givenP016FormatAndOddPlaneWhen2dCreatedThenSetPlaneParams, + givenPackedFormatWhenLookingForSurfaceFormatWithPackedNotSupportedThenReturnNull, + givenPackedFormatWhenLookingForSurfaceFormatWithPackedSupportedThenReturnValidFormat); -INSTANTIATE_TYPED_TEST_CASE_P(D3DSharingTests, D3DTests, D3DTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(D3DSharingTests, D3DTests, D3DTypes); TEST(D3DSurfaceTest, givenD3DSurfaceWhenInvalidMemObjectIsPassedToValidateUpdateDataThenInvalidMemObjectErrorIsReturned) { class MockD3DSurface : public D3DSurface { diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp index 6922833472..21ab543d08 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ #include "gtest/gtest.h" namespace NEO { -TYPED_TEST_CASE_P(D3DTests); +TYPED_TEST_SUITE_P(D3DTests); TYPED_TEST_P(D3DTests, givenSharedResourceBufferAndInteropUserSyncEnabledWhenReleaseIsCalledThenDontDoExplicitFinish) { this->context->setInteropUserSyncEnabled(true); @@ -705,37 +705,37 @@ TYPED_TEST_P(D3DTests, givenUnsupportedFormatWhenCreatingTexture3dThenInvalidIma EXPECT_EQ(1u, this->mockSharingFcns->getTexture3dDescCalled); } -REGISTER_TYPED_TEST_CASE_P(D3DTests, - givenSharedResourceBufferAndInteropUserSyncEnabledWhenReleaseIsCalledThenDontDoExplicitFinish, - givenNonSharedResourceBufferAndInteropUserSyncDisabledWhenReleaseIsCalledThenDoExplicitFinishTwice, - givenSharedResourceBufferAndInteropUserSyncDisabledWhenReleaseIsCalledThenDoExplicitFinishOnce, - givenNonSharedResourceBufferAndInteropUserSyncEnabledWhenReleaseIsCalledThenDoExplicitFinishOnce, - givenSharedResourceFlagWhenCreate2dTextureThenStagingTextureEqualsPassedTexture, - givenNonSharedResourceFlagWhenCreate2dTextureThenCreateStagingTexture, - givenSharedResourceFlagWhenCreate3dTextureThenStagingTextureEqualsPassedTexture, - givenNonSharedResourceFlagWhenCreate3dTextureThenCreateStagingTexture, - givenD3DDeviceParamWhenContextCreationThenSetProperValues, - givenSharedNtHandleFlagWhenCreate2dTextureThenGetNtHandle, - givenSharedNtHandleFlagWhenCreate3dTextureThenGetNtHandle, - WhenFillingBufferDescThenBufferContentIsCorrect, - WhenFillingTexture2dDescThenImageContentIsCorrect, - WhenFillingTexture3dDescThenImageContentIsCorrect, - givenPlaneWhenFindYuvSurfaceCalledThenReturnValidImgFormat, - GivenForced32BitAddressingWhenCreatingBufferThenBufferHas32BitAllocation, - givenD3DTexture2dWhenOclImageIsCreatedThenSharedImageAllocationTypeIsSet, - givenD3DTexture3dWhenOclImageIsCreatedThenSharedImageAllocationTypeIsSet, - givenSharedObjectFromInvalidContextWhen3dCreatedThenReturnCorrectCode, - givenSharedObjectFromInvalidContextAndNTHandleWhen3dCreatedThenReturnCorrectCode, - givenSharedObjectAndAlocationFailedWhen3dCreatedThenReturnCorrectCode, - givenSharedObjectAndNTHandleAndAllocationFailedWhen3dCreatedThenReturnCorrectCode, - givenFormatNotSupportedByDxWhenGettingSupportedFormatsThenOnlySupportedFormatsAreReturned, - givenUnsupportedFormatWhenCreatingTexture2dThenInvalidImageFormatDescriptorIsReturned, - givenUnsupportedFormatWhenCreatingTexture3dThenInvalidImageFormatDescriptorIsReturned, - givenTextureDescWhenUnorderedAccessViewEnabledThenIsUavOrRtvIsSet, - givenTextureDescWhenRenderTargetViewEnabledThenIsUavOrRtvIsSet, - givenTextureDescWhenBindFlagsEqZeroThenIsUavOrRtvIsNotSet); +REGISTER_TYPED_TEST_SUITE_P(D3DTests, + givenSharedResourceBufferAndInteropUserSyncEnabledWhenReleaseIsCalledThenDontDoExplicitFinish, + givenNonSharedResourceBufferAndInteropUserSyncDisabledWhenReleaseIsCalledThenDoExplicitFinishTwice, + givenSharedResourceBufferAndInteropUserSyncDisabledWhenReleaseIsCalledThenDoExplicitFinishOnce, + givenNonSharedResourceBufferAndInteropUserSyncEnabledWhenReleaseIsCalledThenDoExplicitFinishOnce, + givenSharedResourceFlagWhenCreate2dTextureThenStagingTextureEqualsPassedTexture, + givenNonSharedResourceFlagWhenCreate2dTextureThenCreateStagingTexture, + givenSharedResourceFlagWhenCreate3dTextureThenStagingTextureEqualsPassedTexture, + givenNonSharedResourceFlagWhenCreate3dTextureThenCreateStagingTexture, + givenD3DDeviceParamWhenContextCreationThenSetProperValues, + givenSharedNtHandleFlagWhenCreate2dTextureThenGetNtHandle, + givenSharedNtHandleFlagWhenCreate3dTextureThenGetNtHandle, + WhenFillingBufferDescThenBufferContentIsCorrect, + WhenFillingTexture2dDescThenImageContentIsCorrect, + WhenFillingTexture3dDescThenImageContentIsCorrect, + givenPlaneWhenFindYuvSurfaceCalledThenReturnValidImgFormat, + GivenForced32BitAddressingWhenCreatingBufferThenBufferHas32BitAllocation, + givenD3DTexture2dWhenOclImageIsCreatedThenSharedImageAllocationTypeIsSet, + givenD3DTexture3dWhenOclImageIsCreatedThenSharedImageAllocationTypeIsSet, + givenSharedObjectFromInvalidContextWhen3dCreatedThenReturnCorrectCode, + givenSharedObjectFromInvalidContextAndNTHandleWhen3dCreatedThenReturnCorrectCode, + givenSharedObjectAndAlocationFailedWhen3dCreatedThenReturnCorrectCode, + givenSharedObjectAndNTHandleAndAllocationFailedWhen3dCreatedThenReturnCorrectCode, + givenFormatNotSupportedByDxWhenGettingSupportedFormatsThenOnlySupportedFormatsAreReturned, + givenUnsupportedFormatWhenCreatingTexture2dThenInvalidImageFormatDescriptorIsReturned, + givenUnsupportedFormatWhenCreatingTexture3dThenInvalidImageFormatDescriptorIsReturned, + givenTextureDescWhenUnorderedAccessViewEnabledThenIsUavOrRtvIsSet, + givenTextureDescWhenRenderTargetViewEnabledThenIsUavOrRtvIsSet, + givenTextureDescWhenBindFlagsEqZeroThenIsUavOrRtvIsNotSet); -INSTANTIATE_TYPED_TEST_CASE_P(D3DSharingTests, D3DTests, D3DTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(D3DSharingTests, D3DTests, D3DTypes); using D3D10Test = D3DTests; diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 49664fd906..b2b780cc52 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -779,7 +779,7 @@ TEST_P(MultipleDeviceTest, givenMultipleDevicesWhenGetNumTilesThenReturnNumberOf platformsImpl->clear(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MultiDeviceTests, MultipleDeviceTest, testing::Range(1u, 5u)); diff --git a/opencl/test/unit_test/device/get_device_info_size_tests.cpp b/opencl/test/unit_test/device/get_device_info_size_tests.cpp index a70dd59206..25b1916640 100644 --- a/opencl/test/unit_test/device/get_device_info_size_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_size_tests.cpp @@ -137,7 +137,7 @@ std::pair deviceInfoParams2[] = { // {CL_DRIVER_VERSION, sizeof(char[])}, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Device_, GetDeviceInfoSize, testing::ValuesIn(deviceInfoParams2)); @@ -226,7 +226,7 @@ std::pair deviceInfoImageParams[] = { {CL_DEVICE_MAX_WRITE_IMAGE_ARGS, sizeof(cl_uint)}, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Device_, GetDeviceInfoForImage, testing::ValuesIn(deviceInfoImageParams)); diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index e22518b4d9..a49ff5a57f 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -997,7 +997,7 @@ cl_device_info deviceInfoParams[] = { CL_DRIVER_VERSION, CL_DRIVER_UUID_KHR}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Device_, GetDeviceInfo, testing::ValuesIn(deviceInfoParams)); @@ -1218,7 +1218,7 @@ cl_device_info deviceAttributeQueryParams[] = { CL_DEVICE_NUM_THREADS_PER_EU_INTEL, CL_DEVICE_FEATURE_CAPABILITIES_INTEL}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Device_, DeviceAttributeQueryTest, testing::ValuesIn(deviceAttributeQueryParams)); diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index cc3c5a6b50..1479419240 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -786,9 +786,9 @@ TEST_P(InternalsEventProfilingTest, GivenProfilingWhenEventCreatedThenProfilingS EXPECT_TRUE(event->isProfilingEnabled()); } -INSTANTIATE_TEST_CASE_P(InternalsEventProfilingTest, - InternalsEventProfilingTest, - ::testing::ValuesIn(commands)); +INSTANTIATE_TEST_SUITE_P(InternalsEventProfilingTest, + InternalsEventProfilingTest, + ::testing::ValuesIn(commands)); TEST_F(InternalsEventTest, GivenProfilingWhenUserEventCreatedThenProfilingNotSet) { const cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, CL_QUEUE_PROFILING_ENABLE, 0}; diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests_ocl.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests_ocl.cpp index 8dedcb1c6b..6ed4c4adc2 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests_ocl.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests_ocl.cpp @@ -143,7 +143,7 @@ TEST_F(GmmTests, WhenConvertingPlanesThenCorrectPlaneIsReturned) { class GmmImgTest : public GmmTests, public ::testing::WithParamInterface {}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GmmImgTests, GmmImgTest, testing::ValuesIn(GmmTestConst::imgTypes)); diff --git a/opencl/test/unit_test/helpers/base_object_tests.cpp b/opencl/test/unit_test/helpers/base_object_tests.cpp index a1e7ffa6a6..56512635d6 100644 --- a/opencl/test/unit_test/helpers/base_object_tests.cpp +++ b/opencl/test/unit_test/helpers/base_object_tests.cpp @@ -116,12 +116,12 @@ typedef ::testing::Types< MockCommandQueue> BaseObjectTypesForCastInvalidMagicTest; -TYPED_TEST_CASE(BaseObjectTests, BaseObjectTypes); +TYPED_TEST_SUITE(BaseObjectTests, BaseObjectTypes); // "typedef" BaseObjectTests template to use with different TypeParams for testing template using BaseObjectWithDefaultCtorTests = BaseObjectTests; -TYPED_TEST_CASE(BaseObjectWithDefaultCtorTests, BaseObjectTypesForCastInvalidMagicTest); +TYPED_TEST_SUITE(BaseObjectWithDefaultCtorTests, BaseObjectTypesForCastInvalidMagicTest); TYPED_TEST(BaseObjectWithDefaultCtorTests, GivenInvalidMagicWhenCastingToObjectThenNullptrIsReturned) { MockObject *object = new MockObject; diff --git a/opencl/test/unit_test/helpers/mipmap_tests.cpp b/opencl/test/unit_test/helpers/mipmap_tests.cpp index 6bccd03da5..747ec6e99f 100644 --- a/opencl/test/unit_test/helpers/mipmap_tests.cpp +++ b/opencl/test/unit_test/helpers/mipmap_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -25,16 +25,16 @@ TEST_P(MipLevelTest, givenMemObjectTypeThenProperMipLevelIsReturned) { EXPECT_EQ(static_cast(pair.second), findMipLevel(pair.first, testOrigin)); } -INSTANTIATE_TEST_CASE_P(MipLevel, - MipLevelTest, - ::testing::Values(std::make_pair(CL_MEM_OBJECT_IMAGE1D, testOrigin[1]), - std::make_pair(CL_MEM_OBJECT_IMAGE1D_ARRAY, testOrigin[2]), - std::make_pair(CL_MEM_OBJECT_IMAGE2D, testOrigin[2]), - std::make_pair(CL_MEM_OBJECT_IMAGE2D_ARRAY, testOrigin[3]), - std::make_pair(CL_MEM_OBJECT_IMAGE3D, testOrigin[3]), - std::make_pair(CL_MEM_OBJECT_BUFFER, 0U), - std::make_pair(CL_MEM_OBJECT_IMAGE1D_BUFFER, 0U), - std::make_pair(CL_MEM_OBJECT_PIPE, 0U))); +INSTANTIATE_TEST_SUITE_P(MipLevel, + MipLevelTest, + ::testing::Values(std::make_pair(CL_MEM_OBJECT_IMAGE1D, testOrigin[1]), + std::make_pair(CL_MEM_OBJECT_IMAGE1D_ARRAY, testOrigin[2]), + std::make_pair(CL_MEM_OBJECT_IMAGE2D, testOrigin[2]), + std::make_pair(CL_MEM_OBJECT_IMAGE2D_ARRAY, testOrigin[3]), + std::make_pair(CL_MEM_OBJECT_IMAGE3D, testOrigin[3]), + std::make_pair(CL_MEM_OBJECT_BUFFER, 0U), + std::make_pair(CL_MEM_OBJECT_IMAGE1D_BUFFER, 0U), + std::make_pair(CL_MEM_OBJECT_PIPE, 0U))); typedef ::testing::TestWithParam> MipLevelOriginIdxTest; @@ -43,16 +43,16 @@ TEST_P(MipLevelOriginIdxTest, givenMemObjectTypeWhenGettingMipLevelOriginIdxThen EXPECT_EQ(static_cast(pair.second), getMipLevelOriginIdx(pair.first)); } -INSTANTIATE_TEST_CASE_P(MipLevelOriginIdx, - MipLevelOriginIdxTest, - ::testing::Values(std::make_pair(CL_MEM_OBJECT_IMAGE1D, 1U), - std::make_pair(CL_MEM_OBJECT_IMAGE1D_ARRAY, 2U), - std::make_pair(CL_MEM_OBJECT_IMAGE2D, 2U), - std::make_pair(CL_MEM_OBJECT_IMAGE2D_ARRAY, 3U), - std::make_pair(CL_MEM_OBJECT_IMAGE3D, 3U), - std::make_pair(CL_MEM_OBJECT_IMAGE1D_BUFFER, 0U), - std::make_pair(CL_MEM_OBJECT_BUFFER, static_cast(-1)), - std::make_pair(CL_MEM_OBJECT_PIPE, static_cast(-1)))); +INSTANTIATE_TEST_SUITE_P(MipLevelOriginIdx, + MipLevelOriginIdxTest, + ::testing::Values(std::make_pair(CL_MEM_OBJECT_IMAGE1D, 1U), + std::make_pair(CL_MEM_OBJECT_IMAGE1D_ARRAY, 2U), + std::make_pair(CL_MEM_OBJECT_IMAGE2D, 2U), + std::make_pair(CL_MEM_OBJECT_IMAGE2D_ARRAY, 3U), + std::make_pair(CL_MEM_OBJECT_IMAGE3D, 3U), + std::make_pair(CL_MEM_OBJECT_IMAGE1D_BUFFER, 0U), + std::make_pair(CL_MEM_OBJECT_BUFFER, static_cast(-1)), + std::make_pair(CL_MEM_OBJECT_PIPE, static_cast(-1)))); TEST(MipmapHelper, givenClImageDescWithoutMipLevelsWhenIsMipMappedIsCalledThenFalseIsReturned) { cl_image_desc desc = {}; @@ -165,6 +165,6 @@ constexpr myTuple testOrigins[]{myTuple({{2, 3, 5, 7}}, myTuple({{2, 0, 0, 0}}, 0u, CL_MEM_OBJECT_IMAGE1D)}; -INSTANTIATE_TEST_CASE_P(MipMapOffset, - MipOffsetTest, - ::testing::ValuesIn(testOrigins)); +INSTANTIATE_TEST_SUITE_P(MipMapOffset, + MipOffsetTest, + ::testing::ValuesIn(testOrigins)); diff --git a/opencl/test/unit_test/helpers/validator_tests.cpp b/opencl/test/unit_test/helpers/validator_tests.cpp index 347fe8d546..b17b28f621 100644 --- a/opencl/test/unit_test/helpers/validator_tests.cpp +++ b/opencl/test/unit_test/helpers/validator_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ template struct ValidatorFixture : public ::testing::Test { }; -TYPED_TEST_CASE_P(ValidatorFixture); +TYPED_TEST_SUITE_P(ValidatorFixture); TYPED_TEST_P(ValidatorFixture, GivenNullPtrWhenValidatingThenSuccessIsReturned) { TypeParam object = nullptr; @@ -47,7 +47,7 @@ TYPED_TEST_P(ValidatorFixture, GivenRandomMemoryWhenValidatingThenSuccessIsRetur EXPECT_EQ(rv, validateObjects(object)); } -REGISTER_TYPED_TEST_CASE_P( +REGISTER_TYPED_TEST_SUITE_P( ValidatorFixture, GivenNullPtrWhenValidatingThenSuccessIsReturned, GivenRandomMemoryWhenValidatingThenSuccessIsReturned); @@ -66,7 +66,7 @@ typedef ::testing::Types< cl_sampler> ValidatorParams; -INSTANTIATE_TYPED_TEST_CASE_P(Validator, ValidatorFixture, ValidatorParams); +INSTANTIATE_TYPED_TEST_SUITE_P(Validator, ValidatorFixture, ValidatorParams); TEST(GenericValidator, GivenNullCtxAndNullCqWhenValidatingThenInvalidContextIsReturned) { cl_context context = nullptr; @@ -181,9 +181,9 @@ TEST_P(PatternSizeValid, GivenValidPatternSizeWhenValidatingThenSuccessIsReturne EXPECT_EQ(CL_SUCCESS, validateObjects(psv)); } -INSTANTIATE_TEST_CASE_P(PatternSize, - PatternSizeValid, - ::testing::Values(1, 2, 4, 8, 16, 32, 64, 128)); +INSTANTIATE_TEST_SUITE_P(PatternSize, + PatternSizeValid, + ::testing::Values(1, 2, 4, 8, 16, 32, 64, 128)); typedef ::testing::TestWithParam PatternSizeInvalid; @@ -192,9 +192,9 @@ TEST_P(PatternSizeInvalid, GivenInvalidPatternSizeWhenValidatingThenInvalidValue EXPECT_EQ(CL_INVALID_VALUE, validateObjects(psv)); } -INSTANTIATE_TEST_CASE_P(PatternSize, - PatternSizeInvalid, - ::testing::Values(0, 3, 5, 256, 512, 1024)); +INSTANTIATE_TEST_SUITE_P(PatternSize, + PatternSizeInvalid, + ::testing::Values(0, 3, 5, 256, 512, 1024)); TEST(withCastToInternal, GivenNullPtrWhenCastingThenNullPtrIsReturned) { Context *pContext = nullptr; diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp index ebf6d7ab49..9d73bf2de3 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -588,7 +588,7 @@ struct SetArgHandlerSetArgBuffer { using SetArgHandlers = ::testing::Types; -TYPED_TEST_CASE(KernelArgSvmTestTyped, SetArgHandlers); +TYPED_TEST_SUITE(KernelArgSvmTestTyped, SetArgHandlers); HWTEST_TYPED_TEST(KernelArgSvmTestTyped, GivenBufferKernelArgWhenBufferOffsetIsNeededThenSetArgSetsIt) { const ClDeviceInfo &devInfo = KernelArgSvmFixture::pClDevice->getDeviceInfo(); if (devInfo.svmCapabilities == 0) { diff --git a/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp index 40186d8c4b..7f7610b562 100644 --- a/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -84,7 +84,7 @@ typedef ::testing::Types< unsigned long> KernelArgImmediateTypes; -TYPED_TEST_CASE(KernelArgImmediateTest, KernelArgImmediateTypes); +TYPED_TEST_SUITE(KernelArgImmediateTest, KernelArgImmediateTypes); TYPED_TEST(KernelArgImmediateTest, WhenSettingKernelArgThenArgIsSetCorrectly) { auto val = (TypeParam)0xaaaaaaaaULL; diff --git a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp index f327588cd3..a6cc0acd59 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -141,7 +141,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, KernelSLMAndBarrierTest, GivenStaticSlmSizeWhenProgr } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( SlmSizes, KernelSLMAndBarrierTest, testing::ValuesIn(slmSizeInKb)); diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 2c12c91d9b..f42076393a 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -3494,9 +3494,9 @@ static ThreadArbitrationPolicy threadArbitrationPolicies[] = { ThreadArbitrationPolicy::RoundRobin, ThreadArbitrationPolicy::RoundRobinAfterDependency}; -INSTANTIATE_TEST_CASE_P(ThreadArbitrationPolicyKernelInitializationTests, - ThreadArbitrationPolicyKernelTest, - testing::ValuesIn(threadArbitrationPolicies)); +INSTANTIATE_TEST_SUITE_P(ThreadArbitrationPolicyKernelInitializationTests, + ThreadArbitrationPolicyKernelTest, + testing::ValuesIn(threadArbitrationPolicies)); TEST(KernelTest, givenKernelWhenSettingAdditionalKernelExecInfoThenCorrectValueIsSet) { UltClDeviceFactory deviceFactory{1, 0}; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index a1281c269b..986630cdc0 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -231,7 +231,7 @@ static cl_mem_flags nonReadOnlyFlags[] = { CL_MEM_HOST_WRITE_ONLY | CL_MEM_WRITE_ONLY, 0}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nonReadOnlyFlags, BufferReadOnlyTest, testing::ValuesIn(nonReadOnlyFlags)); @@ -990,7 +990,7 @@ cl_mem_flags noHostPtrFlags[] = { CL_MEM_HOST_WRITE_ONLY, CL_MEM_HOST_NO_ACCESS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( BufferTest_Create, NoHostPtr, testing::ValuesIn(noHostPtrFlags)); @@ -1251,7 +1251,7 @@ cl_mem_flags validHostPtrFlags[] = { CL_MEM_HOST_WRITE_ONLY | CL_MEM_COPY_HOST_PTR, CL_MEM_HOST_NO_ACCESS | CL_MEM_COPY_HOST_PTR}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( BufferTest_Create, ValidHostPtr, testing::ValuesIn(validHostPtrFlags)); @@ -1294,7 +1294,7 @@ TEST_P(BufferCalculateHostPtrSize, WhenCalculatingHostPtrSizeThenItIsCorrect) { EXPECT_EQ(hostPtrSize, calculatedSize); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( BufferCalculateHostPtrSizes, BufferCalculateHostPtrSize, testing::ValuesIn(inputs)); @@ -2058,7 +2058,7 @@ static uint64_t pointers[] = { 0x1005, 0x2000}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( pointers, BufferL3CacheTests, testing::ValuesIn(pointers)); diff --git a/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp b/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp index 4b1dbde165..c6bd8182ef 100644 --- a/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp +++ b/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -80,7 +80,7 @@ TEST_P(ReadWriteFormatTest, GivenValidFormatWhenCreatingImageThenImageIsCreated) static const size_t zero = 0; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImage, ReadWriteFormatTest, testing::Range(zero, SurfaceFormats::readWrite().size())); @@ -103,7 +103,7 @@ TEST_P(ReadOnlyFormatTest, GivenValidReadOnlyFormatWhenCreatingImageThenImageIsC delete image; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImage, ReadOnlyFormatTest, testing::Range(zero, SurfaceFormats::readOnly12().size())); @@ -126,7 +126,7 @@ TEST_P(WriteOnlyFormatTest, GivenValidWriteOnlyFormatWhenCreatingImageThenImageI delete image; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImage, WriteOnlyFormatTest, testing::Range(zero, SurfaceFormats::writeOnly().size())); diff --git a/opencl/test/unit_test/mem_obj/image1d_tests.cpp b/opencl/test/unit_test/mem_obj/image1d_tests.cpp index 89a240e701..a37aacf24f 100644 --- a/opencl/test/unit_test/mem_obj/image1d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image1d_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -138,7 +138,7 @@ static cl_mem_object_type image1DTypes[] = { CL_MEM_OBJECT_IMAGE1D_BUFFER, CL_MEM_OBJECT_IMAGE1D_ARRAY}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImage1DTestCreate, CreateImage1DType, testing::ValuesIn(image1DTypes)); diff --git a/opencl/test/unit_test/mem_obj/image2d_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_tests.cpp index aacd53f977..4ba70033bd 100644 --- a/opencl/test/unit_test/mem_obj/image2d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -114,7 +114,7 @@ static cl_mem_object_type image2DTypes[] = { CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImage2DTestCreate, CreateImage2DType, testing::ValuesIn(image2DTypes)); diff --git a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp index 1103e8cd63..a570d26c12 100644 --- a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -104,7 +104,7 @@ static cl_mem_object_type arrayImageTypes[] = { CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D_ARRAY}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageArraySizeTestCreate, CreateImageArraySize, testing::ValuesIn(arrayImageTypes)); @@ -145,7 +145,7 @@ static cl_mem_object_type nonArrayImageTypes[] = { CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE3D}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageArraySizeTest_Create, CreateImageNonArraySize, testing::ValuesIn(nonArrayImageTypes)); @@ -241,7 +241,7 @@ static cl_mem_object_type allImageTypes[] = { CL_MEM_OBJECT_IMAGE3D, CL_MEM_OBJECT_IMAGE2D_ARRAY}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageArraySizeTest_Create, CreateImageSize, testing::ValuesIn(allImageTypes)); @@ -256,7 +256,7 @@ static cl_mem_object_type allImageTypesWithBadOne[] = { CL_MEM_OBJECT_IMAGE3D, CL_MEM_OBJECT_IMAGE2D_ARRAY}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageArraySizeTest_Create, CreateImageOffset, testing::ValuesIn(allImageTypesWithBadOne)); diff --git a/opencl/test/unit_test/mem_obj/image_format_tests.cpp b/opencl/test/unit_test/mem_obj/image_format_tests.cpp index 2b0d702282..4071a1cb0c 100644 --- a/opencl/test/unit_test/mem_obj/image_format_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_format_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -53,7 +53,7 @@ std::tuple paramsForAlphaChannelTests[] = { {CL_YVYU_INTEL, false}, {CL_VYUY_INTEL, false}}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageFormatTests, HasAlphaChannelTest, ::testing::ValuesIn(paramsForAlphaChannelTests)); diff --git a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp index 60bd048c9a..91e22e180b 100644 --- a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -222,7 +222,7 @@ static uint32_t imageTypes[] = { CL_MEM_OBJECT_IMAGE2D_ARRAY}; decltype(SurfaceFormats::readWrite().size()) readWriteSurfaceFormatsStart = 0u; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Redescribe, ImageRedescribeTest, testing::Combine( diff --git a/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp b/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp index ba459b822a..2bc079cb35 100644 --- a/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -67,12 +67,12 @@ TEST_P(SnormSurfaceFormatTests, givenSnormOclFormatWhenCheckingrReadOnlySurfaceF EXPECT_EQ(6u, snormFormatsFound); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageSnormTests, SnormSurfaceFormatAccessFlagsTests, ::testing::ValuesIn(flagsForTests)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageSnormTests, SnormSurfaceFormatTests, ::testing::ValuesIn(paramsForSnormTests)); diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index 731e69be8e..8af13ea2d9 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -653,7 +653,7 @@ static cl_mem_flags noHostPtrFlags[] = { CL_MEM_HOST_WRITE_ONLY, CL_MEM_HOST_NO_ACCESS}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImageTest_Create, CreateImageNoHostPtr, testing::ValuesIn(noHostPtrFlags)); @@ -1084,7 +1084,7 @@ static cl_mem_flags validHostPtrFlags[] = { CL_MEM_HOST_WRITE_ONLY | CL_MEM_COPY_HOST_PTR, CL_MEM_HOST_NO_ACCESS | CL_MEM_COPY_HOST_PTR}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateImageTest_Create, CreateImageHostPtr, testing::ValuesIn(validHostPtrFlags)); @@ -1594,10 +1594,10 @@ TEST_P(MipLevelCoordinateTest, givenMipmappedImageWhenValidateRegionAndOriginIsC EXPECT_EQ(CL_INVALID_MIP_LEVEL, Image::validateRegionAndOrigin(origin, region, desc)); } -INSTANTIATE_TEST_CASE_P(MipLevelCoordinate, - MipLevelCoordinateTest, - ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, - CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); +INSTANTIATE_TEST_SUITE_P(MipLevelCoordinate, + MipLevelCoordinateTest, + ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, + CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); typedef ::testing::TestWithParam> HasSlicesTest; @@ -1606,15 +1606,15 @@ TEST_P(HasSlicesTest, givenMemObjectTypeWhenHasSlicesIsCalledThenReturnsTrueIfTy EXPECT_EQ(pair.second, Image::hasSlices(pair.first)); } -INSTANTIATE_TEST_CASE_P(HasSlices, - HasSlicesTest, - ::testing::Values(std::make_pair(CL_MEM_OBJECT_IMAGE1D, false), - std::make_pair(CL_MEM_OBJECT_IMAGE1D_ARRAY, true), - std::make_pair(CL_MEM_OBJECT_IMAGE2D, false), - std::make_pair(CL_MEM_OBJECT_IMAGE2D_ARRAY, true), - std::make_pair(CL_MEM_OBJECT_IMAGE3D, true), - std::make_pair(CL_MEM_OBJECT_BUFFER, false), - std::make_pair(CL_MEM_OBJECT_PIPE, false))); +INSTANTIATE_TEST_SUITE_P(HasSlices, + HasSlicesTest, + ::testing::Values(std::make_pair(CL_MEM_OBJECT_IMAGE1D, false), + std::make_pair(CL_MEM_OBJECT_IMAGE1D_ARRAY, true), + std::make_pair(CL_MEM_OBJECT_IMAGE2D, false), + std::make_pair(CL_MEM_OBJECT_IMAGE2D_ARRAY, true), + std::make_pair(CL_MEM_OBJECT_IMAGE3D, true), + std::make_pair(CL_MEM_OBJECT_BUFFER, false), + std::make_pair(CL_MEM_OBJECT_PIPE, false))); typedef ::testing::Test ImageTransformTest; HWTEST_F(ImageTransformTest, givenSurfaceStateWhenTransformImage3dTo2dArrayIsCalledThenSurface2dArrayIsSet) { diff --git a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp index 94d5974222..dcbf344992 100644 --- a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -174,5 +174,5 @@ static uint32_t tiledImageTypes[] = { static uint32_t nonTiledImageTypes[] = { CL_MEM_OBJECT_IMAGE1D}; -INSTANTIATE_TEST_CASE_P(CreateTiledImageTest, CreateTiledImageTest, testing::ValuesIn(tiledImageTypes)); -INSTANTIATE_TEST_CASE_P(CreateNonTiledImageTest, CreateNonTiledImageTest, testing::ValuesIn(nonTiledImageTypes)); +INSTANTIATE_TEST_SUITE_P(CreateTiledImageTest, CreateTiledImageTest, testing::ValuesIn(tiledImageTypes)); +INSTANTIATE_TEST_SUITE_P(CreateNonTiledImageTest, CreateNonTiledImageTest, testing::ValuesIn(nonTiledImageTypes)); diff --git a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp index 29d756c778..c5de8cfea4 100644 --- a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp @@ -292,17 +292,17 @@ static cl_image_desc invalidImageSize[] = { {0}}, /*mem_object */ }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidDescriptor, ::testing::ValuesIn(validImageDesc)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidDescriptor, ::testing::ValuesIn(invalidImageDesc)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidSize, ::testing::ValuesIn(invalidImageSize)); @@ -346,14 +346,14 @@ TEST_P(InvalidSingleChannelFormat, givenInvalidSingleChannelChannelDataTypeWhenV validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidSingleChannelFormat, ::testing::Combine( ::testing::ValuesIn(validSingleChannelOrder), ::testing::ValuesIn(validSingleChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidSingleChannelFormat, ::testing::Combine( @@ -376,14 +376,14 @@ TEST_P(InvalidIntensityFormat, givenInvalidIntensityChannelDataTypeWhenValidateI validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidIntensityFormat, ::testing::Combine( ::testing::ValuesIn(validIntensityChannelOrders), ::testing::ValuesIn(validIntensityChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidIntensityFormat, ::testing::Combine( @@ -406,14 +406,14 @@ TEST_P(InvalidLuminanceFormat, givenInvalidLuminanceChannelDataTypeWhenValidateI validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidLuminanceFormat, ::testing::Combine( ::testing::ValuesIn(validLuminanceChannelOrders), ::testing::ValuesIn(validLuminanceChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidLuminanceFormat, ::testing::Combine( @@ -436,14 +436,14 @@ TEST_P(InvalidDepthFormat, givenInvalidDepthChannelDataTypeWhenValidateImageForm validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidDepthFormat, ::testing::Combine( ::testing::ValuesIn(validDepthChannelOrders), ::testing::ValuesIn(validDepthChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidDepthFormat, ::testing::Combine( @@ -466,14 +466,14 @@ TEST_P(InvalidDoubleChannelFormat, givenInvalidDoubleChannelDataTypeWhenValidate validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidDoubleChannelFormat, ::testing::Combine( ::testing::ValuesIn(validDoubleChannelOrders), ::testing::ValuesIn(validDoubleChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidDoubleChannelFormat, ::testing::Combine( @@ -496,14 +496,14 @@ TEST_P(InvalidTripleChannelFormat, givenInvalidTripleChannelDataTypeWhenValidate validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidTripleChannelFormat, ::testing::Combine( ::testing::ValuesIn(validTripleChannelOrders), ::testing::ValuesIn(validTripleChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidTripleChannelFormat, ::testing::Combine( @@ -526,14 +526,14 @@ TEST_P(InvalidRGBAChannelFormat, givenInvalidRGBAChannelDataTypeWhenValidateImag validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidRGBAChannelFormat, ::testing::Combine( ::testing::ValuesIn(validRGBAChannelOrders), ::testing::ValuesIn(validRGBAChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidRGBAChannelFormat, ::testing::Combine( @@ -556,14 +556,14 @@ TEST_P(InvalidSRGBChannelFormat, givenInvalidSRGBChannelDataTypeWhenValidateImag validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidSRGBChannelFormat, ::testing::Combine( ::testing::ValuesIn(validSRGBChannelOrders), ::testing::ValuesIn(validSRGBChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidSRGBChannelFormat, ::testing::Combine( @@ -586,14 +586,14 @@ TEST_P(InvalidARGBChannelFormat, givenInvalidARGBChannelDataTypeWhenValidateImag validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidARGBChannelFormat, ::testing::Combine( ::testing::ValuesIn(validARGBChannelOrders), ::testing::ValuesIn(validARGBChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidARGBChannelFormat, ::testing::Combine( @@ -616,14 +616,14 @@ TEST_P(InvalidDepthStencilChannelFormat, givenInvalidDepthStencilChannelDataType validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidDepthStencilChannelFormat, ::testing::Combine( ::testing::ValuesIn(validDepthStencilChannelOrders), ::testing::ValuesIn(validDepthStencilChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidDepthStencilChannelFormat, ::testing::Combine( @@ -646,14 +646,14 @@ TEST_P(InvalidYUVImageFormat, givenInvalidYUVChannelDataTypeWhenValidateImageFor validateFormat(); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, ValidYUVImageFormat, ::testing::Combine( ::testing::ValuesIn(validYUVChannelOrders), ::testing::ValuesIn(validYUVChannelDataTypes))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ImageValidate, InvalidYUVImageFormat, ::testing::Combine( @@ -751,7 +751,7 @@ TEST_P(NormalizingFactorTests, givenChannelTypeWhenAskingForFactorThenReturnVali EXPECT_EQ(std::get<1>(GetParam()), factor); }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( NormalizingFactorTests, NormalizingFactorTests, ::testing::ValuesIn(normalizingFactorValues)); @@ -820,7 +820,7 @@ std::tuple imageFromImageValidChannelOrderPairs[] = { std::make_tuple(CL_NV12_INTEL, 0), std::make_tuple(CL_YUYV_INTEL, CL_RGBA)}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ValidParentImageFormatTests, ValidParentImageFormatTest, ::testing::ValuesIn(imageFromImageValidChannelOrderPairs)); diff --git a/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp index f98ae2a981..25a2c1f528 100644 --- a/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp +++ b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -165,9 +165,9 @@ TEST_P(MapOperationsHandlerOverlapTests, givenAlreadyMappedPtrWhenAskingForOverl EXPECT_EQ(expectOverlap, mockHandler.isOverlapping(requestedInfo)); } -INSTANTIATE_TEST_CASE_P(MapOperationsHandlerOverlapTests, - MapOperationsHandlerOverlapTests, - ::testing::ValuesIn(overlappingCombinations)); +INSTANTIATE_TEST_SUITE_P(MapOperationsHandlerOverlapTests, + MapOperationsHandlerOverlapTests, + ::testing::ValuesIn(overlappingCombinations)); struct MapOperationsStorageWhitebox : MapOperationsStorage { using MapOperationsStorage::handlers; diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp index 909c66f710..63cdeec2df 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp @@ -571,12 +571,12 @@ HWTEST_P(MemObjAsyncDestructionTest, givenMemObjWithMapAllocationWithMemUseHostP alignedFree(hostPtr); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MemObjTests, MemObjAsyncDestructionTest, testing::Bool()); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MemObjTests, MemObjSyncDestructionTest, testing::Bool()); diff --git a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp index 810e8234d7..bf68f85bf1 100644 --- a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -111,7 +111,7 @@ TEST_P(PackedYuvImageTest, GivenInvalidWidthWhenValidatingImageFormatThenInvalid EXPECT_EQ(CL_INVALID_IMAGE_DESCRIPTOR, retVal); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( PackedYuvImageTests, PackedYuvImageTest, testing::ValuesIn(packedYuvChannels)); diff --git a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp index f9ed5a8628..028bdcdabd 100644 --- a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp +++ b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -96,7 +96,7 @@ TEST_P(ZeroCopyBufferTest, GivenCacheAlignedPointerWhenCreatingBufferThenZeroCop delete buffer; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ZeroCopyBufferTests, ZeroCopyBufferTest, testing::ValuesIn(inputs)); diff --git a/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp b/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp index 83cf53eb39..6dfe645383 100644 --- a/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -65,9 +65,9 @@ TEST_P(ClearQueueTest, WhenQueueIsClearedThenAllElementsAreReleased) { int paramsForClearQueueTest[] = {1, 10, 20, 50, 100}; -INSTANTIATE_TEST_CASE_P(DeferredDeleterMtTests, - ClearQueueTest, - ::testing::ValuesIn(paramsForClearQueueTest)); +INSTANTIATE_TEST_SUITE_P(DeferredDeleterMtTests, + ClearQueueTest, + ::testing::ValuesIn(paramsForClearQueueTest)); class MyDeferredDeleter : public DeferredDeleter { public: diff --git a/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp b/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp index adf9440b7a..2cb5a9ca2f 100644 --- a/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp +++ b/opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,14 +15,14 @@ #include "opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h" namespace NEO { -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OclocProductConfigPvcTestsValues, OclocProductConfigTests, ::testing::Combine( ::testing::ValuesIn(AOT_PVC::productConfigs), ::testing::Values(IGFX_PVC))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OclocFatbinaryPvcTests, OclocFatbinaryPerProductTests, ::testing::Combine( diff --git a/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp b/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp index 0ddfbd292d..80d971ca24 100644 --- a/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp +++ b/opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp @@ -24,14 +24,14 @@ inline constexpr AOT::PRODUCT_CONFIG productConfigs[] = { AOT::DG2_G11_B0, AOT::DG2_G11_B1, AOT::DG2_G12_A0}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OclocProductConfigDg2TestsValues, OclocProductConfigTests, ::testing::Combine( ::testing::ValuesIn(productConfigs), ::testing::Values(IGFX_DG2))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OclocFatbinaryDg2Tests, OclocFatbinaryPerProductTests, ::testing::Combine( diff --git a/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp b/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp index d7650d4648..cb1b509eec 100644 --- a/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp +++ b/opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h" namespace NEO { -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( OclocFatbinaryMtlTests, OclocFatbinaryPerProductTests, ::testing::Combine( diff --git a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp index 096dd536f5..8b389f1957 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -204,7 +204,7 @@ TEST_F(PerformanceCountersProcessEventTest, givenNullptrQueryWhenProcessEventPer EXPECT_FALSE(retVal); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( PerfCountersTests, PerformanceCountersProcessEventTest, testing::Bool()); diff --git a/opencl/test/unit_test/program/kernel_data.cpp b/opencl/test/unit_test/program/kernel_data.cpp index 4397c994e5..7f966abf67 100644 --- a/opencl/test/unit_test/program/kernel_data.cpp +++ b/opencl/test/unit_test/program/kernel_data.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -413,9 +413,9 @@ TEST_P(DataParameterTest, GivenTokenTypeWhenBuildingThenProgramIsCorrect) { } // note that we start at '2' because we test kernel arg tokens elsewhere -INSTANTIATE_TEST_CASE_P(DataParameterTests, - DataParameterTest, - testing::Range(2u, static_cast(NUM_DATA_PARAMETER_TOKENS))); +INSTANTIATE_TEST_SUITE_P(DataParameterTests, + DataParameterTest, + testing::Range(2u, static_cast(NUM_DATA_PARAMETER_TOKENS))); class KernelDataParameterTest : public KernelDataTest {}; TEST_F(KernelDataParameterTest, GivenDataParameterBufferOffsetWhenBuildingThenProgramIsCorrect) { diff --git a/opencl/test/unit_test/program/process_elf_binary_tests.cpp b/opencl/test/unit_test/program/process_elf_binary_tests.cpp index e271adff51..4bbf26b46f 100644 --- a/opencl/test/unit_test/program/process_elf_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_elf_binary_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -181,9 +181,9 @@ TEST_P(ProcessElfBinaryTestsWithBinaryType, GivenBinaryTypeWhenResolveProgramThe EXPECT_EQ(0, memcmp(irBinary.get(), decodedIr.begin(), irBinarySize)); } -INSTANTIATE_TEST_CASE_P(ResolveBinaryTests, - ProcessElfBinaryTestsWithBinaryType, - ::testing::ValuesIn(binaryTypeValues)); +INSTANTIATE_TEST_SUITE_P(ResolveBinaryTests, + ProcessElfBinaryTestsWithBinaryType, + ::testing::ValuesIn(binaryTypeValues)); TEST_F(ProcessElfBinaryTests, GivenEmptyBuildOptionsWhenCreatingProgramFromBinaryThenSuccessIsReturned) { auto mockElf = std::make_unique>(device->getHardwareInfo()); diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 811d09bf99..2b5b3d1f28 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -3980,7 +3980,7 @@ TEST_P(ProgramGenerateDefaultArgsMetadataImagesTest, whenGeneratingDefaultMetada buildInfo.unpackedDeviceBinary.release(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ProgramGenerateDefaultArgsMetadataImagesTestValues, ProgramGenerateDefaultArgsMetadataImagesTest, ::testing::ValuesIn(imgTypes)); diff --git a/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp b/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp index 14d9eb6c86..93f7104fdd 100644 --- a/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp +++ b/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -71,7 +71,7 @@ cl_sampler_info samplerInfoParams[] = { CL_SAMPLER_LOD_MIN, CL_SAMPLER_LOD_MAX}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Sampler_, GetSamplerInfo, testing::ValuesIn(samplerInfoParams)); diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp index 8b77e99926..2933a177d9 100644 --- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -433,9 +433,9 @@ cl_bool normalizedCoordinatesCases[] = { CL_FALSE, CL_TRUE}; -INSTANTIATE_TEST_CASE_P(SamplerSetArg, - NormalizedTest, - ::testing::ValuesIn(normalizedCoordinatesCases)); +INSTANTIATE_TEST_SUITE_P(SamplerSetArg, + NormalizedTest, + ::testing::ValuesIn(normalizedCoordinatesCases)); //////////////////////////////////////////////////////////////////////////////// struct AddressingModeTest @@ -520,9 +520,9 @@ cl_addressing_mode addressingModeCases[] = { CL_ADDRESS_REPEAT, CL_ADDRESS_MIRRORED_REPEAT}; -INSTANTIATE_TEST_CASE_P(SamplerSetArg, - AddressingModeTest, - ::testing::ValuesIn(addressingModeCases)); +INSTANTIATE_TEST_SUITE_P(SamplerSetArg, + AddressingModeTest, + ::testing::ValuesIn(addressingModeCases)); HWTEST_F(SamplerSetArgTest, GivenMipmapsWhenSettingKernelArgSamplerThenLodAreCorrect) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; @@ -611,6 +611,6 @@ cl_filter_mode filterModeCase[] = { CL_FILTER_NEAREST, CL_FILTER_LINEAR}; -INSTANTIATE_TEST_CASE_P(SamplerSetArg, - FilterModeTest, - ::testing::ValuesIn(filterModeCase)); +INSTANTIATE_TEST_SUITE_P(SamplerSetArg, + FilterModeTest, + ::testing::ValuesIn(filterModeCase)); diff --git a/opencl/test/unit_test/sampler/sampler_tests.cpp b/opencl/test/unit_test/sampler/sampler_tests.cpp index 4a30f6cd6e..300ac4ef88 100644 --- a/opencl/test/unit_test/sampler/sampler_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -86,12 +86,12 @@ static cl_filter_mode filterModes[] = { CL_FILTER_NEAREST, CL_FILTER_LINEAR}; -INSTANTIATE_TEST_CASE_P(Sampler, - CreateSampler, - ::testing::Combine( - ::testing::ValuesIn(normalizedCoordModes), - ::testing::ValuesIn(addressingModes), - ::testing::ValuesIn(filterModes))); +INSTANTIATE_TEST_SUITE_P(Sampler, + CreateSampler, + ::testing::Combine( + ::testing::ValuesIn(normalizedCoordModes), + ::testing::ValuesIn(addressingModes), + ::testing::ValuesIn(filterModes))); typedef ::testing::TestWithParam> TransformableSamplerTest; @@ -112,12 +112,12 @@ TEST_P(TransformableSamplerTest, givenSamplerWhenHasProperParametersThenIsTransf retVal = sampler.isTransformable(); EXPECT_EQ(expectedRetVal, retVal); } -INSTANTIATE_TEST_CASE_P(Sampler, - TransformableSamplerTest, - ::testing::Combine( - ::testing::ValuesIn(normalizedCoordModes), - ::testing::ValuesIn(addressingModes), - ::testing::ValuesIn(filterModes))); +INSTANTIATE_TEST_SUITE_P(Sampler, + TransformableSamplerTest, + ::testing::Combine( + ::testing::ValuesIn(normalizedCoordModes), + ::testing::ValuesIn(addressingModes), + ::testing::ValuesIn(filterModes))); TEST(castToSamplerTest, GivenGenericPointerWhichHoldsSamplerObjectWhenCastToSamplerIsCalledThenCastWithSuccess) { cl_int retVal; diff --git a/opencl/test/unit_test/sharings/gl/linux/gl_types_tests.cpp b/opencl/test/unit_test/sharings/gl/linux/gl_types_tests.cpp index 13245a4764..1e2c72b469 100644 --- a/opencl/test/unit_test/sharings/gl/linux/gl_types_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/linux/gl_types_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -84,7 +84,7 @@ struct GlClImageFormatTests : public ::testing::WithParamInterface>, public ::testing::Test {}; -INSTANTIATE_TEST_CASE_P(GlClImageFormatTests, GlClImageFormatTests, testing::ValuesIn(glTypes::allImageFormats)); +INSTANTIATE_TEST_SUITE_P(GlClImageFormatTests, GlClImageFormatTests, testing::ValuesIn(glTypes::allImageFormats)); TEST_P(GlClImageFormatTests, WhenSettingClImageFormatThenValidFormatIsSet) { cl_image_format imgFormat = {}; @@ -102,7 +102,7 @@ struct GlClObjTypesTests : public ::testing::WithParamInterface>, public ::testing::Test {}; -INSTANTIATE_TEST_CASE_P(GlClObjTypesTests, GlClObjTypesTests, testing::ValuesIn(glTypes::allObjTypes)); +INSTANTIATE_TEST_SUITE_P(GlClObjTypesTests, GlClObjTypesTests, testing::ValuesIn(glTypes::allObjTypes)); TEST_P(GlClObjTypesTests, WhenConvertingTypeThenTypeIsSetCorrectly) { auto glType = static_cast(std::get<0>(GetParam())); diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp index a9e71589d1..1ce2c29c45 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -95,7 +95,7 @@ class CreateFromGlTextureTestsWithParams : public CreateFromGlTexture, class CreateFromGlTextureTests : public CreateFromGlTexture { }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateFromGlTextureTestsWithParams, CreateFromGlTextureTestsWithParams, testing::ValuesIn(glTextureTargets::supportedTargets)); diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp index debb99e823..6e23f88d2a 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp @@ -570,7 +570,7 @@ class GetGlTextureInfoTests : public GlSharingTextureTests, public ::testing::WithParamInterface { }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GetGlTextureInfoTests, GetGlTextureInfoTests, testing::ValuesIn(glTextureTargets::supportedTargets)); diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_types_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_types_tests.cpp index 2a6fa4155e..1e2c72b469 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_types_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_types_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -84,7 +84,7 @@ struct GlClImageFormatTests : public ::testing::WithParamInterface>, public ::testing::Test {}; -INSTANTIATE_TEST_CASE_P(GlClImageFormatTests, GlClImageFormatTests, testing::ValuesIn(glTypes::allImageFormats)); +INSTANTIATE_TEST_SUITE_P(GlClImageFormatTests, GlClImageFormatTests, testing::ValuesIn(glTypes::allImageFormats)); TEST_P(GlClImageFormatTests, WhenSettingClImageFormatThenValidFormatIsSet) { cl_image_format imgFormat = {}; @@ -102,7 +102,7 @@ struct GlClObjTypesTests : public ::testing::WithParamInterface>, public ::testing::Test {}; -INSTANTIATE_TEST_CASE_P(GlClObjTypesTests, GlClObjTypesTests, testing::ValuesIn(glTypes::allObjTypes)); +INSTANTIATE_TEST_SUITE_P(GlClObjTypesTests, GlClObjTypesTests, testing::ValuesIn(glTypes::allObjTypes)); TEST_P(GlClObjTypesTests, WhenConvertingTypeThenTypeIsSetCorrectly) { auto glType = static_cast(std::get<0>(GetParam())); diff --git a/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp index 1efecffe0e..76ce6ac2f1 100644 --- a/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,7 +30,7 @@ typedef ::testing::Types< MockCommandQueue> BaseObjectTypes; -TYPED_TEST_CASE(VABaseObjectTests, BaseObjectTypes); +TYPED_TEST_SUITE(VABaseObjectTests, BaseObjectTypes); TYPED_TEST(VABaseObjectTests, GivenCommonRuntimeThenDispatchTableAtFirstPointerInObject) { TypeParam objectDrv; diff --git a/shared/test/unit_test/command_container/command_container_tests.cpp b/shared/test/unit_test/command_container/command_container_tests.cpp index c0fb4045c5..0dfc76a795 100644 --- a/shared/test/unit_test/command_container/command_container_tests.cpp +++ b/shared/test/unit_test/command_container/command_container_tests.cpp @@ -689,7 +689,7 @@ class CommandContainerHeaps : public DeviceFixture, } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Device, CommandContainerHeaps, testing::Values( diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 9962aee443..0da1b74a3d 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -2325,7 +2325,7 @@ std::pair aubSubCaptureStatus[] = { {true, true}, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CommandStreamReceiverWithAubSubCaptureTest_program, CommandStreamReceiverWithAubSubCaptureTest, testing::ValuesIn(aubSubCaptureStatus)); diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index b12d27f3c6..500407723d 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -671,7 +671,7 @@ static bool createAubCSR[] = { false, true}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CommandStreamReceiverWithAubDumpTest_Create, CommandStreamReceiverWithAubDumpTest, testing::ValuesIn(createAubCSR)); diff --git a/shared/test/unit_test/debugger/test_l0_debugger.cpp b/shared/test/unit_test/debugger/test_l0_debugger.cpp index 826421e6ae..a88a9d9e33 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -640,4 +640,4 @@ HWTEST2_P(L0DebuggerSimpleParameterizedTest, givenChangedBaseAddressesWhenCaptur } } -INSTANTIATE_TEST_CASE_P(SBAModesForDebugger, L0DebuggerSimpleParameterizedTest, ::testing::Values(0, 1)); +INSTANTIATE_TEST_SUITE_P(SBAModesForDebugger, L0DebuggerSimpleParameterizedTest, ::testing::Values(0, 1)); diff --git a/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp b/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp index 3174eab37e..092798821a 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp @@ -338,7 +338,7 @@ HWTEST2_P(L0DebuggerBBlevelParameterizedTest, GivenOneNonZeroSbaAddressesWhenPro pDevice->getMemoryManager()->freeGraphicsMemory(streamAllocation); } -INSTANTIATE_TEST_CASE_P(BBLevelForSbaTracking, L0DebuggerBBlevelParameterizedTest, ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(BBLevelForSbaTracking, L0DebuggerBBlevelParameterizedTest, ::testing::Values(false, true)); HWTEST2_F(SingleAddressSpaceFixture, GivenAllZeroSbaAddressesWhenProgrammingSbaTrackingCommandsForSingleAddressSpaceThenNoCommandsAreAddedToStream, IsAtLeastGen12lp) { auto debugger = std::make_unique>(pDevice); diff --git a/shared/test/unit_test/gen11/icllp/linux/product_helper_tests_icllp.cpp b/shared/test/unit_test/gen11/icllp/linux/product_helper_tests_icllp.cpp index 771ab66100..4a0c3f8cee 100644 --- a/shared/test/unit_test/gen11/icllp/linux/product_helper_tests_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/linux/product_helper_tests_icllp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -48,7 +48,7 @@ ICLLPTEST_F(IcllpProductHelperLinux, GivenInvalidDeviceIdWhenConfiguringHwInfoTh template class IcllpHwInfoTests : public ::testing::Test {}; typedef ::testing::Types icllpTestTypes; -TYPED_TEST_CASE(IcllpHwInfoTests, icllpTestTypes); +TYPED_TEST_SUITE(IcllpHwInfoTests, icllpTestTypes); TYPED_TEST(IcllpHwInfoTests, WhenGettingSystemInfoThenParamsAreValid) { auto executionEnvironment = std::make_unique(); DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]); diff --git a/shared/test/unit_test/gen11/lkf/linux/product_helper_tests_lkf.cpp b/shared/test/unit_test/gen11/lkf/linux/product_helper_tests_lkf.cpp index f13bd08643..b4fe32904e 100644 --- a/shared/test/unit_test/gen11/lkf/linux/product_helper_tests_lkf.cpp +++ b/shared/test/unit_test/gen11/lkf/linux/product_helper_tests_lkf.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -50,7 +50,7 @@ LKFTEST_F(LkfProductHelperLinux, GivenInvalidDeviceIdWhenConfiguringHwInfoThenNe template class LkfHwInfoTests : public ::testing::Test {}; using lkfTestTypes = ::testing::Types; -TYPED_TEST_CASE(LkfHwInfoTests, lkfTestTypes); +TYPED_TEST_SUITE(LkfHwInfoTests, lkfTestTypes); TYPED_TEST(LkfHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { HardwareInfo hwInfo = *defaultHwInfo; auto executionEnvironment = std::make_unique(); diff --git a/shared/test/unit_test/gen12lp/adlp/linux/product_helper_tests_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/linux/product_helper_tests_adlp.cpp index 914defd4f7..00e1ac1a71 100644 --- a/shared/test/unit_test/gen12lp/adlp/linux/product_helper_tests_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/linux/product_helper_tests_adlp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -66,7 +66,7 @@ ADLPTEST_F(AdlpProductHelperLinux, givenAdlpConfigWhenSetupHardwareInfoBaseThenG template using AdlpHwInfoLinux = ::testing::Test; using adlpConfigTestTypes = ::testing::Types; -TYPED_TEST_CASE(AdlpHwInfoLinux, adlpConfigTestTypes); +TYPED_TEST_SUITE(AdlpHwInfoLinux, adlpConfigTestTypes); TYPED_TEST(AdlpHwInfoLinux, givenSliceCountZeroWhenSetupHardwareInfoThenNotZeroValuesSetInGtSystemInfo) { HardwareInfo hwInfo = *defaultHwInfo; diff --git a/shared/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp index d2168056ee..c709b360f5 100644 --- a/shared/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ using namespace NEO; template class Dg1HwInfoTests : public ::testing::Test {}; typedef ::testing::Types dg1TestTypes; -TYPED_TEST_CASE(Dg1HwInfoTests, dg1TestTypes); +TYPED_TEST_SUITE(Dg1HwInfoTests, dg1TestTypes); TYPED_TEST(Dg1HwInfoTests, WhenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrFalseIsCalledThenFeatureTableHasCorrectValueOfLocalMemoryFeature) { HardwareInfo hwInfo = *defaultHwInfo; diff --git a/shared/test/unit_test/gen12lp/dg1/linux/product_helper_tests_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/linux/product_helper_tests_dg1.cpp index 9465caf234..7b1389650b 100644 --- a/shared/test/unit_test/gen12lp/dg1/linux/product_helper_tests_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/linux/product_helper_tests_dg1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -74,7 +74,7 @@ DG1TEST_F(Dg1ProductHelperLinux, GivenInvalidDeviceIdWhenConfiguringHwInfoThenEr template class Dg1HwInfoLinux : public ::testing::Test {}; using dg1TestTypes = ::testing::Types; -TYPED_TEST_CASE(Dg1HwInfoLinux, dg1TestTypes); +TYPED_TEST_SUITE(Dg1HwInfoLinux, dg1TestTypes); TYPED_TEST(Dg1HwInfoLinux, WhenGtIsSetupThenGtSystemInfoIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen12lp/tgllp/linux/product_helper_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/linux/product_helper_tests_tgllp.cpp index b8f329860a..36bc8ebf98 100644 --- a/shared/test/unit_test/gen12lp/tgllp/linux/product_helper_tests_tgllp.cpp +++ b/shared/test/unit_test/gen12lp/tgllp/linux/product_helper_tests_tgllp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -67,7 +67,7 @@ TGLLPTEST_F(TgllpProductHelperLinux, GivenInvalidDeviceIdWhenConfiguringHwInfoTh template class TgllpHwInfoLinux : public ::testing::Test {}; typedef ::testing::Types tgllpTestTypes; -TYPED_TEST_CASE(TgllpHwInfoLinux, tgllpTestTypes); +TYPED_TEST_SUITE(TgllpHwInfoLinux, tgllpTestTypes); TYPED_TEST(TgllpHwInfoLinux, gtSetupIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen8/bdw/linux/product_helper_tests_bdw.cpp b/shared/test/unit_test/gen8/bdw/linux/product_helper_tests_bdw.cpp index 911568b7af..542570181f 100644 --- a/shared/test/unit_test/gen8/bdw/linux/product_helper_tests_bdw.cpp +++ b/shared/test/unit_test/gen8/bdw/linux/product_helper_tests_bdw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -89,7 +89,7 @@ template class BdwHwInfoTests : public ::testing::Test { }; typedef ::testing::Types bdwTestTypes; -TYPED_TEST_CASE(BdwHwInfoTests, bdwTestTypes); +TYPED_TEST_SUITE(BdwHwInfoTests, bdwTestTypes); TYPED_TEST(BdwHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen9/bxt/linux/product_helper_tests_bxt.cpp b/shared/test/unit_test/gen9/bxt/linux/product_helper_tests_bxt.cpp index d299814fd1..978cbc9196 100644 --- a/shared/test/unit_test/gen9/bxt/linux/product_helper_tests_bxt.cpp +++ b/shared/test/unit_test/gen9/bxt/linux/product_helper_tests_bxt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -144,7 +144,7 @@ template class BxtHwInfoTests : public ::testing::Test { }; typedef ::testing::Types bxtTestTypes; -TYPED_TEST_CASE(BxtHwInfoTests, bxtTestTypes); +TYPED_TEST_SUITE(BxtHwInfoTests, bxtTestTypes); TYPED_TEST(BxtHwInfoTests, WhenConfiguringHwInfoThenConfigIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen9/cfl/linux/product_helper_tests_cfl.cpp b/shared/test/unit_test/gen9/cfl/linux/product_helper_tests_cfl.cpp index e47d3a2233..ab498f6013 100644 --- a/shared/test/unit_test/gen9/cfl/linux/product_helper_tests_cfl.cpp +++ b/shared/test/unit_test/gen9/cfl/linux/product_helper_tests_cfl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -104,7 +104,7 @@ template class CflHwInfoTests : public ::testing::Test { }; typedef ::testing::Types cflTestTypes; -TYPED_TEST_CASE(CflHwInfoTests, cflTestTypes); +TYPED_TEST_SUITE(CflHwInfoTests, cflTestTypes); TYPED_TEST(CflHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen9/glk/linux/product_helper_tests_glk.cpp b/shared/test/unit_test/gen9/glk/linux/product_helper_tests_glk.cpp index 5f6540e02c..81db4242e6 100644 --- a/shared/test/unit_test/gen9/glk/linux/product_helper_tests_glk.cpp +++ b/shared/test/unit_test/gen9/glk/linux/product_helper_tests_glk.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -156,7 +156,7 @@ template class GlkHwInfoTests : public ::testing::Test { }; typedef ::testing::Types glkTestTypes; -TYPED_TEST_CASE(GlkHwInfoTests, glkTestTypes); +TYPED_TEST_SUITE(GlkHwInfoTests, glkTestTypes); TYPED_TEST(GlkHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen9/kbl/linux/product_helper_tests_kbl.cpp b/shared/test/unit_test/gen9/kbl/linux/product_helper_tests_kbl.cpp index da746fe786..5d24b5a4bb 100644 --- a/shared/test/unit_test/gen9/kbl/linux/product_helper_tests_kbl.cpp +++ b/shared/test/unit_test/gen9/kbl/linux/product_helper_tests_kbl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -136,7 +136,7 @@ template class KblHwInfoTests : public ::testing::Test { }; typedef ::testing::Types kblTestTypes; -TYPED_TEST_CASE(KblHwInfoTests, kblTestTypes); +TYPED_TEST_SUITE(KblHwInfoTests, kblTestTypes); TYPED_TEST(KblHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/gen9/skl/linux/product_helper_tests_skl.cpp b/shared/test/unit_test/gen9/skl/linux/product_helper_tests_skl.cpp index af2bcdbc1e..0c02ab9935 100644 --- a/shared/test/unit_test/gen9/skl/linux/product_helper_tests_skl.cpp +++ b/shared/test/unit_test/gen9/skl/linux/product_helper_tests_skl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -166,7 +166,7 @@ template class SklHwInfoTests : public ::testing::Test { }; typedef ::testing::Types sklTestTypes; -TYPED_TEST_CASE(SklHwInfoTests, sklTestTypes); +TYPED_TEST_SUITE(SklHwInfoTests, sklTestTypes); TYPED_TEST(SklHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { auto executionEnvironment = std::make_unique(); executionEnvironment->prepareRootDeviceEnvironments(1); diff --git a/shared/test/unit_test/helpers/aligned_memory_tests.cpp b/shared/test/unit_test/helpers/aligned_memory_tests.cpp index 3b749d96ae..26ab9d4479 100644 --- a/shared/test/unit_test/helpers/aligned_memory_tests.cpp +++ b/shared/test/unit_test/helpers/aligned_memory_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -54,7 +54,7 @@ TEST(AlignedMallocTests, GivenSizeZeroAndAlign4096WhenAllocatingAlignedThenAlign alignedFree(ptr); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AlignedMallocParameterized, AlignedMalloc, testing::Values( @@ -107,7 +107,7 @@ TEST_P(AlignUp, WhenAligningUpThen64BitIsPreserved) { EXPECT_EQ(aligned, result); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AlignUpParameterized, AlignUp, testing::Values( @@ -130,7 +130,7 @@ TEST_P(AlignUpNonZero, GivenSizeAndAlignmentThenAlignedResultIsNonZero) { EXPECT_TRUE(0 == result % alignment); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( AlignUpNonZeroParameterized, AlignUpNonZero, testing::Combine( @@ -260,7 +260,7 @@ class IsAlignedTests : public ::testing::Test { typedef ::testing::Types IsAlignedTypes; -TYPED_TEST_CASE(IsAlignedTests, IsAlignedTypes); +TYPED_TEST_SUITE(IsAlignedTests, IsAlignedTypes); TYPED_TEST(IsAlignedTests, WhenCheckingForAlignmentThenReturnCorrectValue) { TypeParam *ptr = reinterpret_cast(static_cast(0xdeadbeefu)); // one byte alignment should always return true diff --git a/shared/test/unit_test/helpers/app_resource_tests.cpp b/shared/test/unit_test/helpers/app_resource_tests.cpp index 4adc7a6d79..c93aa3c033 100644 --- a/shared/test/unit_test/helpers/app_resource_tests.cpp +++ b/shared/test/unit_test/helpers/app_resource_tests.cpp @@ -116,4 +116,4 @@ TEST_P(AllocationTypeTagString, givenGraphicsAllocationTypeWhenCopyTagToStorageI EXPECT_STREQ(storageInfo.resourceTag, input.str); } -INSTANTIATE_TEST_CASE_P(AllAllocationTypesTag, AllocationTypeTagString, ::testing::ValuesIn(allocationTypeTagValues)); +INSTANTIATE_TEST_SUITE_P(AllAllocationTypesTag, AllocationTypeTagString, ::testing::ValuesIn(allocationTypeTagValues)); diff --git a/shared/test/unit_test/helpers/basic_math_tests.cpp b/shared/test/unit_test/helpers/basic_math_tests.cpp index f61f4f5d3d..50d6c39da3 100644 --- a/shared/test/unit_test/helpers/basic_math_tests.cpp +++ b/shared/test/unit_test/helpers/basic_math_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -120,9 +120,9 @@ TEST_P(Float2HalfTest, WhenConvertingFloatToHalfThenValueIsPreserved) { EXPECT_EQ(uintOutput, uint16ofHalf); } -INSTANTIATE_TEST_CASE_P(Float2Half, - Float2HalfTest, - ::testing::ValuesIn(float2HalfParams)); +INSTANTIATE_TEST_SUITE_P(Float2Half, + Float2HalfTest, + ::testing::ValuesIn(float2HalfParams)); struct L3Config { union { diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp index aa1b37bee6..8c696ced66 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp @@ -463,13 +463,13 @@ HWTEST2_P(BlitFastColorTest, givenCommandStreamWhenCallToDispatchMemoryFillThenC test.testBodyImpl(patternSize, expecttedDepth); } -INSTANTIATE_TEST_CASE_P(size_t, - BlitFastColorTest, - testing::Values(1, - 2, - 4, - 8, - 16)); +INSTANTIATE_TEST_SUITE_P(size_t, + BlitFastColorTest, + testing::Values(1, + 2, + 4, + 8, + 16)); HWTEST2_F(BlitTests, givenMemoryAndImageWhenDispatchCopyImageCallThenCommandAddedToStream, BlitPlatforms) { using XY_BLOCK_COPY_BLT = typename FamilyType::XY_BLOCK_COPY_BLT; @@ -635,13 +635,13 @@ HWTEST2_P(BlitTestsParams, givenDstOriginNotAlignedWithin1and16BytesWhenGettingB EXPECT_EQ(bytesPerPixel, 1u); } -INSTANTIATE_TEST_CASE_P(size_t, - BlitTestsParams, - testing::Values(1, - 2, - 4, - 8, - 16)); +INSTANTIATE_TEST_SUITE_P(size_t, + BlitTestsParams, + testing::Values(1, + 2, + 4, + 8, + 16)); using WithoutGen12Lp = IsNotGfxCore; diff --git a/shared/test/unit_test/helpers/flattened_id_tests.cpp b/shared/test/unit_test/helpers/flattened_id_tests.cpp index 94ce8f19b7..2c8105e19c 100644 --- a/shared/test/unit_test/helpers/flattened_id_tests.cpp +++ b/shared/test/unit_test/helpers/flattened_id_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -245,13 +245,13 @@ TEST_P(FlattenedIDFixture, WhenGeneratingFlattenedIdsThenLocalIdsAreCorrect) { #define LWSZParams ::testing::Values(1) #endif -INSTANTIATE_TEST_CASE_P(AllCombinations, FlattenedIDFixture, ::testing::Combine(SIMDParams, LWSXParams, LWSYParams, LWSZParams)); +INSTANTIATE_TEST_SUITE_P(AllCombinations, FlattenedIDFixture, ::testing::Combine(SIMDParams, LWSXParams, LWSYParams, LWSZParams)); // To debug a specific configuration replace the list of Values with specific values. // NOTE: You'll need a unique test prefix -INSTANTIATE_TEST_CASE_P(SingleTest, FlattenedIDFixture, - ::testing::Combine( - ::testing::Values(32), // SIMD - ::testing::Values(5), // LWSX - ::testing::Values(6), // LWSY - ::testing::Values(7))); // LWSZ +INSTANTIATE_TEST_SUITE_P(SingleTest, FlattenedIDFixture, + ::testing::Combine( + ::testing::Values(32), // SIMD + ::testing::Values(5), // LWSX + ::testing::Values(6), // LWSY + ::testing::Values(7))); // LWSZ diff --git a/shared/test/unit_test/helpers/local_id_tests.cpp b/shared/test/unit_test/helpers/local_id_tests.cpp index 09b379a7ad..8cf9451c01 100644 --- a/shared/test/unit_test/helpers/local_id_tests.cpp +++ b/shared/test/unit_test/helpers/local_id_tests.cpp @@ -528,16 +528,16 @@ TEST_P(LocalIdsLayoutForImagesTest, givenLocalWorkgroupSizeCompatibleWithLayoutF #define GRFSizeParams ::testing::Values(32) -INSTANTIATE_TEST_CASE_P(AllCombinations, LocalIDFixture, ::testing::Combine(SIMDParams, GRFSizeParams, LWSXParams, LWSYParams, LWSZParams)); -INSTANTIATE_TEST_CASE_P(LayoutTests, LocalIdsLayoutTest, SIMDParams); -INSTANTIATE_TEST_CASE_P(LayoutForImagesTests, LocalIdsLayoutForImagesTest, ::testing::Combine(SIMDParams, GRFSizeParams, ::testing::Values(4, 8, 12, 20), ::testing::Values(4, 8, 12, 20))); +INSTANTIATE_TEST_SUITE_P(AllCombinations, LocalIDFixture, ::testing::Combine(SIMDParams, GRFSizeParams, LWSXParams, LWSYParams, LWSZParams)); +INSTANTIATE_TEST_SUITE_P(LayoutTests, LocalIdsLayoutTest, SIMDParams); +INSTANTIATE_TEST_SUITE_P(LayoutForImagesTests, LocalIdsLayoutForImagesTest, ::testing::Combine(SIMDParams, GRFSizeParams, ::testing::Values(4, 8, 12, 20), ::testing::Values(4, 8, 12, 20))); // To debug a specific configuration replace the list of Values with specific values. // NOTE: You'll need a unique test prefix -INSTANTIATE_TEST_CASE_P(SingleTest, LocalIDFixture, - ::testing::Combine( - ::testing::Values(32), // SIMD - ::testing::Values(32), // GRF - ::testing::Values(5), // LWSX - ::testing::Values(6), // LWSY - ::testing::Values(7))); // LWSZ +INSTANTIATE_TEST_SUITE_P(SingleTest, LocalIDFixture, + ::testing::Combine( + ::testing::Values(32), // SIMD + ::testing::Values(32), // GRF + ::testing::Values(5), // LWSX + ::testing::Values(6), // LWSY + ::testing::Values(7))); // LWSZ diff --git a/shared/test/unit_test/helpers/matcher_tests.cpp b/shared/test/unit_test/helpers/matcher_tests.cpp index b0598ae529..5d4b76f77c 100644 --- a/shared/test/unit_test/helpers/matcher_tests.cpp +++ b/shared/test/unit_test/helpers/matcher_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,6 +30,6 @@ class TestMacrosWithParamIfNotMatchTearDownCall : public TestMacrosIfNotMatchTea HWTEST2_P(TestMacrosWithParamIfNotMatchTearDownCall, givenNotMatchPlatformWhenUseHwTest2PThenSetUpAndTearDownAreNotCalled, IsSKL) { expectCorrectPlatform(); } -INSTANTIATE_TEST_CASE_P(givenNotMatchPlatformWhenUseHwTest2PThenSetUpAndTearDownAreNotCalled, - TestMacrosWithParamIfNotMatchTearDownCall, - ::testing::Values(0)); \ No newline at end of file +INSTANTIATE_TEST_SUITE_P(givenNotMatchPlatformWhenUseHwTest2PThenSetUpAndTearDownAreNotCalled, + TestMacrosWithParamIfNotMatchTearDownCall, + ::testing::Values(0)); \ No newline at end of file diff --git a/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp b/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp index 8f23d49beb..ad1e50f6eb 100644 --- a/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp +++ b/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp @@ -264,12 +264,12 @@ HWTEST2_P(BlitTestsTestXeHpc, givenCommandStreamWhenCallToDispatchMemoryFillThen test.testBodyImpl(patternSize, expecttedDepth); } -INSTANTIATE_TEST_CASE_P(size_t, - BlitTestsTestXeHpc, - testing::Values(2, - 4, - 8, - 16)); +INSTANTIATE_TEST_SUITE_P(size_t, + BlitTestsTestXeHpc, + testing::Values(2, + 4, + 8, + 16)); HWTEST2_F(BlitTests, givenMemoryAndImageWhenDispatchCopyImageCallThenCommandAddedToStream, IsPVC) { using XY_BLOCK_COPY_BLT = typename FamilyType::XY_BLOCK_COPY_BLT; diff --git a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 082e6c6085..f1c94e2dc8 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -238,9 +238,9 @@ static const AllocationType allocationTypesWith32BitAnd64KbPagesAllowed[] = {All AllocationType::writeCombined, AllocationType::assertBuffer}; -INSTANTIATE_TEST_CASE_P(Allow32BitAnd64kbPagesTypes, - MemoryManagerGetAlloctionData32BitAnd64kbPagesAllowedTest, - ::testing::ValuesIn(allocationTypesWith32BitAnd64KbPagesAllowed)); +INSTANTIATE_TEST_SUITE_P(Allow32BitAnd64kbPagesTypes, + MemoryManagerGetAlloctionData32BitAnd64kbPagesAllowedTest, + ::testing::ValuesIn(allocationTypesWith32BitAnd64KbPagesAllowed)); static const AllocationType allocationTypesWith32BitAnd64KbPagesNotAllowed[] = {AllocationType::commandBuffer, AllocationType::timestampPacketTagBuffer, @@ -249,9 +249,9 @@ static const AllocationType allocationTypesWith32BitAnd64KbPagesNotAllowed[] = { AllocationType::instructionHeap, AllocationType::sharedResourceCopy}; -INSTANTIATE_TEST_CASE_P(Disallow32BitAnd64kbPagesTypes, - MemoryManagerGetAlloctionData32BitAnd64kbPagesNotAllowedTest, - ::testing::ValuesIn(allocationTypesWith32BitAnd64KbPagesNotAllowed)); +INSTANTIATE_TEST_SUITE_P(Disallow32BitAnd64kbPagesTypes, + MemoryManagerGetAlloctionData32BitAnd64kbPagesNotAllowedTest, + ::testing::ValuesIn(allocationTypesWith32BitAnd64KbPagesNotAllowed)); TEST(MemoryManagerTest, givenForced32BitSetWhenGraphicsMemoryFor32BitAllowedTypeIsAllocatedThen32BitAllocationIsReturned) { MockExecutionEnvironment executionEnvironment(defaultHwInfo.get()); @@ -1314,20 +1314,20 @@ static const AllocationType allocationHaveNotToBeForcedTo48Bit[] = { AllocationType::debugContextSaveArea, }; -INSTANTIATE_TEST_CASE_P(ForceTo48Bit, - MemoryManagerGetAlloctionDataHaveToBeForcedTo48BitTest, - ::testing::Combine( - ::testing::ValuesIn(allocationHaveToBeForcedTo48Bit), - ::testing::Bool())); +INSTANTIATE_TEST_SUITE_P(ForceTo48Bit, + MemoryManagerGetAlloctionDataHaveToBeForcedTo48BitTest, + ::testing::Combine( + ::testing::ValuesIn(allocationHaveToBeForcedTo48Bit), + ::testing::Bool())); -INSTANTIATE_TEST_CASE_P(NotForceTo48Bit, - MemoryManagerGetAlloctionDataHaveNotToBeForcedTo48BitTest, - ::testing::Combine( - ::testing::ValuesIn(allocationHaveNotToBeForcedTo48Bit), - ::testing::Bool())); +INSTANTIATE_TEST_SUITE_P(NotForceTo48Bit, + MemoryManagerGetAlloctionDataHaveNotToBeForcedTo48BitTest, + ::testing::Combine( + ::testing::ValuesIn(allocationHaveNotToBeForcedTo48Bit), + ::testing::Bool())); -INSTANTIATE_TEST_CASE_P(OptionallyForceTo48Bit, - MemoryManagerGetAlloctionDataOptionallyForcedTo48BitTest, - ::testing::Combine( - ::testing::ValuesIn(allocationsOptionallyForcedTo48Bit), - ::testing::Bool())); +INSTANTIATE_TEST_SUITE_P(OptionallyForceTo48Bit, + MemoryManagerGetAlloctionDataOptionallyForcedTo48BitTest, + ::testing::Combine( + ::testing::ValuesIn(allocationsOptionallyForcedTo48Bit), + ::testing::Bool())); diff --git a/shared/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp index 868d88de4e..854c1b98d9 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -58,7 +58,7 @@ TEST_P(MemoryManagerMultiDeviceTest, givenRootDeviceIndexSpecifiedWhenAllocateGr } } -INSTANTIATE_TEST_CASE_P(MemoryManagerType, MemoryManagerMultiDeviceTest, ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(MemoryManagerType, MemoryManagerMultiDeviceTest, ::testing::Bool()); TEST_P(MemoryManagerMultiDeviceTest, givenRootDeviceIndexSpecifiedWhenAllocateGraphicsMemoryIsCalledThenGraphicsAllocationHasProperGpuAddress) { RootDeviceIndicesContainer rootDeviceIndices; diff --git a/shared/test/unit_test/memory_manager/memory_manager_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_tests.cpp index 2845251949..646c729afb 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -1746,9 +1746,9 @@ TEST_P(OsAgnosticMemoryManagerWithParams, givenDisabledHostPtrTrackingWhenAlloca memoryManager.freeGraphicsMemory(allocation); } -INSTANTIATE_TEST_CASE_P(OsAgnosticMemoryManagerWithParams, - OsAgnosticMemoryManagerWithParams, - ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(OsAgnosticMemoryManagerWithParams, + OsAgnosticMemoryManagerWithParams, + ::testing::Values(false, true)); TEST(OsAgnosticMemoryManager, givenFreeMemoryEnabledAndNonExternalHostPtrAllocationWhenGraphicsAllocationIsDestroyedThenFreeMemoryOnAubManagerShouldBeCalled) { DebugManagerStateRestore dbgRestore; diff --git a/shared/test/unit_test/memory_manager/surface_tests.cpp b/shared/test/unit_test/memory_manager/surface_tests.cpp index 606e767583..7040b316b9 100644 --- a/shared/test/unit_test/memory_manager/surface_tests.cpp +++ b/shared/test/unit_test/memory_manager/surface_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -52,7 +52,7 @@ class SurfaceTest : public ::testing::Test { MockGraphicsAllocation gfxAllocation; }; -TYPED_TEST_CASE(SurfaceTest, SurfaceTypes); +TYPED_TEST_SUITE(SurfaceTest, SurfaceTypes); HWTEST_TYPED_TEST(SurfaceTest, GivenSurfaceWhenInterfaceIsUsedThenSurfaceBehavesCorrectly) { int32_t execStamp; 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 139e575720..b84b279ef6 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 @@ -3038,9 +3038,9 @@ static const AllocationType allocation57Bit[] = { AllocationType::sharedBuffer, }; -INSTANTIATE_TEST_CASE_P(Drm57Bit, - DrmMemoryManagerAllocation57BitTest, - ::testing::ValuesIn(allocation57Bit)); +INSTANTIATE_TEST_SUITE_P(Drm57Bit, + DrmMemoryManagerAllocation57BitTest, + ::testing::ValuesIn(allocation57Bit)); struct DrmCommandStreamEnhancedPrelimTest : public DrmCommandStreamEnhancedTemplate { void SetUp() override { 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 f0c8d26e88..b54a90a1ee 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 @@ -4129,9 +4129,9 @@ TEST_P(DrmMemoryManagerWithHostIpcAllocationParamTest, memoryManager->freeGraphicsMemory(gfxAllocation1); } -INSTANTIATE_TEST_CASE_P(HostIpcAllocationFlag, - DrmMemoryManagerWithHostIpcAllocationParamTest, - ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(HostIpcAllocationFlag, + DrmMemoryManagerWithHostIpcAllocationParamTest, + ::testing::Values(false, true)); TEST(DrmMemoryManagerFreeGraphicsMemoryUnreferenceTest, givenCallToCreateSharedAllocationWithReuseSharedAllocationThenAllocationsSuccedAndAddressesAreTheSame) { 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 ff8937f90d..d79e2990df 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 @@ -1065,7 +1065,7 @@ HWTEST_F(WddmCsrCompressionTests, givenDisabledCompressionWhenInitializedThenDon } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( WddmCsrCompressionParameterizedTestCreate, WddmCsrCompressionParameterizedTest, ::testing::Bool()); diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp index 299ab745c6..813cf79076 100644 --- a/shared/test/unit_test/preemption/preemption_tests.cpp +++ b/shared/test/unit_test/preemption/preemption_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -375,7 +375,7 @@ HWTEST_P(PreemptionHwTest, WhenProgrammingCmdStreamThenProperMiLoadRegisterImmCo EXPECT_EQ(expectedRegValue, cmd->getDataDword()); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CreateParametrizedPreemptionHwTest, PreemptionHwTest, ::testing::Values(PreemptionMode::Disabled, PreemptionMode::MidBatch, PreemptionMode::ThreadGroup, PreemptionMode::MidThread)); @@ -427,7 +427,7 @@ HWTEST_P(PreemptionTest, whenInNonMidThreadModeThenCsrBaseAddressIsNotProgrammed EXPECT_EQ(0u, cmdStream.getUsed()); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( NonMidThread, PreemptionTest, ::testing::Values(PreemptionMode::Disabled, PreemptionMode::MidBatch, PreemptionMode::ThreadGroup)); diff --git a/shared/test/unit_test/program/printf_helper_tests.cpp b/shared/test/unit_test/program/printf_helper_tests.cpp index 055de150d9..9d294df910 100644 --- a/shared/test/unit_test/program/printf_helper_tests.cpp +++ b/shared/test/unit_test/program/printf_helper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -160,9 +160,9 @@ TEST_P(PrintfInt8Test, GivenFormatContainingIntWhenPrintingThenValueIsInserted) EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfInt8Test, - PrintfInt8Test, - ::testing::ValuesIn(byteValues)); +INSTANTIATE_TEST_SUITE_P(PrintfInt8Test, + PrintfInt8Test, + ::testing::ValuesIn(byteValues)); Int32Params intValues[] = { {"%d", 0}, @@ -200,9 +200,9 @@ TEST_P(PrintfInt32Test, GivenFormatContainingIntWhenPrintingThenValueIsInserted) EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfInt32Test, - PrintfInt32Test, - ::testing::ValuesIn(intValues)); +INSTANTIATE_TEST_SUITE_P(PrintfInt32Test, + PrintfInt32Test, + ::testing::ValuesIn(intValues)); Uint32Params uintValues[] = { {"%u", 0}, @@ -256,9 +256,9 @@ TEST_P(PrintfUint32Test, GivenBufferSizeGreaterThanPrintBufferWhenPrintingThenBu EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfUint32Test, - PrintfUint32Test, - ::testing::ValuesIn(uintValues)); +INSTANTIATE_TEST_SUITE_P(PrintfUint32Test, + PrintfUint32Test, + ::testing::ValuesIn(uintValues)); Int64Params longValues[] = { {"%lld", "%lld", INT64_MAX}, @@ -292,9 +292,9 @@ TEST_P(PrintfInt64Test, GivenFormatContainingLongWhenPrintingThenValueIsInserted EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfInt64Test, - PrintfInt64Test, - ::testing::ValuesIn(longValues)); +INSTANTIATE_TEST_SUITE_P(PrintfInt64Test, + PrintfInt64Test, + ::testing::ValuesIn(longValues)); Uint64Params ulongValues[] = { {"%llu", "%llu", UINT64_MAX}, @@ -322,9 +322,9 @@ TEST_P(PrintfUint64Test, GivenFormatContainingUlongWhenPrintingThenValueIsInsert EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfUint64Test, - PrintfUint64Test, - ::testing::ValuesIn(ulongValues)); +INSTANTIATE_TEST_SUITE_P(PrintfUint64Test, + PrintfUint64Test, + ::testing::ValuesIn(ulongValues)); FloatParams floatValues[] = { {"%f", 10.3456f}, @@ -359,9 +359,9 @@ TEST_P(PrintfFloatTest, GivenFormatContainingFloatWhenPrintingThenValueIsInserte EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfFloatTest, - PrintfFloatTest, - ::testing::ValuesIn(floatValues)); +INSTANTIATE_TEST_SUITE_P(PrintfFloatTest, + PrintfFloatTest, + ::testing::ValuesIn(floatValues)); class PrintfDoubleToFloatTest : public PrintFormatterTest, public ::testing::WithParamInterface {}; @@ -402,9 +402,9 @@ TEST_P(PrintfDoubleToFloatTest, GivenFormatContainingFloatAndDoubleWhenPrintingT EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfDoubleToFloatTest, - PrintfDoubleToFloatTest, - ::testing::ValuesIn(doubleToFloatValues)); +INSTANTIATE_TEST_SUITE_P(PrintfDoubleToFloatTest, + PrintfDoubleToFloatTest, + ::testing::ValuesIn(doubleToFloatValues)); DoubleParams doubleValues[] = { {"%f", 302230.12156260}, @@ -450,9 +450,9 @@ TEST_P(PrintfDoubleTest, GivenFormatContainingDoubleWhenPrintingThenValueIsInser EXPECT_STREQ(referenceOutput, actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfDoubleTest, - PrintfDoubleTest, - ::testing::ValuesIn(doubleValues)); +INSTANTIATE_TEST_SUITE_P(PrintfDoubleTest, + PrintfDoubleTest, + ::testing::ValuesIn(doubleValues)); std::pair specialValues[] = { {"%%", "%"}, @@ -476,9 +476,9 @@ TEST_P(PrintfSpecialTest, GivenFormatContainingDoublePercentageWhenPrintingThenV EXPECT_STREQ(input.second.c_str(), actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfSpecialTest, - PrintfSpecialTest, - ::testing::ValuesIn(specialValues)); +INSTANTIATE_TEST_SUITE_P(PrintfSpecialTest, + PrintfSpecialTest, + ::testing::ValuesIn(specialValues)); // ------------------------- Testing Strings only with no Formatting ------------------------ @@ -506,9 +506,9 @@ TEST_P(PrintfNoArgumentsTest, GivenNoArgumentsWhenPrintingThenCharsAreEscaped) { EXPECT_STREQ(input.second.c_str(), actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfNoArgumentsTest, - PrintfNoArgumentsTest, - ::testing::ValuesIn(stringValues)); +INSTANTIATE_TEST_SUITE_P(PrintfNoArgumentsTest, + PrintfNoArgumentsTest, + ::testing::ValuesIn(stringValues)); StringParams stringValues2[] = { {"%s", "foo"}, @@ -536,9 +536,9 @@ TEST_P(PrintfStringTest, GivenFormatContainingStringWhenPrintingThenValueIsInser EXPECT_STREQ(input.value.c_str(), actualOutput); } -INSTANTIATE_TEST_CASE_P(PrintfStringTest, - PrintfStringTest, - ::testing::ValuesIn(stringValues2)); +INSTANTIATE_TEST_SUITE_P(PrintfStringTest, + PrintfStringTest, + ::testing::ValuesIn(stringValues2)); TEST_F(PrintFormatterTest, GivenLongStringValueWhenPrintedThenFullStringIsPrinted) { char testedLongString[maxPrintfOutputLength]; diff --git a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp index a127ea8bd1..95b796d652 100644 --- a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp +++ b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp @@ -224,7 +224,7 @@ struct SoftwareTagsParametrizedTests : public ::testing::TestWithParam> tagMap; }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( SoftwareTags, SoftwareTagsParametrizedTests, testing::Values( diff --git a/shared/test/unit_test/xe_hpg_core/arl/hw_aot_config_tests_arl.cpp b/shared/test/unit_test/xe_hpg_core/arl/hw_aot_config_tests_arl.cpp index 56fe9178c7..526f6a1789 100644 --- a/shared/test/unit_test/xe_hpg_core/arl/hw_aot_config_tests_arl.cpp +++ b/shared/test/unit_test/xe_hpg_core/arl/hw_aot_config_tests_arl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/test/unit_test/fixtures/product_config_fixture.h" using namespace NEO; -INSTANTIATE_TEST_CASE_P(ProductConfigHwInfoArlTests, - ProductConfigHwInfoTests, - ::testing::Combine(::testing::ValuesIn(AOT_ARL::productConfigs), - ::testing::Values(IGFX_ARROWLAKE))); +INSTANTIATE_TEST_SUITE_P(ProductConfigHwInfoArlTests, + ProductConfigHwInfoTests, + ::testing::Combine(::testing::ValuesIn(AOT_ARL::productConfigs), + ::testing::Values(IGFX_ARROWLAKE))); diff --git a/shared/test/unit_test/xe_hpg_core/mtl/hw_aot_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/hw_aot_config_tests_mtl.cpp index d3d0b9fd39..62823c05c9 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/hw_aot_config_tests_mtl.cpp +++ b/shared/test/unit_test/xe_hpg_core/mtl/hw_aot_config_tests_mtl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,9 +9,9 @@ #include "shared/test/unit_test/fixtures/product_config_fixture.h" namespace NEO { -INSTANTIATE_TEST_CASE_P(ProductConfigHwInfoMtlTests, - ProductConfigHwInfoTests, - ::testing::Combine(::testing::ValuesIn(AOT_MTL::productConfigs), - ::testing::Values(IGFX_METEORLAKE))); +INSTANTIATE_TEST_SUITE_P(ProductConfigHwInfoMtlTests, + ProductConfigHwInfoTests, + ::testing::Combine(::testing::ValuesIn(AOT_MTL::productConfigs), + ::testing::Values(IGFX_METEORLAKE))); } // namespace NEO