Merge branch 'development' into carlitosan_fix_for

This commit is contained in:
carlitosan
2021-07-28 19:10:59 -07:00
committed by GitHub
20 changed files with 94 additions and 58 deletions
@@ -113,7 +113,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
)
ly_add_googletest(
NAME Gem::ScriptCanvasTesting.Editor.Tests
TEST_SUITE smoke
)
endif()
@@ -136,11 +136,6 @@ namespace ScriptCanvasTests
// don't hang on to dangling assets
AZ::Data::AssetManager::Instance().DispatchEvents();
if (AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance())
{
fileIO->DestroyPath(k_tempCoreAssetDir);
}
if (s_application)
{
s_application->Stop();
@@ -34,14 +34,6 @@ namespace ScriptCanvasTests
{
using namespace ScriptCanvas;
#define SC_CORE_UNIT_TEST_DIR "@engroot@/LY_SC_UnitTest_ScriptCanvas_CoreCPP_Temporary"
#define SC_CORE_UNIT_TEST_NAME "serializationTest.scriptcanvas_compiled"
const char* k_tempCoreAssetDir = SC_CORE_UNIT_TEST_DIR;
const char* k_tempCoreAssetName = SC_CORE_UNIT_TEST_NAME;
const char* k_tempCoreAssetPath = SC_CORE_UNIT_TEST_DIR "/" SC_CORE_UNIT_TEST_NAME;
#undef SC_CORE_UNIT_TEST_DIR
#undef SC_CORE_UNIT_TEST_NAME
void ExpectParse(AZStd::string_view graphPath)
{
AZ_TEST_START_TRACE_SUPPRESSION;
@@ -84,11 +84,6 @@ public:
}
};
TEST_F(ScriptCanvasTestFixture, ForEachMultipleOutSyntaxOnEach)
{
RunUnitTestGraph("LY_SC_UnitTest_ForEachMultipleOutSyntaxOnEach");
}
TEST_F(ScriptCanvasTestFixture, EntityIdInputForOnGraphStart)
{
RunUnitTestGraph("LY_SC_UnitTest_EntityIdInputForOnGraphStart");