From 2f3157911d1c63f45c7636935b51d0100c9f7249 Mon Sep 17 00:00:00 2001 From: "Bari, Pratik" Date: Fri, 16 Dec 2022 18:40:14 +0530 Subject: [PATCH] Remove MOCK_METHOD from Linux Common Code and Fabric Port ULT The MOCK_METHODS in the linux common code and Fabric Port ULT has been removed. Related-To: LOCI-3777 Signed-off-by: Bari, Pratik --- .../fabric_port/linux/mock_fabric_device.h | 13 +++++---- .../linux/test_zes_fabric_port.cpp | 29 ++++++++----------- .../sysman/linux/mock_procfs_access_fixture.h | 4 +-- .../sysman/linux/mock_sysfs_access_fixture.h | 4 +-- .../sysman/linux/mock_sysman_fixture.h | 19 +++--------- 5 files changed, 25 insertions(+), 44 deletions(-) diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h index 35d1492607..e5e555faad 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h @@ -14,13 +14,14 @@ namespace L0 { namespace ult { -template <> -struct Mock : public FabricDevice { - MOCK_METHOD(uint32_t, getNumPorts, (), (override)); - MOCK_METHOD(OsFabricDevice *, getOsFabricDevice, (), (override)); +const uint32_t mockNumPorts = 2; +struct MockFabricDevice : public FabricDevice { + uint32_t getNumPorts() override { + return mockNumPorts; + } - Mock() = default; - ~Mock() override = default; + ADDMETHOD_NOBASE(getOsFabricDevice, OsFabricDevice *, nullptr, ()); + MockFabricDevice() = default; }; } // namespace ult diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_zes_fabric_port.cpp b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_zes_fabric_port.cpp index c02a229fd0..004a4a334f 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_zes_fabric_port.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_zes_fabric_port.cpp @@ -22,8 +22,6 @@ namespace ult { class ZesFabricPortFixture : public SysmanDeviceFixture { protected: - static constexpr uint32_t numPorts = 2; - void SetUp() override { if (!sysmanUltsEnable) { GTEST_SKIP(); @@ -38,10 +36,7 @@ class ZesFabricPortFixture : public SysmanDeviceFixture { delete pFabricPortHandleContext->pFabricDevice; pFabricPortHandleContext->pFabricDevice = nullptr; } - Mock *mockFabricDevice = new NiceMock>; - ON_CALL(*mockFabricDevice, getNumPorts()) - .WillByDefault(Return(numPorts)); - + MockFabricDevice *mockFabricDevice = new MockFabricDevice(); pFabricPortHandleContext->pFabricDevice = mockFabricDevice; } void TearDown() override { @@ -57,7 +52,7 @@ TEST_F(ZesFabricPortFixture, GivenPortCountZeroWhenCallingZesFabricPortGetThenCo ze_result_t result = zesDeviceEnumFabricPorts(device, &count, NULL); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(count, ZesFabricPortFixture::numPorts); + EXPECT_EQ(count, mockNumPorts); } TEST_F(ZesFabricPortFixture, GivenPortCountZeroAndValidHandlePtrWhenCallingZesFabricPortGetThenCountIsReturnedAndNoHandlesReturnedAndVerifyZesFabricPortGetCallSucceeds) { @@ -67,35 +62,35 @@ TEST_F(ZesFabricPortFixture, GivenPortCountZeroAndValidHandlePtrWhenCallingZesFa ze_result_t result = zesDeviceEnumFabricPorts(device, &count, &handle); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(count, ZesFabricPortFixture::numPorts); + EXPECT_EQ(count, mockNumPorts); EXPECT_EQ(handle, static_cast(0UL)); } TEST_F(ZesFabricPortFixture, GivenPortCountCorrectWhenCallingZesFabricPortGetThenCountHandlesAreReturnedAndAndVerifyZesFabricPortGetCallSucceeds) { - uint32_t count = ZesFabricPortFixture::numPorts; - zes_fabric_port_handle_t hPorts[ZesFabricPortFixture::numPorts]; + uint32_t count = mockNumPorts; + zes_fabric_port_handle_t hPorts[mockNumPorts]; ze_result_t result = zesDeviceEnumFabricPorts(device, &count, hPorts); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(count, ZesFabricPortFixture::numPorts); + EXPECT_EQ(count, mockNumPorts); } TEST_F(ZesFabricPortFixture, GivenPortCountGreaterThanPortsWhenCallingZesFabricPortGetThenCorrectCountisReturnedAndAndVerifyZesFabricPortGetCallSucceeds) { - uint32_t count = ZesFabricPortFixture::numPorts + 1U; - zes_fabric_port_handle_t hPorts[ZesFabricPortFixture::numPorts + 1U]; + uint32_t count = mockNumPorts + 1U; + zes_fabric_port_handle_t hPorts[mockNumPorts + 1U]; ze_result_t result = zesDeviceEnumFabricPorts(device, &count, hPorts); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(count, ZesFabricPortFixture::numPorts); + EXPECT_EQ(count, mockNumPorts); } TEST_F(ZesFabricPortFixture, GivenPortCounLessThanPortsWhenCallingZesFabricPortGetThenCountLessTanPortsHandlesAreReturned) { - uint32_t count = ZesFabricPortFixture::numPorts - 1U; - zes_fabric_port_handle_t hPorts[ZesFabricPortFixture::numPorts - 1U]; + uint32_t count = mockNumPorts - 1U; + zes_fabric_port_handle_t hPorts[mockNumPorts - 1U]; ze_result_t result = zesDeviceEnumFabricPorts(device, &count, hPorts); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(count, ZesFabricPortFixture::numPorts - 1U); + EXPECT_EQ(count, mockNumPorts - 1U); } TEST_F(ZesFabricPortFixture, GivenValidFabricPortHandleWhenCallingZesFabricPortGetPropertiesThenZesFabricPortGetPropertiesCallSucceeds) { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h index 7dc239edd5..2ae890d967 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h @@ -28,7 +28,7 @@ template <> struct Mock : public LinuxProcfsAccess { ::pid_t ourDevicePid = 0; int ourDeviceFd = 0; - ze_result_t getMockFileName(const ::pid_t pid, const int fd, std::string &val) { + ze_result_t getFileName(const ::pid_t pid, const int fd, std::string &val) override { if (pid == ourDevicePid && fd == ourDeviceFd) { val = mockedDeviceName; } else { @@ -39,8 +39,6 @@ struct Mock : public LinuxProcfsAccess { } Mock() = default; - - MOCK_METHOD(ze_result_t, getFileName, (const ::pid_t pid, const int fd, std::string &val), (override)); }; } // namespace ult diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h index 9f0c75c7e2..ee870c71a8 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h @@ -23,14 +23,12 @@ class LinuxSysfsAccess : public SysfsAccess {}; template <> struct Mock : public LinuxSysfsAccess { - ze_result_t getRealPathVal(const std::string file, std::string &val) { + ze_result_t getRealPath(const std::string file, std::string &val) override { val = "/random/path"; return ZE_RESULT_SUCCESS; } Mock() = default; - - MOCK_METHOD(ze_result_t, getRealPath, (const std::string path, std::string &val), (override)); }; } // namespace ult diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h index 2013d1d6d0..eebf525b5a 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h @@ -70,17 +70,12 @@ class SysmanDeviceFixture : public DeviceFixture, public ::testing::Test { pLinuxSysmanImp = static_cast(pOsSysman); pFwUtilInterface = new MockFwUtilInterface(); - pSysfsAccess = new NiceMock>; - pProcfsAccess = new NiceMock>; + pSysfsAccess = new Mock; + pProcfsAccess = new Mock; pLinuxSysmanImp->pFwUtilInterface = pFwUtilInterface; pLinuxSysmanImp->pSysfsAccess = pSysfsAccess; pLinuxSysmanImp->pProcfsAccess = pProcfsAccess; - ON_CALL(*pSysfsAccess, getRealPath(_, Matcher(_))) - .WillByDefault(::testing::Invoke(pSysfsAccess, &Mock::getRealPathVal)); - ON_CALL(*pProcfsAccess, getFileName(_, _, Matcher(_))) - .WillByDefault(::testing::Invoke(pProcfsAccess, &Mock::getMockFileName)); - pSysmanDeviceImp->init(); } void TearDown() override { @@ -125,17 +120,11 @@ class SysmanMultiDeviceFixture : public MultiDeviceFixture, public ::testing::Te pLinuxSysmanImp = static_cast(pOsSysman); pFwUtilInterface = new MockFwUtilInterface(); - pSysfsAccess = new NiceMock>; - pProcfsAccess = new NiceMock>; + pSysfsAccess = new Mock; + pProcfsAccess = new Mock; pLinuxSysmanImp->pFwUtilInterface = pFwUtilInterface; pLinuxSysmanImp->pSysfsAccess = pSysfsAccess; pLinuxSysmanImp->pProcfsAccess = pProcfsAccess; - - ON_CALL(*pSysfsAccess, getRealPath(_, Matcher(_))) - .WillByDefault(::testing::Invoke(pSysfsAccess, &Mock::getRealPathVal)); - ON_CALL(*pProcfsAccess, getFileName(_, _, Matcher(_))) - .WillByDefault(::testing::Invoke(pProcfsAccess, &Mock::getMockFileName)); - pSysmanDeviceImp->init(); subDeviceCount = numSubDevices; }