From f18b3bb5f54ffe19b4b1d0cee2865cf8f35eeb4e Mon Sep 17 00:00:00 2001
From: Piotr Fusik <piotr.fusik@intel.com>
Date: Mon, 16 Sep 2019 15:46:50 +0200
Subject: [PATCH] Clean up TestedDrmCommandStreamReceiver.

Change-Id: I566bda0e8c942c3a458e24ad1ee23845f4a5c1ba
Signed-off-by: Piotr Fusik <piotr.fusik@intel.com>
---
 .../linux/mock_drm_command_stream_receiver.h  | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/unit_tests/mocks/linux/mock_drm_command_stream_receiver.h b/unit_tests/mocks/linux/mock_drm_command_stream_receiver.h
index bd8ef33b50..081f0a601c 100644
--- a/unit_tests/mocks/linux/mock_drm_command_stream_receiver.h
+++ b/unit_tests/mocks/linux/mock_drm_command_stream_receiver.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <algorithm>
+
 template <typename GfxFamily>
 class TestedDrmCommandStreamReceiver : public DrmCommandStreamReceiver<GfxFamily> {
   public:
@@ -21,23 +23,12 @@ class TestedDrmCommandStreamReceiver : public DrmCommandStreamReceiver<GfxFamily
         : DrmCommandStreamReceiver<GfxFamily>(executionEnvironment, gemCloseWorkerMode::gemCloseWorkerInactive) {
     }
 
-    void overrideGemCloseWorkerOperationMode(gemCloseWorkerMode overrideValue) {
-        this->gemCloseWorkerOperationMode = overrideValue;
-    }
-
     void overrideDispatchPolicy(DispatchMode overrideValue) {
         this->dispatchMode = overrideValue;
     }
 
-    bool isResident(BufferObject *bo) {
-        bool resident = false;
-        for (auto it : this->residency) {
-            if (it == bo) {
-                resident = true;
-                break;
-            }
-        }
-        return resident;
+    bool isResident(BufferObject *bo) const {
+        return std::find(this->residency.begin(), this->residency.end(), bo) != this->residency.end();
     }
 
     void makeNonResident(GraphicsAllocation &gfxAllocation) override {
@@ -46,15 +37,8 @@ class TestedDrmCommandStreamReceiver : public DrmCommandStreamReceiver<GfxFamily
         DrmCommandStreamReceiver<GfxFamily>::makeNonResident(gfxAllocation);
     }
 
-    const BufferObject *getResident(BufferObject *bo) {
-        BufferObject *ret = nullptr;
-        for (auto it : this->residency) {
-            if (it == bo) {
-                ret = it;
-                break;
-            }
-        }
-        return ret;
+    const BufferObject *getResident(BufferObject *bo) const {
+        return this->isResident(bo) ? bo : nullptr;
     }
 
     struct MakeResidentNonResidentResult {
@@ -65,7 +49,7 @@ class TestedDrmCommandStreamReceiver : public DrmCommandStreamReceiver<GfxFamily
     MakeResidentNonResidentResult makeNonResidentResult;
     std::vector<BufferObject *> *getResidencyVector() { return &this->residency; }
 
-    SubmissionAggregator *peekSubmissionAggregator() {
+    SubmissionAggregator *peekSubmissionAggregator() const {
         return this->submissionAggregator.get();
     }
     void overrideSubmissionAggregator(SubmissionAggregator *newSubmissionsAggregator) {