Remove gmock from mock command queue and mock sampler

Related-To: NEO-4914
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h

@@ -6,13 +6,13 @@
  */
 
 #pragma once
+#include "shared/test/common/test_macros/mock_method_macros.h"
+
 #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
 #include "level_zero/core/source/cmdqueue/cmdqueue_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"
-
 namespace L0 {
 namespace ult {
 
@@ -45,41 +45,13 @@ struct Mock<CommandQueue> : public CommandQueue {
     Mock(L0::Device *device = nullptr, NEO::CommandStreamReceiver *csr = nullptr, const ze_command_queue_desc_t *desc = &default_cmd_queue_desc);
     ~Mock() override;
 
-    MOCK_METHOD(ze_result_t,
-                createFence,
-                (const ze_fence_desc_t *desc,
-                 ze_fence_handle_t *phFence),
-                (override));
-    MOCK_METHOD(ze_result_t,
-                destroy,
-                (),
-                (override));
-    MOCK_METHOD(ze_result_t,
-                executeCommandLists,
-                (uint32_t numCommandLists,
-                 ze_command_list_handle_t *phCommandLists,
-                 ze_fence_handle_t hFence,
-                 bool performMigration),
-                (override));
-    MOCK_METHOD(ze_result_t,
-                executeCommands,
-                (uint32_t numCommands,
-                 void *phCommands,
-                 ze_fence_handle_t hFence),
-                (override));
-    MOCK_METHOD(ze_result_t,
-                synchronize,
-                (uint64_t timeout),
-                (override));
-    MOCK_METHOD(void,
-                dispatchTaskCountWrite,
-                (NEO::LinearStream & commandStream,
-                 bool flushDataCache),
-                (override));
-    MOCK_METHOD(bool,
-                getPreemptionCmdProgramming,
-                (),
-                (override));
+    ADDMETHOD_NOBASE(createFence, ze_result_t, ZE_RESULT_SUCCESS, (const ze_fence_desc_t *desc, ze_fence_handle_t *phFence));
+    ADDMETHOD_NOBASE(destroy, ze_result_t, ZE_RESULT_SUCCESS, ());
+    ADDMETHOD_NOBASE(executeCommandLists, ze_result_t, ZE_RESULT_SUCCESS, (uint32_t numCommandLists, ze_command_list_handle_t *phCommandLists, ze_fence_handle_t hFence, bool performMigration));
+    ADDMETHOD_NOBASE(executeCommands, ze_result_t, ZE_RESULT_SUCCESS, (uint32_t numCommands, void *phCommands, ze_fence_handle_t hFence));
+    ADDMETHOD_NOBASE(synchronize, ze_result_t, ZE_RESULT_SUCCESS, (uint64_t timeout));
+    ADDMETHOD_NOBASE_VOIDRETURN(dispatchTaskCountWrite, (NEO::LinearStream & commandStream, bool flushDataCache));
+    ADDMETHOD_NOBASE(getPreemptionCmdProgramming, bool, false, ());
 };
 
 template <GFXCORE_FAMILY gfxCoreFamily>

level_zero/core/test/unit_tests/mocks/mock_sampler.h

@@ -1,34 +1,16 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "level_zero/core/source/sampler/sampler.h"
 #include "level_zero/core/source/sampler/sampler_hw.h"
-#include "level_zero/core/test/unit_tests/mock.h"
-#include "level_zero/core/test/unit_tests/white_box.h"
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#endif
 
 namespace L0 {
 namespace ult {
 
-using Sampler = WhiteBox<::L0::Sampler>;
-
-template <>
-struct Mock<Sampler> : public Sampler {
-    Mock() = default;
-
-    MOCK_METHOD0(destroy, ze_result_t());
-    MOCK_METHOD2(create, ze_result_t(Device *, const ze_sampler_desc_t *));
-};
-
 template <GFXCORE_FAMILY gfxCoreFamily>
 struct MockSamplerHw : public L0::SamplerCoreFamily<gfxCoreFamily> {
     using BaseClass = ::L0::SamplerCoreFamily<gfxCoreFamily>;
@@ -39,7 +21,3 @@ struct MockSamplerHw : public L0::SamplerCoreFamily<gfxCoreFamily> {
 
 } // namespace ult
 } // namespace L0
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp

@@ -282,12 +282,12 @@ HWTEST2_F(AppendMemoryCopy, givenImmediateCommandListWhenAppendingMemoryCopyThen
     commandList->cmdQImmediate = &cmdQueue;
     commandList->cmdListType = CommandList::CommandListType::TYPE_IMMEDIATE;
 
-    EXPECT_CALL(cmdQueue, executeCommandLists).Times(1).WillRepeatedly(::testing::Return(ZE_RESULT_SUCCESS));
-    EXPECT_CALL(cmdQueue, synchronize).Times(1).WillRepeatedly(::testing::Return(ZE_RESULT_SUCCESS));
-
     auto result = commandList->appendMemoryCopy(dstPtr, srcPtr, 8, nullptr, 0, nullptr);
     ASSERT_EQ(ZE_RESULT_SUCCESS, result);
 
+    EXPECT_EQ(1u, cmdQueue.executeCommandListsCalled);
+    EXPECT_EQ(1u, cmdQueue.synchronizeCalled);
+
     commandList->cmdQImmediate = nullptr;
 }