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

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/AZStd/Optional.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ namespace UnitTest
TEST_F(OptionalFixture, ConstructorInPlaceWithInitializerList)
{
const optional<ConstructibleWithInitializerListClass> opt(in_place, {"Lumberyard"}, 4);
const optional<ConstructibleWithInitializerListClass> opt(in_place, {"O3DE"}, 4);
EXPECT_TRUE(bool(opt)) << "optional constructed with args should be true";
}
Code/Framework/AzCore/Tests/Components.cpp
+2 -4
View File
@@ -1081,13 +1081,11 @@ namespace UnitTest
AZStd::string filePath;
if (providerId == UserSettings::CT_GLOBAL)
{
filePath.append(static_cast<AZStd::string_view>(m_exeDirectory));
filePath.append("GlobalUserSettings.xml");
filePath = (m_exeDirectory / "GlobalUserSettings.xml").String();
}
else if (providerId == UserSettings::CT_LOCAL)
{
filePath.append(static_cast<AZStd::string_view>(m_exeDirectory));
filePath.append("LocalUserSettings.xml");
filePath = (m_exeDirectory / "LocalUserSettings.xml").String();
}
return filePath;
}
Code/Framework/AzCore/Tests/IO/Path/PathTests.cpp
+9 -9
View File
@@ -547,7 +547,7 @@ namespace UnitTest
PathLexicallyNormalParams{ '/', "foo/./bar/..", "foo" },
PathLexicallyNormalParams{ '/', "foo/.///bar/../", "foo" },
PathLexicallyNormalParams{ '/', R"(/foo\./bar\..\)", "/foo" },
PathLexicallyNormalParams{ '\\', R"(C:/lumberyard/dev/Cache\game/../pc)", R"(C:\lumberyard\dev\Cache\pc)" }
PathLexicallyNormalParams{ '\\', R"(C:/O3DE/dev/Cache\game/../pc)", R"(C:\O3DE\dev\Cache\pc)" }
)
);
@@ -756,13 +756,13 @@ namespace UnitTest
PathPrefixParams{ "C:\\foo\\", "C:\\foo", true },
PathPrefixParams{ "C:", "C:\\foo", true },
PathPrefixParams{ "D:\\", "C:\\foo", false },
PathPrefixParams{ "/lumberyard/dev/", "/lumberyard/dev", true },
PathPrefixParams{ "/lumberyard/dev", "/lumberyard/dev/", true },
PathPrefixParams{ "/lumberyard/dev/", "/lumberyard/dev/Cache", true },
PathPrefixParams{ "/lumberyard/dev", "/lumberyard/dev/Cache", true },
PathPrefixParams{ "/lumberyard/dev", "/lumberyard/dev/Cache/", true },
PathPrefixParams{ "lumberyard/dev/", "lumberyard/dev/Cache/", true },
PathPrefixParams{ "lumberyard\\dev/Assets", "lumberyard/dev/Cache/", false }
PathPrefixParams{ "/O3DE/dev/", "/O3DE/dev", true },
PathPrefixParams{ "/O3DE/dev", "/O3DE/dev/", true },
PathPrefixParams{ "/O3DE/dev/", "/O3DE/dev/Cache", true },
PathPrefixParams{ "/O3DE/dev", "/O3DE/dev/Cache", true },
PathPrefixParams{ "/O3DE/dev", "/O3DE/dev/Cache/", true },
PathPrefixParams{ "O3DE/dev/", "O3DE/dev/Cache/", true },
PathPrefixParams{ "O3DE\\dev/Assets", "O3DE/dev/Cache/", false }
));
struct PathDecompositionParams
@@ -854,7 +854,7 @@ namespace Benchmark
}
protected:
AZStd::fixed_vector<const char*, 20> m_appendPaths{ "foo", "bar", "baz", "bazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
"boo/bar/base", "C:\\path\\to\\lumberyard", "C", "\\\\", "/", R"(test\\path/with\mixed\separators)" };
"boo/bar/base", "C:\\path\\to\\O3DE", "C", "\\\\", "/", R"(test\\path/with\mixed\separators)" };
};
BENCHMARK_F(PathBenchmarkFixture, BM_PathAppendFixedPath)(benchmark::State& state)
Code/Framework/AzCore/Tests/Math/ObbTests.cpp
+10
View File
@@ -56,6 +56,16 @@ namespace UnitTest
EXPECT_THAT(obb.GetAxisZ(), IsClose(Vector3(1.0f, 0.0f, 0.0f)));
}
TEST(MATH_Obb, TestScaleTransform)
{
Obb obb = Obb::CreateFromPositionRotationAndHalfLengths(position, rotation, halfLengths);
Vector3 scaleFactors = Vector3(1.0f, 2.0f, 3.0f);
Transform transform = Transform::CreateScale(scaleFactors);
obb = transform * obb;
EXPECT_THAT(obb.GetPosition(), IsClose(Vector3(1.0f, 4.0f, 9.0f)));
EXPECT_THAT(obb.GetHalfLengths(), IsClose(Vector3(0.5f, 1.0f, 1.5f)));
}
TEST(MATH_Obb, TestSetPosition)
{
Obb obb;
Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationMetadataTests.cpp
+5 -1
View File
@@ -93,8 +93,10 @@ namespace JsonSerializationTests
TEST_F(JsonSerializationMetadataTests, Add_MoveDuplicateValue_ReturnsFalse)
{
AZ_TEST_START_TRACE_SUPPRESSION;
m_metadata->Add(TestSettingsA{ 42 });
EXPECT_FALSE(m_metadata->Add(TestSettingsA{ 88 }));
AZ_TEST_STOP_TRACE_SUPPRESSION(1);
}
TEST_F(JsonSerializationMetadataTests, Add_CopyNewValue_ReturnsTrue)
@@ -119,11 +121,13 @@ namespace JsonSerializationTests
TEST_F(JsonSerializationMetadataTests, Find_MultipleValues_ReturnsFirstValue)
{
m_metadata->Add(TestSettingsA{ 42 });
AZ_TEST_START_TRACE_SUPPRESSION;
m_metadata->Add(TestSettingsA{42});
m_metadata->Add(TestSettingsA{ 88 });
TestSettingsA* value = m_metadata->Find<TestSettingsA>();
ASSERT_NE(nullptr, value);
EXPECT_EQ(42, value->m_number);
AZ_TEST_STOP_TRACE_SUPPRESSION(1);
}
TEST_F(JsonSerializationMetadataTests, FindConst_PreviouslyAddedValue_ReturnsConstPointer)
Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
+10
View File
@@ -542,4 +542,14 @@ tags=tools,renderer,metal)"
EXPECT_STREQ("Foo", commandLine.GetMiscValue(1).c_str());
EXPECT_STREQ("Bat", commandLine.GetMiscValue(2).c_str());
}
using SettingsRegistryAncestorDescendantOrEqualPathFixture = SettingsRegistryMergeUtilsCommandLineFixture;
TEST_F(SettingsRegistryAncestorDescendantOrEqualPathFixture, ValidateThatAncestorOrDescendantOrPathWithTheSameValue_Succeeds)
{
EXPECT_TRUE(AZ::SettingsRegistryMergeUtils::IsPathAncestorDescendantOrEqual("/Amazon/AzCore/Bootstrap", "/Amazon/AzCore"));
EXPECT_TRUE(AZ::SettingsRegistryMergeUtils::IsPathAncestorDescendantOrEqual("/Amazon/AzCore/Bootstrap", "/Amazon/AzCore/Bootstrap"));
EXPECT_TRUE(AZ::SettingsRegistryMergeUtils::IsPathAncestorDescendantOrEqual("/Amazon/AzCore/Bootstrap", "/Amazon/AzCore/Bootstrap/project_path"));
EXPECT_FALSE(AZ::SettingsRegistryMergeUtils::IsPathAncestorDescendantOrEqual("/Amazon/AzCore/Bootstrap", "/Amazon/Project/Settings/project_name"));
}
}