From 67660b44b041a449849520865c45b1965c14f866 Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Wed, 25 Oct 2023 13:02:23 +0000
Subject: [PATCH] test: remove gmock from L0 sysman ult

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 .../test/unit_tests/sources/ecc/windows/test_zes_ecc.cpp      | 1 -
 .../unit_tests/sources/fabric_port/linux/mock_fabric_device.h | 2 --
 .../fabric_port/linux/test_sysman_fabric_device_prelim.cpp    | 1 -
 .../fabric_port/linux/test_sysman_fabric_port_prelim.cpp      | 1 -
 .../sources/fabric_port/linux/test_zes_fabric_port.cpp        | 1 -
 .../sources/firmware/windows/test_zes_sysman_firmware.cpp     | 1 -
 .../unit_tests/sources/firmware_util/mock_fw_util_fixture.h   | 2 --
 .../sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp           | 4 +++-
 .../unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h  | 2 --
 .../unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp    | 2 ++
 .../test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h | 2 --
 .../test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp      | 1 +
 .../sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h | 2 +-
 .../sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp    | 2 +-
 .../unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp    | 1 +
 .../sources/performance/linux/test_zes_performance_prelim.cpp | 4 ++++
 .../test/unit_tests/sources/windows/mock_sysman_fixture.h     | 2 ++
 17 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/level_zero/sysman/test/unit_tests/sources/ecc/windows/test_zes_ecc.cpp b/level_zero/sysman/test/unit_tests/sources/ecc/windows/test_zes_ecc.cpp
index 1582842efe..89375a3f82 100644
--- a/level_zero/sysman/test/unit_tests/sources/ecc/windows/test_zes_ecc.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/ecc/windows/test_zes_ecc.cpp
@@ -10,7 +10,6 @@
 #include "level_zero/sysman/test/unit_tests/sources/ecc/windows/mock_ecc.h"
 
 using ::testing::Matcher;
-using ::testing::NiceMock;
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
index 4106530e7d..3d30b6de77 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
@@ -13,8 +13,6 @@
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
-#include "gmock/gmock.h"
-
 namespace L0 {
 namespace Sysman {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
index ad7ef6804d..26ddd1d390 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
@@ -9,7 +9,6 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h"
 
-#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 #include <limits>
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
index 69a5b9e506..f6db84e18b 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
@@ -12,7 +12,6 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h"
 
-#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 #include <limits>
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp
index ff7881eae8..2b9ead8247 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_zes_fabric_port.cpp
@@ -8,7 +8,6 @@
 #include "level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
-#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 #include <limits>
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/windows/test_zes_sysman_firmware.cpp b/level_zero/sysman/test/unit_tests/sources/firmware/windows/test_zes_sysman_firmware.cpp
index 31da31486f..a530a5a791 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/windows/test_zes_sysman_firmware.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/windows/test_zes_sysman_firmware.cpp
@@ -7,7 +7,6 @@
 
 #include "level_zero/sysman/test/unit_tests/sources/firmware/windows/mock_zes_sysman_firmware.h"
 
-using ::testing::_;
 namespace L0 {
 namespace Sysman {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h b/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
index 225f22eb00..3d21903525 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
@@ -12,8 +12,6 @@
 
 #include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 
-#include "gmock/gmock.h"
-
 using namespace NEO;
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
index e9e634b4d5..cc78024b72 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
@@ -9,6 +9,8 @@
 
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
+#include "gtest/gtest.h"
+
 namespace L0 {
 namespace Sysman {
 namespace ult {
@@ -298,4 +300,4 @@ ze_result_t MockIafNlApi::fportProperties(const L0::Sysman::IafPortId portId, ui
 
 } // namespace ult
 } // namespace Sysman
-} // namespace L0
\ No newline at end of file
+} // namespace L0
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
index ad868c2400..626bd1a273 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
@@ -9,8 +9,6 @@
 
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
-#include "gmock/gmock.h"
-
 #include <sstream>
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
index 36d21b3130..ff0f96ab5d 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
@@ -9,6 +9,8 @@
 
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
+#include "gtest/gtest.h"
+
 namespace L0 {
 namespace Sysman {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
index dd3a092ecb..af1e572af3 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
@@ -12,8 +12,6 @@
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 #include "level_zero/sysman/source/linux/nl_api/sysman_nl_api.h"
 
-#include "gmock/gmock.h"
-
 #include <map>
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp
index 6b56829645..b59ca85c88 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.cpp
@@ -9,6 +9,7 @@
 
 #include <level_zero/zes_api.h>
 
+#include "gtest/gtest.h"
 #include "iaf/iaf_netlink.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
index bc8b905deb..19548c8077 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
@@ -11,7 +11,7 @@
 
 #include "level_zero/sysman/source/linux/nl_api/sysman_nl_api.h"
 
-#include "gmock/gmock.h"
+#include <map>
 
 // Define opaque types so variables can be allocated
 struct nl_sock {};
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
index 756c6873d6..a9692b892a 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
@@ -11,7 +11,7 @@
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h"
 
-#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 #include <limits>
 #include <netlink/handlers.h>
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp
index 93d3c2c124..ef9a5a9bf3 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_nl_api.cpp
@@ -7,6 +7,7 @@
 
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h"
 
+#include "gtest/gtest.h"
 #include "iaf/iaf_netlink.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp
index 41bc4f0325..4d8bd7e55b 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/test_zes_performance_prelim.cpp
@@ -8,6 +8,10 @@
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h"
 
+#include "gtest/gtest.h"
+
+#include <cmath>
+
 namespace L0 {
 namespace Sysman {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
index 1aa0a0c3b8..6dbe4c542f 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
@@ -15,6 +15,8 @@
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h"
 
+#include "gtest/gtest.h"
+
 using namespace NEO;
 
 namespace L0 {