From c20ec6c148888518571510668aa66bc39ba42f7c Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 10 Nov 2021 13:57:26 +0000 Subject: [PATCH] Remove gmock from mock_module Related-To: NEO-4914 Signed-off-by: Mateusz Jablonski --- .../core/test/unit_tests/mocks/CMakeLists.txt | 1 - .../test/unit_tests/mocks/mock_module.cpp | 18 ----------- .../core/test/unit_tests/mocks/mock_module.h | 31 ++++++++++--------- .../unit_tests/sources/module/test_module.cpp | 4 +-- .../common/test_macros/mock_method_macros.h | 6 ++++ 5 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 level_zero/core/test/unit_tests/mocks/mock_module.cpp diff --git a/level_zero/core/test/unit_tests/mocks/CMakeLists.txt b/level_zero/core/test/unit_tests/mocks/CMakeLists.txt index 8ccb5fa8df..880597f0f7 100644 --- a/level_zero/core/test/unit_tests/mocks/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/mocks/CMakeLists.txt @@ -35,7 +35,6 @@ set(L0_MOCKS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_l0_debugger.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_module.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_module.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_sampler.h ) diff --git a/level_zero/core/test/unit_tests/mocks/mock_module.cpp b/level_zero/core/test/unit_tests/mocks/mock_module.cpp deleted file mode 100644 index 0582a8a1af..0000000000 --- a/level_zero/core/test/unit_tests/mocks/mock_module.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2020-2021 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "level_zero/core/test/unit_tests/mocks/mock_module.h" - -using ::testing::Return; - -namespace L0 { -namespace ult { - -Mock::Mock(::L0::Device *device, ModuleBuildLog *moduleBuildLog, ModuleType type) : WhiteBox(device, moduleBuildLog, type) { EXPECT_CALL(*this, getMaxGroupSize).WillRepeatedly(Return(256u)); } - -} // namespace ult -} // namespace L0 diff --git a/level_zero/core/test/unit_tests/mocks/mock_module.h b/level_zero/core/test/unit_tests/mocks/mock_module.h index fd9c026077..57d0ad879f 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_module.h +++ b/level_zero/core/test/unit_tests/mocks/mock_module.h @@ -8,12 +8,13 @@ #pragma once #include "shared/test/common/mocks/mock_cif.h" #include "shared/test/common/mocks/mock_compiler_interface.h" +#include "shared/test/common/test_macros/mock_method_macros.h" #include "level_zero/core/source/module/module_imp.h" #include "level_zero/core/test/unit_tests/mock.h" #include "level_zero/core/test/unit_tests/white_box.h" -#include "gmock/gmock.h" +#include "gtest/gtest.h" namespace L0 { namespace ult { @@ -36,22 +37,22 @@ using Module = WhiteBox<::L0::Module>; template <> struct Mock : public Module { - Mock(::L0::Device *device, ModuleBuildLog *moduleBuildLog, ModuleType type); + + Mock(::L0::Device *device, ModuleBuildLog *moduleBuildLog, ModuleType type) : WhiteBox(device, moduleBuildLog, type) {} Mock(::L0::Device *device, ModuleBuildLog *moduleBuildLog) : Mock(device, moduleBuildLog, ModuleType::User){}; - MOCK_METHOD(ze_result_t, createKernel, (const ze_kernel_desc_t *desc, ze_kernel_handle_t *phFunction), (override)); - MOCK_METHOD(ze_result_t, destroy, (), (override)); - MOCK_METHOD(ze_result_t, getFunctionPointer, (const char *pKernelName, void **pfnFunction), (override)); - MOCK_METHOD(ze_result_t, getNativeBinary, (size_t * pSize, uint8_t *pModuleNativeBinary), (override)); - MOCK_METHOD(const L0::KernelImmutableData *, getKernelImmutableData, (const char *functionName), (const, override)); - MOCK_METHOD(uint32_t, getMaxGroupSize, (), (const, override)); - MOCK_METHOD(ze_result_t, getKernelNames, (uint32_t * pCount, const char **pNames), (override)); - MOCK_METHOD(ze_result_t, performDynamicLink, - (uint32_t numModules, ze_module_handle_t *phModules, ze_module_build_log_handle_t *phLinkLog), - (override)); - MOCK_METHOD(ze_result_t, getProperties, (ze_module_properties_t * pModuleProperties), (override)); - MOCK_METHOD(ze_result_t, getGlobalPointer, (const char *pGlobalName, size_t *pSize, void **pPtr), (override)); - MOCK_METHOD(bool, isDebugEnabled, (), (const, override)); + ADDMETHOD_NOBASE(createKernel, ze_result_t, ZE_RESULT_SUCCESS, (const ze_kernel_desc_t *desc, ze_kernel_handle_t *phFunction)); + ADDMETHOD_NOBASE(destroy, ze_result_t, ZE_RESULT_SUCCESS, ()); + ADDMETHOD_NOBASE(getFunctionPointer, ze_result_t, ZE_RESULT_SUCCESS, (const char *pKernelName, void **pfnFunction)); + ADDMETHOD_NOBASE(getNativeBinary, ze_result_t, ZE_RESULT_SUCCESS, (size_t * pSize, uint8_t *pModuleNativeBinary)); + ADDMETHOD_CONST_NOBASE(getKernelImmutableData, const L0::KernelImmutableData *, nullptr, (const char *functionName)); + ADDMETHOD_CONST_NOBASE(getMaxGroupSize, uint32_t, 256, ()); + ADDMETHOD_NOBASE(getKernelNames, ze_result_t, ZE_RESULT_SUCCESS, (uint32_t * pCount, const char **pNames)); + ADDMETHOD_NOBASE(performDynamicLink, ze_result_t, ZE_RESULT_SUCCESS, + (uint32_t numModules, ze_module_handle_t *phModules, ze_module_build_log_handle_t *phLinkLog)); + ADDMETHOD_NOBASE(getProperties, ze_result_t, ZE_RESULT_SUCCESS, (ze_module_properties_t * pModuleProperties)); + ADDMETHOD_NOBASE(getGlobalPointer, ze_result_t, ZE_RESULT_SUCCESS, (const char *pGlobalName, size_t *pSize, void **pPtr)); + ADDMETHOD_CONST_NOBASE(isDebugEnabled, bool, false, ()); }; struct MockModuleTranslationUnit : public L0::ModuleTranslationUnit { diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index 059bfeb899..707cc92045 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -1002,9 +1002,7 @@ TEST_F(ModulePropertyTest, whenZeModuleGetPropertiesIsCalledThenGetPropertiesIsC moduleProperties.pNext = nullptr; // returning error code that is unlikely to be returned by the function - EXPECT_CALL(module, getProperties(&moduleProperties)) - .Times(1) - .WillRepeatedly(Return(ZE_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT)); + module.getPropertiesResult = ZE_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT; ze_result_t res = zeModuleGetProperties(module.toHandle(), &moduleProperties); EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT, res); diff --git a/shared/test/common/test_macros/mock_method_macros.h b/shared/test/common/test_macros/mock_method_macros.h index 18bf6718c9..fa462f7f87 100644 --- a/shared/test/common/test_macros/mock_method_macros.h +++ b/shared/test/common/test_macros/mock_method_macros.h @@ -15,6 +15,12 @@ return funcName##Result; \ } +#define ADDMETHOD_CONST_NOBASE(funcName, retType, defaultReturn, funcParams) \ + retType funcName##Result = defaultReturn; \ + retType funcName funcParams const override { \ + return funcName##Result; \ + } + #define ADDMETHOD_NOBASE_VOIDRETURN(funcName, funcParams) \ uint32_t funcName##Called = 0u; \ void funcName funcParams override { \