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

Address some review feedback, remove DomBackendRegistry

Browse Source 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
This commit is contained in:
Nicholas Van Sickle
2021-11-30 12:10:16 -08:00
parent 5e4bdac2e1
commit 5dbe9e387b
14 changed files with 150 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/DOM/DomJsonBenchmarks.cpp
+13 -13
View File
@@ -20,31 +20,31 @@ namespace Benchmark
class DomJsonBenchmark : public UnitTest::AllocatorsBenchmarkFixture
{
public:
void SetUp([[maybe_unused]] const ::benchmark::State& st) override
void SetUp(const ::benchmark::State& st) override
{
UnitTest::AllocatorsBenchmarkFixture::SetUp(st);
AZ::NameDictionary::Create();
}
void SetUp([[maybe_unused]] ::benchmark::State& st) override
void SetUp(::benchmark::State& st) override
{
UnitTest::AllocatorsBenchmarkFixture::SetUp(st);
AZ::NameDictionary::Create();
}
void TearDown([[maybe_unused]] ::benchmark::State& st) override
void TearDown(::benchmark::State& st) override
{
AZ::NameDictionary::Destroy();
UnitTest::AllocatorsBenchmarkFixture::TearDown(st);
}
void TearDown([[maybe_unused]] const ::benchmark::State& st) override
void TearDown(const ::benchmark::State& st) override
{
AZ::NameDictionary::Destroy();
UnitTest::AllocatorsBenchmarkFixture::TearDown(st);
}
AZStd::string GenerateDomJsonBenchmarkPayload(int64_t entryCount = 100, int64_t stringTemplateLength = 5)
AZStd::string GenerateDomJsonBenchmarkPayload(int64_t entryCount, int64_t stringTemplateLength)
{
rapidjson::Document document;
document.SetObject();
@@ -120,7 +120,7 @@ namespace Benchmark
BENCHMARK_DEFINE_F(DomJsonBenchmark, DomDeserializeToDocumentInPlace)(benchmark::State& state)
{
AZ::DOM::JsonBackend backend;
AZ::Dom::JsonBackend backend;
AZStd::string serializedPayload = GenerateDomJsonBenchmarkPayload(state.range(0), state.range(1));
for (auto _ : state)
@@ -129,8 +129,8 @@ namespace Benchmark
AZStd::string payloadCopy = serializedPayload;
state.ResumeTiming();
auto result = AZ::DOM::Json::WriteToRapidJsonDocument(
[&](AZ::DOM::Visitor* visitor)
auto result = AZ::Dom::Json::WriteToRapidJsonDocument(
[&](AZ::Dom::Visitor* visitor)
{
return backend.ReadFromStringInPlace(payloadCopy, visitor);
});
@@ -144,15 +144,15 @@ namespace Benchmark
BENCHMARK_DEFINE_F(DomJsonBenchmark, DomDeserializeToDocument)(benchmark::State& state)
{
AZ::DOM::JsonBackend backend;
AZ::Dom::JsonBackend backend;
AZStd::string serializedPayload = GenerateDomJsonBenchmarkPayload(state.range(0), state.range(1));
for (auto _ : state)
{
auto result = AZ::DOM::Json::WriteToRapidJsonDocument(
[&](AZ::DOM::Visitor* visitor)
auto result = AZ::Dom::Json::WriteToRapidJsonDocument(
[&](AZ::Dom::Visitor* visitor)
{
return backend.ReadFromString(serializedPayload, AZ::DOM::Lifetime::Temporary, visitor);
return backend.ReadFromString(serializedPayload, AZ::Dom::Lifetime::Temporary, visitor);
});
benchmark::DoNotOptimize(result.GetValue());
@@ -164,7 +164,7 @@ namespace Benchmark
BENCHMARK_DEFINE_F(DomJsonBenchmark, JsonUtilsDeserializeToDocument)(benchmark::State& state)
{
AZ::DOM::JsonBackend backend;
AZ::Dom::JsonBackend backend;
AZStd::string serializedPayload = GenerateDomJsonBenchmarkPayload(state.range(0), state.range(1));
for (auto _ : state)
Code/Framework/AzCore/Tests/DOM/DomJsonTests.cpp
+7 -7
View File
@@ -12,7 +12,7 @@
#include <AzCore/Serialization/Json/JsonUtils.h>
#include <AzCore/UnitTest/TestTypes.h>
namespace AZ::DOM::Tests
namespace AZ::Dom::Tests
{
class DomJsonTests : public UnitTest::AllocatorsFixture
{
@@ -125,7 +125,7 @@ namespace AZ::DOM::Tests
AZStd::string canonicalSerializedDocument;
AZ::JsonSerializationUtils::WriteJsonString(*m_document, canonicalSerializedDocument);
auto visitDocumentFn = [this](AZ::DOM::Visitor* visitor)
auto visitDocumentFn = [this](AZ::Dom::Visitor* visitor)
{
return Json::VisitRapidJsonValue(*m_document, visitor, Lifetime::Persistent);
};
@@ -149,10 +149,10 @@ namespace AZ::DOM::Tests
// string -> Document
{
auto result = Json::WriteToRapidJsonDocument(
[&canonicalSerializedDocument](AZ::DOM::Visitor* visitor)
[&canonicalSerializedDocument](AZ::Dom::Visitor* visitor)
{
JsonBackend backend;
return backend.ReadFromString(canonicalSerializedDocument, AZ::DOM::Lifetime::Temporary, visitor);
return backend.ReadFromString(canonicalSerializedDocument, AZ::Dom::Lifetime::Temporary, visitor);
});
EXPECT_TRUE(result.IsSuccess());
EXPECT_TRUE(DeepCompare(*m_document, result.GetValue()));
@@ -164,9 +164,9 @@ namespace AZ::DOM::Tests
JsonBackend backend;
auto result = backend.WriteToString(
serializedDocument,
[&backend, &canonicalSerializedDocument](AZ::DOM::Visitor* visitor)
[&backend, &canonicalSerializedDocument](AZ::Dom::Visitor* visitor)
{
return backend.ReadFromString(canonicalSerializedDocument, AZ::DOM::Lifetime::Temporary, visitor);
return backend.ReadFromString(canonicalSerializedDocument, AZ::Dom::Lifetime::Temporary, visitor);
});
EXPECT_TRUE(result.IsSuccess());
EXPECT_EQ(canonicalSerializedDocument, serializedDocument);
@@ -285,4 +285,4 @@ namespace AZ::DOM::Tests
m_document->AddMember(CreateString("long_string"), CreateString("abcdefghijklmnopqrstuvwxyz0123456789"), m_document->GetAllocator());
PerformSerializationChecks();
}
} // namespace AZ::DOM::Tests
} // namespace AZ::Dom::Tests