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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
+2 -3
View File
@@ -78,11 +78,10 @@ namespace ScriptCanvasTests
descriptor.m_modules.push_back(dynamicModuleDescriptor);
dynamicModuleDescriptor.m_dynamicLibraryPath = "ScriptCanvas.Editor";
descriptor.m_modules.push_back(dynamicModuleDescriptor);
dynamicModuleDescriptor.m_dynamicLibraryPath = "Gem.ExpressionEvaluation.4c6f9df57ca2468f93c8d860ee6a1167.v0.1.0";
dynamicModuleDescriptor.m_dynamicLibraryPath = "ExpressionEvaluation";
descriptor.m_modules.push_back(dynamicModuleDescriptor);
dynamicModuleDescriptor.m_dynamicLibraryPath = "Gem.ScriptEvents.32d8ba21703e4bbbb08487366e48dd69.v0.1.0";
dynamicModuleDescriptor.m_dynamicLibraryPath = "ScriptEvents";
descriptor.m_modules.push_back(dynamicModuleDescriptor);
s_application->Start(descriptor, appStartup);
// Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
// shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.cpp
+2 -13
View File
@@ -46,16 +46,10 @@ namespace ScriptCanvasTests
#undef SC_CORE_UNIT_TEST_DIR
#undef SC_CORE_UNIT_TEST_NAME
void ExpectParse(AZStd::string_view graphPath)
{
ExpectParse(graphPath, ScriptCanvasTestUtilitiesCPP::k_defaultExtension);
}
void ExpectParse(AZStd::string_view graphPath, AZStd::string_view extension)
{
AZ_TEST_START_TRACE_SUPPRESSION;
const AZStd::string filePath = AZStd::string::format("%s/%s.%s", ScriptCanvasTestUtilitiesCPP::k_unitTestDirPathRelative, graphPath.data(), extension.data());
const AZStd::string filePath = AZStd::string::format("%s/%s.%s", ScriptCanvasTestUtilitiesCPP::k_unitTestDirPathRelative, graphPath.data(), ScriptCanvasTestUtilitiesCPP::k_defaultExtension);
ScriptCanvasEditor::RunGraphSpec runGraphSpec;
runGraphSpec.graphPath = filePath;
@@ -68,14 +62,9 @@ namespace ScriptCanvasTests
}
void ExpectParseError(AZStd::string_view graphPath)
{
ExpectParseError(graphPath, ScriptCanvasTestUtilitiesCPP::k_defaultExtension);
}
void ExpectParseError(AZStd::string_view graphPath, AZStd::string_view extension)
{
AZ_TEST_START_TRACE_SUPPRESSION;
const AZStd::string filePath = AZStd::string::format("%s/%s.%s", ScriptCanvasTestUtilitiesCPP::k_unitTestDirPathRelative, graphPath.data(), extension.data());
const AZStd::string filePath = AZStd::string::format("%s/%s.%s", ScriptCanvasTestUtilitiesCPP::k_unitTestDirPathRelative, graphPath.data(), ScriptCanvasTestUtilitiesCPP::k_defaultExtension);
ScriptCanvasEditor::RunGraphSpec runGraphSpec;
runGraphSpec.runSpec.processOnly = true;
runGraphSpec.graphPath = filePath;
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestUtilities.h
-4
View File
@@ -29,12 +29,8 @@ namespace ScriptCanvasTests
void ExpectParse(AZStd::string_view graphPath);
void ExpectParse(AZStd::string_view graphPath, AZStd::string_view extension);
void ExpectParseError(AZStd::string_view graphPath);
void ExpectParseError(AZStd::string_view graphPath, AZStd::string_view extension);
AZStd::string_view GetGraphNameFromPath(AZStd::string_view graphPath);
void RunUnitTestGraph(AZStd::string_view graphPath);
Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
Gems/ScriptCanvasTesting/Code/Source/Framework/UnitTestingReporter.h
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*