Integrating up through commit 90f050496
This commit is contained in:
@@ -121,9 +121,8 @@ namespace ScriptCanvas
|
||||
SCRIPT_CANVAS_GENERIC_FUNCTION_NODE_WITH_DEFAULTS(NormalizeWithDefault, NormalizeWithDefaultInputOverrides, "Math/Vector3", "{1A56B08E-7E48-4240-878A-397A912519B6}", "description placeholder", "Vector", "Tolerance", "Fake Testing Default Value");
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenerics)
|
||||
{
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenerics)
|
||||
{
|
||||
using namespace ScriptCanvasEditor;
|
||||
|
||||
RegisterComponentDescriptor<ArgsNoReturnNode>();
|
||||
@@ -167,37 +166,11 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenerics)
|
||||
|
||||
EXPECT_TRUE(Connect(*graph, noArgsReturnNodeID, "Out", normalizeWithDefaultNodeID, "In"));
|
||||
|
||||
TraceSuppressionBus::Broadcast(&TraceSuppressionRequests::SuppressPrintf, true);
|
||||
graph->GetEntity()->Activate();
|
||||
TraceSuppressionBus::Broadcast(&TraceSuppressionRequests::SuppressPrintf, false);
|
||||
|
||||
if (auto tolerance = normalizeWithDefaultNode->GetInput_UNIT_TEST<Data::NumberType>("Number: Tolerance"))
|
||||
{
|
||||
EXPECT_EQ(3.3, *tolerance);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE();
|
||||
}
|
||||
|
||||
if (auto fakeDefault = normalizeWithDefaultNode->GetInput_UNIT_TEST<Data::BooleanType>("Boolean: Fake Testing Default Value"))
|
||||
{
|
||||
EXPECT_TRUE(*fakeDefault);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE();
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
EXPECT_EQ(unitTestHandler.SideEffectCount(), 3);
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValue)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByValue)
|
||||
{
|
||||
|
||||
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
|
||||
@@ -276,29 +249,6 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValue)
|
||||
EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, value3->GetValue());
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_NE(value3, value2);
|
||||
EXPECT_EQ(value3, value4);
|
||||
EXPECT_EQ(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -309,7 +259,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValue)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointer)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByPointer)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -392,25 +342,6 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointer)
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, value3->GetValue());
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_EQ(value3, value2);
|
||||
EXPECT_EQ(value3, value4);
|
||||
EXPECT_EQ(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -421,7 +352,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointer)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReference)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByReference)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -501,28 +432,6 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReference)
|
||||
EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: TestBehaviorContextObject", valueID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, value3->GetValue());
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_EQ(value3, value2);
|
||||
EXPECT_EQ(value3, value4);
|
||||
EXPECT_EQ(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -533,7 +442,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReference)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValueInteger)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByValueInteger)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -603,30 +512,6 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValueInteger)
|
||||
EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, *value3);
|
||||
EXPECT_EQ(2, *value4);
|
||||
EXPECT_EQ(2, *value5);
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_NE(value3, value2);
|
||||
EXPECT_NE(value3, value4);
|
||||
EXPECT_NE(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -637,10 +522,8 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValueInteger)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointerInteger)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByPointerInteger)
|
||||
{
|
||||
|
||||
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
|
||||
@@ -709,30 +592,8 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointerInteger)
|
||||
EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, *value3);
|
||||
EXPECT_EQ(2, *value4);
|
||||
EXPECT_EQ(2, *value5);
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_NE(value3, value2);
|
||||
EXPECT_NE(value3, value4);
|
||||
EXPECT_NE(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -743,7 +604,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointerInteger)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReferenceInteger)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByReferenceInteger)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -813,30 +674,8 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReferenceInteger)
|
||||
EXPECT_TRUE(Connect(*graph, valueID3, "Get", valueID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, *value3);
|
||||
EXPECT_EQ(2, *value4);
|
||||
EXPECT_EQ(2, *value5);
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_NE(value3, value2);
|
||||
EXPECT_NE(value3, value4);
|
||||
EXPECT_NE(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -847,7 +686,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReferenceInteger)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValueMulti)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByValueMulti)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -966,47 +805,8 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValueMulti)
|
||||
EXPECT_TRUE(Connect(*graph, valueIntegerID3, "Get", valueIntegerID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByValueID, "Result: Number", valueIntegerID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByValueID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
valueInteger3 = valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
valueInteger4 = valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
valueInteger5 = valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
|
||||
if (valueInteger3 && valueInteger4 && valueInteger5)
|
||||
{
|
||||
EXPECT_EQ(2, *valueInteger3);
|
||||
EXPECT_EQ(2, *valueInteger4);
|
||||
EXPECT_EQ(2, *valueInteger5);
|
||||
EXPECT_NE(valueInteger3, valueInteger1);
|
||||
EXPECT_NE(valueInteger3, valueInteger2);
|
||||
EXPECT_NE(valueInteger3, valueInteger4);
|
||||
EXPECT_NE(valueInteger3, valueInteger5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, value3->GetValue());
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_NE(value3, value2);
|
||||
EXPECT_EQ(value3, value4);
|
||||
EXPECT_EQ(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -1017,7 +817,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByValueMulti)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReferenceMulti)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByReferenceMulti)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -1136,47 +936,8 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReferenceMulti)
|
||||
EXPECT_TRUE(Connect(*graph, valueIntegerID3, "Get", valueIntegerID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByReferenceID, "Result: Number", valueIntegerID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByReferenceID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
valueInteger3 = valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
valueInteger4 = valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
valueInteger5 = valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
|
||||
if (valueInteger3 && valueInteger4 && valueInteger5)
|
||||
{
|
||||
EXPECT_EQ(2, *valueInteger3);
|
||||
EXPECT_EQ(2, *valueInteger4);
|
||||
EXPECT_EQ(2, *valueInteger5);
|
||||
EXPECT_NE(valueInteger3, valueInteger1);
|
||||
EXPECT_NE(valueInteger3, valueInteger2);
|
||||
EXPECT_NE(valueInteger3, valueInteger4);
|
||||
EXPECT_NE(valueInteger3, valueInteger5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, value3->GetValue());
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_EQ(value3, value2);
|
||||
EXPECT_EQ(value3, value4);
|
||||
EXPECT_EQ(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
@@ -1187,7 +948,7 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByReferenceMulti)
|
||||
m_behaviorContext->DisableRemoveReflection();
|
||||
}
|
||||
|
||||
TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointerMulti)
|
||||
TEST_F(ScriptCanvasTestFixture, NodeGenericsByPointerMulti)
|
||||
{
|
||||
using namespace ScriptCanvas;
|
||||
using namespace ScriptCanvas::Nodes;
|
||||
@@ -1306,47 +1067,8 @@ TEST_F(ScriptCanvasTestFixture, DISABLED_NodeGenericsByPointerMulti)
|
||||
EXPECT_TRUE(Connect(*graph, valueIntegerID3, "Get", valueIntegerID4, "Set"));
|
||||
EXPECT_TRUE(Connect(*graph, maxByPointerID, "Result: Number", valueIntegerID5, "Set"));
|
||||
|
||||
// execution
|
||||
EXPECT_TRUE(Connect(*graph, startID, "Out", maxByPointerID, "In"));
|
||||
|
||||
graph->GetEntity()->Activate();
|
||||
|
||||
valueInteger3 = valueIntegerNode3->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
valueInteger4 = valueIntegerNode4->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
valueInteger5 = valueIntegerNode5->GetInput_UNIT_TEST<Data::NumberType>("Set");
|
||||
|
||||
if (valueInteger3 && valueInteger4 && valueInteger5)
|
||||
{
|
||||
EXPECT_EQ(2, *valueInteger3);
|
||||
EXPECT_EQ(2, *valueInteger4);
|
||||
EXPECT_EQ(2, *valueInteger5);
|
||||
EXPECT_NE(valueInteger3, valueInteger1);
|
||||
EXPECT_NE(valueInteger3, valueInteger2);
|
||||
EXPECT_NE(valueInteger3, valueInteger4);
|
||||
EXPECT_NE(valueInteger3, valueInteger5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
value3 = valueNode3->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value4 = valueNode4->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
value5 = valueNode5->GetInput_UNIT_TEST<TestBehaviorContextObject>("Set");
|
||||
|
||||
if (value3 && value4 && value5)
|
||||
{
|
||||
EXPECT_EQ(2, value3->GetValue());
|
||||
EXPECT_NE(value3, value1);
|
||||
EXPECT_EQ(value3, value2);
|
||||
EXPECT_EQ(value3, value4);
|
||||
EXPECT_EQ(value3, value5);
|
||||
}
|
||||
else
|
||||
{
|
||||
ADD_FAILURE() << "Values were nullptr";
|
||||
}
|
||||
|
||||
delete graph->GetEntity();
|
||||
|
||||
m_serializeContext->EnableRemoveReflection();
|
||||
|
||||
Reference in New Issue
Block a user