birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modernization + AZStd::function compare fix. (#3680)

Browse Source 
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-09-02 21:55:09 +02:00
committed by GitHub
parent b3c8b0f5f3
commit 567c0ae24d
150 changed files with 865 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/Streamer/BlockCacheTests.cpp
+17 -15
View File
@@ -184,7 +184,7 @@ namespace AZ::IO
size = size >> 2;
for (u64 i = 0; i < size; ++i)
{
// Using assert here because in case of a problem EXPECT would
// Using assert here because in case of a problem EXPECT would
// cause a large amount of log noise.
ASSERT_EQ(buffer[i], offset + (i << 2));
}
@@ -203,7 +203,9 @@ namespace AZ::IO
{
do
{
while (m_context->FinalizeCompletedRequests());
while (m_context->FinalizeCompletedRequests())
{
}
} while (m_cache->ExecuteRequests());
}
@@ -269,7 +271,7 @@ namespace AZ::IO
RedirectReadCalls();
EXPECT_CALL(*this, ReadFile(_, _, 0, m_fakeFileLength));
ProcessRead(m_buffer, m_path, 0, m_fakeFileLength, IStreamerTypes::RequestStatus::Completed);
VerifyReadBuffer(0, m_fakeFileLength);
}
@@ -519,8 +521,8 @@ namespace AZ::IO
using ::testing::_;
using ::testing::Return;
CreateTestEnvironment();
CreateTestEnvironment();
EXPECT_CALL(*m_mock, ExecuteRequests())
.WillOnce(Return(true))
.WillRepeatedly(Return(false));
@@ -553,7 +555,7 @@ namespace AZ::IO
RunProcessLoop();
EXPECT_TRUE(allRequestsCompleted);
VerifyReadBuffer(256, m_fakeFileLength - 512);
VerifyReadBuffer(buffer1, m_fakeFileLength - 768, secondReadSize);
}
@@ -622,7 +624,7 @@ namespace AZ::IO
m_fakeFileFound = false;
m_fakeFileLength = 0;
ProcessRead(m_buffer, m_path, 0, m_blockSize, IStreamerTypes::RequestStatus::Failed);
}
@@ -650,18 +652,18 @@ namespace AZ::IO
status.m_isIdle = false;
}));
EXPECT_CALL(*this, ReadFile(_, _, _, _)).Times(count);
constexpr size_t scratchBufferSize = 128_kib;
using ScratchBuffer = char[scratchBufferSize];
ScratchBuffer buffers[count];
bool allRequestsCompleted = true;
auto completed = [&allRequestsCompleted](const FileRequest& request)
{
// Capture result before request is recycled.
allRequestsCompleted = allRequestsCompleted && request.GetStatus() == IStreamerTypes::RequestStatus::Completed;
};
for (size_t i = 0; i < count; ++i)
{
StreamStackEntry::Status status;
@@ -738,7 +740,7 @@ namespace AZ::IO
RedirectReadCalls();
EXPECT_CALL(*this, ReadFile(_, _, 256, m_fakeFileLength - 256));
ProcessRead(m_buffer, m_path, 256, m_fakeFileLength - 256, IStreamerTypes::RequestStatus::Completed);
VerifyReadBuffer(256, m_fakeFileLength - 256);
}
@@ -1062,7 +1064,7 @@ namespace AZ::IO
.WillRepeatedly(Return(false));
EXPECT_CALL(*m_mock, QueueRequest(_))
.WillRepeatedly(Invoke(this, &BlockCacheTest::QueueReadRequest));
size_t firstReadSize = m_fakeFileLength - (2 * m_blockSize) - 512;
FileRequest* request0 = m_context->GetNewInternalRequest();
request0->CreateRead(nullptr, m_buffer, m_bufferSize, m_path, 256, firstReadSize);
@@ -1097,7 +1099,7 @@ namespace AZ::IO
VerifyReadBuffer(buffer1.get(), secondReadOffset, secondReadSize);
}
@@ -1146,7 +1148,7 @@ namespace AZ::IO
FileRequest* request = m_context->GetNewInternalRequest();
request->CreateFlush(m_path);
RunAndCompleteRequest(request, IStreamerTypes::RequestStatus::Completed);
// The partial read would normally be serviced from the cache, but now triggers another read.
EXPECT_CALL(*this, ReadFile(_, _, _, _)).Times(1);
ProcessRead(m_buffer, m_path, 512, m_blockSize - 1024, IStreamerTypes::RequestStatus::Completed);
@@ -1170,7 +1172,7 @@ namespace AZ::IO
FileRequest* request = m_context->GetNewInternalRequest();
request->CreateFlushAll();
RunAndCompleteRequest(request, IStreamerTypes::RequestStatus::Completed);
// The partial read would normally be serviced from the cache, but now triggers another read.
EXPECT_CALL(*this, ReadFile(_, _, _, _)).Times(1);
ProcessRead(m_buffer, m_path, 512, m_blockSize - 1024, IStreamerTypes::RequestStatus::Completed);