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

More github cleanup

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-03 17:59:09 -07:00
parent 928c8ff16c
commit cbfdf99a9e
37 changed files with 125 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/GridMate/Tests/Carrier.cpp
+4 -4
View File
@@ -193,7 +193,7 @@ namespace UnitTest
CarrierCallbacksHandler clientCB, serverCB;
TestCarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier test!");
AZStd::string str("Hello this is a carrier test!");
const char* targetAddress = "127.0.0.1";
@@ -377,7 +377,7 @@ namespace UnitTest
CarrierCallbacksHandler clientCB, serverCB;
TestCarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier test!");
AZStd::string str("Hello this is a carrier test!");
clientCarrierDesc.m_driver = SocketProvider::CreateDriverForJoin();
serverCarrierDesc.m_driver = SocketProvider::CreateDriverForHost();
@@ -469,7 +469,7 @@ namespace UnitTest
CarrierCallbacksHandler clientCB, serverCB;
TestCarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier stress test!");
AZStd::string str("Hello this is a carrier stress test!");
clientCarrierDesc.m_enableDisconnectDetection = false;
serverCarrierDesc.m_enableDisconnectDetection = false;
@@ -1401,7 +1401,7 @@ namespace UnitTest
CarrierCallbacksHandler clientCB, serverCB;
CarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier test!");
AZStd::string str("Hello this is a carrier test!");
const char* targetAddress = "127.0.0.1";
Code/Framework/GridMate/Tests/CarrierStreamSocketDriverTests.cpp
+3 -3
View File
@@ -188,7 +188,7 @@ namespace UnitTest
CarrierStreamCallbacksHandler clientCB, serverCB;
TestCarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier test!");
AZStd::string str("Hello this is a carrier test!");
const char* targetAddress = "127.0.0.1";
@@ -374,7 +374,7 @@ namespace UnitTest
CarrierStreamCallbacksHandler clientCB, serverCB;
TestCarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier test!");
AZStd::string str("Hello this is a carrier test!");
clientCarrierDesc.m_driver = CreateDriverForJoin(clientCarrierDesc);
serverCarrierDesc.m_driver = CreateDriverForHost(serverCarrierDesc);
@@ -475,7 +475,7 @@ namespace UnitTest
CarrierStreamCallbacksHandler clientCB, serverCB;
UnitTest::TestCarrierDesc serverCarrierDesc, clientCarrierDesc;
string str("Hello this is a carrier stress test!");
AZStd::string str("Hello this is a carrier stress test!");
clientCarrierDesc.m_enableDisconnectDetection = /*false*/ true;
serverCarrierDesc.m_enableDisconnectDetection = /*false*/ true;
Code/Framework/GridMate/Tests/Replica.cpp
+2 -2
View File
@@ -3687,7 +3687,7 @@ public:
void Touch()
{
string randomStr;
AZStd::string randomStr;
for (unsigned i = 0; i < k_strSize; ++i)
{
randomStr += 'a' + (rand() % 26);
@@ -3698,7 +3698,7 @@ public:
bool IsReplicaMigratable() override { return false; }
static const unsigned k_strSize = 64;
DataSet<string> m_value;
DataSet<AZStd::string> m_value;
};
void run()
Code/Framework/GridMate/Tests/Serialize.cpp
+2 -2
View File
@@ -471,12 +471,12 @@ namespace UnitTest
// ------------------------------------
// String
{
string s = "hello";
AZStd::string s = "hello";
wb.Write(s);
AZ_TEST_ASSERT(wb.Size() == s.length() + sizeof(AZ::u16));
string rs;
AZStd::string rs;
rb = ReadBuffer(wb.GetEndianType(), wb.Get(), wb.Size());
rb.Read(rs);
AZ_TEST_ASSERT(rs == s);
Code/Framework/GridMate/Tests/TestProfiler.cpp
+10 -10
View File
@@ -34,15 +34,15 @@ static bool CollectPerformanceCounters(const AZ::Debug::ProfilerRegister& reg, c
return true;
}
static string FormatString(const AZStd::string& pre, const AZStd::string& name, const AZStd::string& post, AZ::u64 time, AZ::u64 calls)
static AZStd::string FormatString(const AZStd::string& pre, const AZStd::string& name, const AZStd::string& post, AZ::u64 time, AZ::u64 calls)
{
string units = "us";
AZStd::string units = "us";
if (AZ::u64 divtime = time / 1000)
{
time = divtime;
units = "ms";
}
return string::format("%s%s %s %10llu%s (%llu calls)\n", pre.c_str(), name.c_str(), post.c_str(), time, units.c_str(), calls);
return AZStd::string::format("%s%s %s %10llu%s (%llu calls)\n", pre.c_str(), name.c_str(), post.c_str(), time, units.c_str(), calls);
}
struct TotalSortContainer
@@ -56,28 +56,28 @@ struct TotalSortContainer
{
if (m_self && level >= 0)
{
string levelIndent;
AZStd::string levelIndent;
for (AZ::s32 i = 0; i < level; i++)
{
levelIndent += (i == level - 1) ? "+---" : "| ";
}
string name = m_self->m_name ? m_self->m_name : m_self->m_function;
string outputTotal = FormatString(levelIndent, name, " Total:", m_self->m_timeData.m_time, m_self->m_timeData.m_calls);
AZStd::string name = m_self->m_name ? m_self->m_name : m_self->m_function;
AZStd::string outputTotal = FormatString(levelIndent, name, " Total:", m_self->m_timeData.m_time, m_self->m_timeData.m_calls);
AZ_Printf(systemId, outputTotal.c_str());
if (m_self->m_timeData.m_childrenTime || m_self->m_timeData.m_childrenCalls)
{
string childIndent = levelIndent;
AZStd::string childIndent = levelIndent;
for (auto i = name.begin(); i != name.end(); ++i)
{
childIndent += " ";
}
childIndent[level * 4] = '|';
string outputChild = FormatString(childIndent, "", "Child:", m_self->m_timeData.m_childrenTime, m_self->m_timeData.m_childrenCalls);
AZStd::string outputChild = FormatString(childIndent, "", "Child:", m_self->m_timeData.m_childrenTime, m_self->m_timeData.m_childrenCalls);
AZ_Printf(systemId, outputChild.c_str());
string outputSelf = FormatString(childIndent, "", "Self :", m_self->m_timeData.m_time - m_self->m_timeData.m_childrenTime, m_self->m_timeData.m_calls);
AZStd::string outputSelf = FormatString(childIndent, "", "Self :", m_self->m_timeData.m_time - m_self->m_timeData.m_childrenTime, m_self->m_timeData.m_calls);
AZ_Printf(systemId, outputSelf.c_str());
}
}
@@ -237,7 +237,7 @@ void TestProfiler::PrintProfilingSelf(const char* systemId)
AZ_Printf(systemId, "Profiling timers by exclusive execution time:\n");
for (auto profiler : selfSorted)
{
string str = FormatString("", profiler->m_name ? profiler->m_name : profiler->m_function, "Self Time:",
AZStd::string str = FormatString("", profiler->m_name ? profiler->m_name : profiler->m_function, "Self Time:",
profiler->m_timeData.m_time - profiler->m_timeData.m_childrenTime, profiler->m_timeData.m_calls);
AZ_Printf(systemId, str.c_str());
}