intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-21 09:14:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove MOCK_METHOD from Linux Common Code and Fabric Port ULT

Browse Source 
The MOCK_METHODS in the linux common code and Fabric Port ULT has been
removed.
Related-To: LOCI-3777

Signed-off-by: Bari, Pratik <pratik.bari@intel.com>
This commit is contained in:
Bari, Pratik
2022-12-16 18:40:14 +05:30
committed by Compute-Runtime-Automation
parent 7dd96449ff
commit 2f3157911d
5 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h
View File

@@ -14,13 +14,14 @@
namespace L0 {
namespace ult {
template <>
struct Mock<FabricDevice> : 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

29
level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_zes_fabric_port.cpp
View File

@@ -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<FabricDevice> *mockFabricDevice = new NiceMock<Mock<FabricDevice>>;
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<zes_fabric_port_handle_t>(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) {

4
level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h
View File

@@ -28,7 +28,7 @@ template <>
struct Mock<LinuxProcfsAccess> : 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<LinuxProcfsAccess> : public LinuxProcfsAccess {
}
Mock<LinuxProcfsAccess>() = default;
MOCK_METHOD(ze_result_t, getFileName, (const ::pid_t pid, const int fd, std::string &val), (override));
};
} // namespace ult

4
level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h
View File

@@ -23,14 +23,12 @@ class LinuxSysfsAccess : public SysfsAccess {};
template <>
struct Mock<LinuxSysfsAccess> : 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<LinuxSysfsAccess>() = default;
MOCK_METHOD(ze_result_t, getRealPath, (const std::string path, std::string &val), (override));
};
} // namespace ult

19
level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h
View File

@@ -70,17 +70,12 @@ class SysmanDeviceFixture : public DeviceFixture, public ::testing::Test {
pLinuxSysmanImp = static_cast<PublicLinuxSysmanImp *>(pOsSysman);
pFwUtilInterface = new MockFwUtilInterface();
pSysfsAccess = new NiceMock<Mock<LinuxSysfsAccess>>;
pProcfsAccess = new NiceMock<Mock<LinuxProcfsAccess>>;
pSysfsAccess = new Mock<LinuxSysfsAccess>;
pProcfsAccess = new Mock<LinuxProcfsAccess>;
pLinuxSysmanImp->pFwUtilInterface = pFwUtilInterface;
pLinuxSysmanImp->pSysfsAccess = pSysfsAccess;
pLinuxSysmanImp->pProcfsAccess = pProcfsAccess;
ON_CALL(*pSysfsAccess, getRealPath(_, Matcher<std::string &>(_)))
.WillByDefault(::testing::Invoke(pSysfsAccess, &Mock<LinuxSysfsAccess>::getRealPathVal));
ON_CALL(*pProcfsAccess, getFileName(_, _, Matcher<std::string &>(_)))
.WillByDefault(::testing::Invoke(pProcfsAccess, &Mock<LinuxProcfsAccess>::getMockFileName));
pSysmanDeviceImp->init();
}
void TearDown() override {
@@ -125,17 +120,11 @@ class SysmanMultiDeviceFixture : public MultiDeviceFixture, public ::testing::Te
pLinuxSysmanImp = static_cast<PublicLinuxSysmanImp *>(pOsSysman);
pFwUtilInterface = new MockFwUtilInterface();
pSysfsAccess = new NiceMock<Mock<LinuxSysfsAccess>>;
pProcfsAccess = new NiceMock<Mock<LinuxProcfsAccess>>;
pSysfsAccess = new Mock<LinuxSysfsAccess>;
pProcfsAccess = new Mock<LinuxProcfsAccess>;
pLinuxSysmanImp->pFwUtilInterface = pFwUtilInterface;
pLinuxSysmanImp->pSysfsAccess = pSysfsAccess;
pLinuxSysmanImp->pProcfsAccess = pProcfsAccess;
ON_CALL(*pSysfsAccess, getRealPath(_, Matcher<std::string &>(_)))
.WillByDefault(::testing::Invoke(pSysfsAccess, &Mock<LinuxSysfsAccess>::getRealPathVal));
ON_CALL(*pProcfsAccess, getFileName(_, _, Matcher<std::string &>(_)))
.WillByDefault(::testing::Invoke(pProcfsAccess, &Mock<LinuxProcfsAccess>::getMockFileName));
pSysmanDeviceImp->init();
subDeviceCount = numSubDevices;
}