Remove usage of TestLegacy from shared tests

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-08-16 12:19:30 +00:00
committed by Compute-Runtime-Automation
parent cb23a38aad
commit bfc0919999
36 changed files with 94 additions and 94 deletions

View File

@@ -20,7 +20,7 @@
using namespace NEO;
using DrmMockBufferObjectFixture = DrmBufferObjectFixture<DrmMockCustom>;
using DrmBufferObjectTest = TestLegacy<DrmMockBufferObjectFixture>;
using DrmBufferObjectTest = Test<DrmMockBufferObjectFixture>;
TEST_F(DrmBufferObjectTest, WhenCallingExecThenReturnIsCorrect) {
mock->ioctl_expected.total = 1;

View File

@@ -14,7 +14,7 @@
using namespace NEO;
using DrmBufferObjectPrelimFixture = DrmBufferObjectFixture<DrmMockCustomPrelim>;
using DrmBufferObjectPrelimTest = TestLegacy<DrmBufferObjectPrelimFixture>;
using DrmBufferObjectPrelimTest = Test<DrmBufferObjectPrelimFixture>;
TEST_F(DrmBufferObjectPrelimTest, GivenCompletionAddressWhenCallingExecThenReturnIsCorrect) {
mock->ioctl_expected.total = 1;

View File

@@ -28,7 +28,7 @@
using namespace NEO;
struct DrmCommandStreamMultiTileMemExecFixture {
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
DebugManager.flags.CreateMultipleSubDevices.set(2u);
DebugManager.flags.EnableImplicitScaling.set(1);
DebugManager.flags.EnableForcePin.set(false);
@@ -57,7 +57,7 @@ struct DrmCommandStreamMultiTileMemExecFixture {
device.reset(MockDevice::create<MockDevice>(executionEnvironment, 0));
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
executionEnvironment->decRefInternal();
}
@@ -69,7 +69,7 @@ struct DrmCommandStreamMultiTileMemExecFixture {
DrmMemoryManager *memoryManager = nullptr;
};
using DrmCommandStreamMultiTileMemExecTest = TestLegacy<DrmCommandStreamMultiTileMemExecFixture>;
using DrmCommandStreamMultiTileMemExecTest = Test<DrmCommandStreamMultiTileMemExecFixture>;
HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSupportsCompletionFenceAndVmBindWhenCallingCsrExecThenMultipleTagAllocationIsPassed) {
auto *testCsr = new TestedDrmCommandStreamReceiver<FamilyType>(*executionEnvironment, 0, device->getDeviceBitfield());

View File

@@ -86,7 +86,7 @@ TEST(MemoryInfoPrelim, givenNewMemoryInfoQuerySupportedWhenQueryingMemoryInfoThe
}
struct DrmVmTestFixture {
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
executionEnvironment = std::make_unique<ExecutionEnvironment>();
executionEnvironment->prepareRootDeviceEnvironments(1);
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(NEO::defaultHwInfo.get());
@@ -104,7 +104,7 @@ struct DrmVmTestFixture {
ASSERT_NE(nullptr, drm);
}
void TearDown() {} // NOLINT(readability-identifier-naming)
void tearDown() {}
DebugManagerStateRestore restorer;
std::unique_ptr<ExecutionEnvironment> executionEnvironment;
@@ -115,7 +115,7 @@ struct DrmVmTestFixture {
static constexpr uint8_t tileCount = 4u;
};
using DrmVmTestTest = TestLegacy<DrmVmTestFixture>;
using DrmVmTestTest = Test<DrmVmTestFixture>;
TEST_F(DrmVmTestTest, givenNewMemoryInfoQuerySupportedWhenCreatingVirtualMemoryThenVmCreatedUsingNewRegion) {
DebugManager.flags.EnableLocalMemory.set(1);

View File

@@ -23,7 +23,7 @@ class DrmMemManagerFixture {
void forceLimitedRangeAllocator(uint32_t rootDeviceIndex, uint64_t range) { getGfxPartition(rootDeviceIndex)->init(range, 0, 0, gfxPartitions.size(), true); }
};
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(true);
executionEnvironment = std::make_unique<ExecutionEnvironment>();
@@ -34,13 +34,13 @@ class DrmMemManagerFixture {
executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(new DrmMock(*executionEnvironment->rootDeviceEnvironments[0])));
memManager = std::unique_ptr<FrontWindowMemManagerMock>(new FrontWindowMemManagerMock(*executionEnvironment));
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
}
std::unique_ptr<FrontWindowMemManagerMock> memManager;
std::unique_ptr<ExecutionEnvironment> executionEnvironment;
};
using DrmFrontWindowPoolAllocatorTests = TestLegacy<DrmMemManagerFixture>;
using DrmFrontWindowPoolAllocatorTests = Test<DrmMemManagerFixture>;
TEST_F(DrmFrontWindowPoolAllocatorTests, givenAllocateInSpecialPoolFlagWhenDrmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) {
AllocationData allocData = {};