Improve MockGmmMemory usage

Change-Id: I5edfe5a09c743d1672631a62be588e2aed55fd46

Author: BartoszDunajski

unit_tests/mocks/mock_gmm_memory.cpp

@@ -26,19 +26,7 @@
 using namespace ::testing;
 
 namespace OCLRT {
-
-namespace MockGmmMemory {
-MockType MockGmmMemoryFlag = MockType::MockDummy;
-}
-
 GmmMemory *GmmMemory::create() {
-    if (MockGmmMemory::MockGmmMemoryFlag == MockGmmMemory::MockType::MockDummy) {
-        return new MockGmmMemoryDummy();
-    } else {
-        GmockGmmMemory *gmmMemory = new NiceMock<GmockGmmMemory>();
-        ON_CALL(*gmmMemory, getInternalGpuVaRangeLimit()).WillByDefault(::testing::Return(OCLRT::windowsMinAddress));
-        return gmmMemory;
-    }
+    return new MockGmmMemory();
 }
-
 } // namespace OCLRT

unit_tests/mocks/mock_gmm_memory.h

@@ -27,20 +27,11 @@
 
 namespace OCLRT {
 
-namespace MockGmmMemory {
-enum MockType {
-    MockDummy,
-    MockInstrumentation
-};
-
-extern MockType MockGmmMemoryFlag;
-} // namespace MockGmmMemory
-
-class MockGmmMemoryDummy : public GmmMemory {
+class MockGmmMemory : public GmmMemory {
   public:
-    ~MockGmmMemoryDummy() = default;
+    ~MockGmmMemory() = default;
 
-    MockGmmMemoryDummy() = default;
+    MockGmmMemory() = default;
 
     bool configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter,
                                      GMM_ESCAPE_HANDLE hDevice,
@@ -50,11 +41,11 @@ class MockGmmMemoryDummy : public GmmMemory {
                                      BOOLEAN SparseReady,
                                      BOOLEAN BDWL3Coherency,
                                      GMM_GFX_SIZE_T SizeOverride,
-                                     GMM_GFX_SIZE_T SlmGfxSpaceReserve) {
+                                     GMM_GFX_SIZE_T SlmGfxSpaceReserve) override {
         return true;
     }
 
-    uintptr_t getInternalGpuVaRangeLimit() {
+    uintptr_t getInternalGpuVaRangeLimit() override {
         return OCLRT::windowsMinAddress;
     }
 };
@@ -76,6 +67,8 @@ class GmockGmmMemory : public GmmMemory {
                       GMM_GFX_SIZE_T SizeOverride,
                       GMM_GFX_SIZE_T SlmGfxSpaceReserve));
 
-    MOCK_METHOD0(getInternalGpuVaRangeLimit, uintptr_t());
+    uintptr_t getInternalGpuVaRangeLimit() override {
+        return OCLRT::windowsMinAddress;
+    }
 };
 } // namespace OCLRT

unit_tests/mocks/mock_wddm.h

@@ -53,6 +53,7 @@ class WddmMock : public Wddm {
     using Wddm::device;
     using Wddm::gdi;
     using Wddm::getSystemInfo;
+    using Wddm::gmmMemory;
     using Wddm::pagingQueue;
 
     WddmMock() : Wddm(){};

unit_tests/os_interface/windows/wddm_fixture.h

@@ -56,13 +56,11 @@ struct WddmFixtureWithMockGdiDll : public GdiDllFixture {
 
 struct WddmInstrumentationGmmFixture {
     virtual void SetUp() {
-        MockGmmMemory::MockGmmMemoryFlag = MockGmmMemory::MockType::MockInstrumentation;
         wddm.reset(static_cast<WddmMock *>(Wddm::createWddm()));
-        gmmMem = static_cast<GmockGmmMemory *>(wddm->getGmmMemory());
-    }
-    virtual void TearDown() {
-        MockGmmMemory::MockGmmMemoryFlag = MockGmmMemory::MockType::MockDummy;
+        gmmMem = new ::testing::NiceMock<GmockGmmMemory>();
+        wddm->gmmMemory.reset(gmmMem);
     }
+    virtual void TearDown() {}
 
     std::unique_ptr<WddmMock> wddm;
     GmockGmmMemory *gmmMem = nullptr;