Fix test for internal heap base address of wddm memory manager

JablonskiMateusz · Compute-Runtime-Automation · commit 16c3117b0916 · 2019-02-04T19:05:20.000+01:00
Change-Id: Ia6879ad9637ad38b3d641b0b4522dd1e85b0fb50
Signed-off-by: Mateusz Jablonski &lt;mateusz.jablonski@intel.com&gt;
diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
@@ -1152,12 +1152,12 @@ TEST_F(WddmMemoryManagerWithAsyncDeleterTest, givenMemoryManagerWithoutAsyncDele
     EXPECT_EQ(1u, wddm->createAllocationResult.called);
 }
 
-TEST(WddmMemoryManagerDefaults, givenDefaultWddmMemoryManagerWhenItIsQueriedForInternalHeapBaseThenHeap1BaseIsReturned) {
+TEST(WddmMemoryManagerDefaults, givenDefaultWddmMemoryManagerWhenItIsQueriedForInternalHeapBaseThenHeapInternalDeviceMemoryBaseIsReturned) {
     ExecutionEnvironment executionEnvironment;
     auto wddm = std::make_unique<WddmMock>();
-    wddm->callBaseDestroyAllocations = false;
+    wddm->init(PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]));
     MockWddmMemoryManager memoryManager(wddm.get(), executionEnvironment);
-    auto heapBase = wddm->getGfxPartition().Heap32[1].Base;
+    auto heapBase = wddm->getGfxPartition().Heap32[static_cast<uint32_t>(HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY)].Base;
     EXPECT_EQ(heapBase, memoryManager.getInternalHeapBaseAddress());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1152,12 +1152,12 @@ TEST_F(WddmMemoryManagerWithAsyncDeleterTest, givenMemoryManagerWithoutAsyncDele`
`1152`	`1152`	`EXPECT_EQ(1u, wddm->createAllocationResult.called);`
`1153`	`1153`	`}`
`1154`	`1154`
`1155`		`-TEST(WddmMemoryManagerDefaults, givenDefaultWddmMemoryManagerWhenItIsQueriedForInternalHeapBaseThenHeap1BaseIsReturned) {`
	`1155`	`+TEST(WddmMemoryManagerDefaults, givenDefaultWddmMemoryManagerWhenItIsQueriedForInternalHeapBaseThenHeapInternalDeviceMemoryBaseIsReturned) {`
`1156`	`1156`	`ExecutionEnvironment executionEnvironment;`
`1157`	`1157`	`auto wddm = std::make_unique<WddmMock>();`
`1158`		`- wddm->callBaseDestroyAllocations = false;`
	`1158`	`+ wddm->init(PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]));`
`1159`	`1159`	`MockWddmMemoryManager memoryManager(wddm.get(), executionEnvironment);`
`1160`		`- auto heapBase = wddm->getGfxPartition().Heap32[1].Base;`
	`1160`	`+ auto heapBase = wddm->getGfxPartition().Heap32[static_cast<uint32_t>(HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY)].Base;`
`1161`	`1161`	`EXPECT_EQ(heapBase, memoryManager.getInternalHeapBaseAddress());`
`1162`	`1162`	`}`
`1163`	`1163`