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

Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

Browse Source
This commit is contained in:
chcurran
2021-08-30 14:33:16 -07:00
parent 862df096db cdcdcb0777
commit 782c6748ae
1660 changed files with 432462 additions and 114764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
+3 -5
View File
@@ -360,16 +360,16 @@ TEST_F(ScriptCanvasTestFixture, ValueTypes)
double numberDoubleValue = *numberDouble.GetAs<double>();
Datum numberHex(Datum(0xff));
/*int numberHexValue =*/ *numberHex.GetAs<int>();
[[maybe_unused]] int numberHexValue = *numberHex.GetAs<int>();
Datum numberPi(Datum(3.14f));
float numberPiValue = *numberPi.GetAs<float>();
Datum numberSigned(Datum(-100));
/*int numberSignedValue =*/ *numberSigned.GetAs<int>();
[[maybe_unused]] int numberSignedValue = *numberSigned.GetAs<int>();
Datum numberUnsigned(Datum(100u));
/*unsigned int numberUnsignedValue =*/ *numberUnsigned.GetAs<unsigned int>();
[[maybe_unused]] unsigned int numberUnsignedValue = *numberUnsigned.GetAs<unsigned int>();
Datum numberDoublePi(Datum(6.28));
double numberDoublePiValue = *numberDoublePi.GetAs<double>();
@@ -472,8 +472,6 @@ TEST_F(ScriptCanvasTestFixture, Contracts)
delete graph->GetEntity();
}
const int k_executionCount = 998;
TEST_F(ScriptCanvasTestFixture, While)
{
RunUnitTestGraph("LY_SC_UnitTest_While", ScriptCanvas::ExecutionMode::Interpreted);
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Variables.cpp
-4
View File
@@ -207,28 +207,24 @@ TEST_F(ScriptCanvasTestFixture, RemoveVariableTest)
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "FirstVector3", vector3Datum1, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId firstVector3Id = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "SecondVector3", vector3Datum2, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId secondVector3Id = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "FirstVector4", vector4Datum, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId firstVector4Id = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "ProjectionMatrix", behaviorMatrix4x4Datum, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId projectionMatrixId = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));