f648cb1fd8
* Update the FileIOAlias naming to make the cache, project root and engine root paths more clear The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been collapsed to `@projectproductassets@` The alias of `@devroot@` and `@engroot@` has been collapsed to `@engroot@` The alias of `@devassets@` and `@projectroot@` has been collapsed to `@projectroot@` Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated use of devassets and devroot properties in python Those properties now use projectroot and engroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed hardcoded size of 9 for the product asset alias. The ResolvePath function now just appends the @projectproductassets@ alias with the input path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix for typos in Hydra python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset cache write errors for Test file creation. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Added a deprecated alias map to the FileIO System When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated python test scripts to use the projectroot binding Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to devroot and devgame within the codebase The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated <engroot>/AutomatedTesting references to projectroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Correct casing in emfxworkspace file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed newly added AppendPathParts function Removed the Path constructors which accepts a PathIterable instance The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed unused parameter warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Undid change to the LexicallyProximate function to set the path result to the base path. It needs to return the *this path if the pathResult is empty Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms). Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Changed the AWSMetricsGemMock to use a temporary for writing test assets Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/" IsAbsolute was not the corect check as the path of "D:" is a relative path. To be absolute according to the Windows the path must have a root directory. i.e "D:/" or "D:\" Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the ScriptCanvas Upgrade Tool to output backed up files to the Project User Path instead of the engine root Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed whitespacing issues in Application.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Modified testSeedFolder variable in the SeedBuilderTests to use the @engroot@ alias instead of @projectproductassets@/.. alias when referring to the LmbrCentral Gem source path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to the Project Asset Cache in the PythonTests. Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed the FileIO Deprecated Alias test on Windows Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removing @projectsourceassets@ alias, as it is only used once. Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath form the SettingsRegistry. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced @projectproductassets@ alias with @products@ Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Rollback changes to the PhysX EditorSystemComponent.cpp The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
423 lines
13 KiB
C++
423 lines
13 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
#include <Source/PythonSystemComponent.h>
|
|
|
|
#include <Source/PythonCommon.h>
|
|
#include <Source/PythonTypeCasters.h>
|
|
#include "PythonTraceMessageSink.h"
|
|
#include "PythonTestingUtility.h"
|
|
#include <pybind11/pybind11.h>
|
|
#include <pybind11/embed.h>
|
|
|
|
#include <EditorPythonBindings/EditorPythonBindingsBus.h>
|
|
#include <AzFramework/StringFunc/StringFunc.h>
|
|
|
|
// an example converter for an "AZ type"
|
|
namespace TestTypes
|
|
{
|
|
void RegisterAzEntityId(pybind11::module m)
|
|
{
|
|
auto classEntityId = pybind11::class_<AZ::EntityId>(m, AZ::AzTypeInfo<AZ::EntityId>::Name());
|
|
classEntityId.def(pybind11::init<AZ::u64>());
|
|
classEntityId.def("isValid", &AZ::EntityId::IsValid);
|
|
classEntityId.def("setInvalid", &AZ::EntityId::SetInvalid);
|
|
classEntityId.def_property_readonly("id", [](const AZ::EntityId& e) { return static_cast<AZ::u64>(e); });
|
|
classEntityId.def("__repr__", &AZ::EntityId::ToString);
|
|
}
|
|
}
|
|
|
|
// this is called the first time a Python script "import azlmbrtest"
|
|
PYBIND11_EMBEDDED_MODULE(azlmbrtest, m)
|
|
{
|
|
EditorPythonBindings::EditorPythonBindingsNotificationBus::Broadcast(&EditorPythonBindings::EditorPythonBindingsNotificationBus::Events::OnImportModule, m.ptr());
|
|
TestTypes::RegisterAzEntityId(m);
|
|
}
|
|
|
|
namespace UnitTest
|
|
{
|
|
struct MyPythonBindings final
|
|
: public EditorPythonBindings::EditorPythonBindingsNotificationBus::Handler
|
|
{
|
|
int m_onImportModuleCount = 0;
|
|
|
|
MyPythonBindings()
|
|
{
|
|
EditorPythonBindings::EditorPythonBindingsNotificationBus::Handler::BusConnect();
|
|
}
|
|
|
|
~MyPythonBindings()
|
|
{
|
|
EditorPythonBindings::EditorPythonBindingsNotificationBus::Handler::BusDisconnect();
|
|
}
|
|
|
|
static long DoAdd(int lhs, int rhs)
|
|
{
|
|
return lhs + rhs;
|
|
}
|
|
|
|
static void AZPrintf([[maybe_unused]] const AZStd::string& message)
|
|
{
|
|
AZ_TracePrintf("python", "%s", message.c_str());
|
|
}
|
|
|
|
void ImportTestSubModule(pybind11::module module)
|
|
{
|
|
pybind11::module subModule = module.def_submodule("tester", "A submodule for 'test'");
|
|
subModule.def("add", &DoAdd);
|
|
subModule.def("print", &AZPrintf);
|
|
}
|
|
|
|
void OnImportModule(PyObject* module) override
|
|
{
|
|
pybind11::module m = pybind11::cast<pybind11::module>(module);
|
|
std::string szName = pybind11::cast<std::string>(m.attr("__name__"));
|
|
if (szName == "azlmbrtest")
|
|
{
|
|
m_onImportModuleCount++;
|
|
ImportTestSubModule(m);
|
|
}
|
|
}
|
|
};
|
|
|
|
class PythonBindingLibTest
|
|
: public PythonTestingFixture
|
|
{
|
|
protected:
|
|
|
|
void SetUp() override
|
|
{
|
|
PythonTestingFixture::SetUp();
|
|
RegisterComponentDescriptors();
|
|
}
|
|
|
|
void TearDown() override
|
|
{
|
|
PythonTestingFixture::TearDown();
|
|
}
|
|
};
|
|
|
|
TEST_F(PythonBindingLibTest, ImportBaseModule)
|
|
{
|
|
AZ::Entity entity;
|
|
entity.CreateComponent<EditorPythonBindings::PythonSystemComponent>();
|
|
entity.Init();
|
|
entity.Activate();
|
|
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
{
|
|
MyPythonBindings pythonBindings;
|
|
pybind11::module::import("azlmbrtest");
|
|
EXPECT_EQ(pythonBindings.m_onImportModuleCount, 1);
|
|
}
|
|
|
|
entity.Deactivate();
|
|
}
|
|
|
|
TEST_F(PythonBindingLibTest, ImportBaseModuleTwice)
|
|
{
|
|
const char* script =
|
|
R"(
|
|
import azlmbrtest
|
|
import azlmbrtest
|
|
)";
|
|
AZ::Entity entity;
|
|
entity.CreateComponent<EditorPythonBindings::PythonSystemComponent>();
|
|
entity.Init();
|
|
entity.Activate();
|
|
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
// Python keeps track of the module import count so that multiple attempts should result into a single import count
|
|
{
|
|
MyPythonBindings pythonBindings;
|
|
EXPECT_EQ(PyRun_SimpleString(script), 0);
|
|
EXPECT_EQ(pythonBindings.m_onImportModuleCount, 1);
|
|
}
|
|
|
|
entity.Deactivate();
|
|
}
|
|
|
|
TEST_F(PythonBindingLibTest, ExecuteSimpleBinding)
|
|
{
|
|
enum class LogTypes
|
|
{
|
|
Skip = 0,
|
|
TesterAdd,
|
|
TesterPrinted
|
|
};
|
|
|
|
PythonTraceMessageSink testSink;
|
|
testSink.m_evaluateMessage = [](const char* window, const char* message) -> int
|
|
{
|
|
AZStd::string_view w(window);
|
|
if (w == "python")
|
|
{
|
|
AZStd::string_view m(message);
|
|
if (m == "tester add equals 42")
|
|
{
|
|
return (int)LogTypes::TesterAdd;
|
|
}
|
|
if (m == "tester says yo")
|
|
{
|
|
return (int)LogTypes::TesterPrinted;
|
|
}
|
|
}
|
|
return (int)LogTypes::Skip;
|
|
};
|
|
|
|
const char* script =
|
|
R"(
|
|
import azlmbrtest
|
|
value = azlmbrtest.tester.add(40, 2)
|
|
print ('tester add equals ' + str(value))
|
|
value = azlmbrtest.tester.print('tester says yo')
|
|
)";
|
|
|
|
AZ::Entity entity;
|
|
entity.CreateComponent<EditorPythonBindings::PythonSystemComponent>();
|
|
entity.Init();
|
|
entity.Activate();
|
|
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
{
|
|
MyPythonBindings pythonBindings;
|
|
EXPECT_EQ(PyRun_SimpleString(script), 0);
|
|
EXPECT_EQ(pythonBindings.m_onImportModuleCount, 1);
|
|
EXPECT_EQ(testSink.m_evaluationMap[(int)LogTypes::TesterAdd], 1);
|
|
EXPECT_EQ(testSink.m_evaluationMap[(int)LogTypes::TesterPrinted], 1);
|
|
}
|
|
|
|
entity.Deactivate();
|
|
}
|
|
|
|
TEST_F(PythonBindingLibTest, ConvertAZTypes)
|
|
{
|
|
enum class LogTypes
|
|
{
|
|
Skip = 0,
|
|
TypeConverted,
|
|
IdIsValid,
|
|
IdHasRepr,
|
|
IdNowInvalid
|
|
};
|
|
|
|
PythonTraceMessageSink testSink;
|
|
testSink.m_evaluateMessage = [](const char* window, const char* message) -> int
|
|
{
|
|
AZStd::string_view m(message);
|
|
AZStd::string_view w(window);
|
|
if (w == "python")
|
|
{
|
|
if (m == "entityId equals 10")
|
|
{
|
|
return (int)LogTypes::TypeConverted;
|
|
}
|
|
else if (m == "entityId is valid True")
|
|
{
|
|
return (int)LogTypes::IdIsValid;
|
|
}
|
|
else if (m == "entityId is repr [10]")
|
|
{
|
|
return (int)LogTypes::IdHasRepr;
|
|
}
|
|
else if (m == "entityId invalid is 4294967295")
|
|
{
|
|
return (int)LogTypes::IdNowInvalid;
|
|
}
|
|
}
|
|
return (int)LogTypes::Skip;
|
|
};
|
|
|
|
const char* script =
|
|
R"(
|
|
import azlmbrtest
|
|
entityId = azlmbrtest.EntityId(10)
|
|
print ('entityId equals ' + str(entityId.id))
|
|
print ('entityId is valid ' + str(entityId.isValid()))
|
|
print ('entityId is repr ' + str(entityId))
|
|
entityId.setInvalid()
|
|
print ('entityId invalid is ' + str(entityId.id))
|
|
)";
|
|
|
|
AZ::Entity entity;
|
|
entity.CreateComponent<EditorPythonBindings::PythonSystemComponent>();
|
|
entity.Init();
|
|
entity.Activate();
|
|
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
EXPECT_EQ(PyRun_SimpleString(script), 0);
|
|
EXPECT_EQ(testSink.m_evaluationMap[(int)LogTypes::TypeConverted], 1);
|
|
EXPECT_EQ(testSink.m_evaluationMap[(int)LogTypes::IdIsValid], 1);
|
|
EXPECT_EQ(testSink.m_evaluationMap[(int)LogTypes::IdHasRepr], 1);
|
|
EXPECT_EQ(testSink.m_evaluationMap[(int)LogTypes::IdNowInvalid], 1);
|
|
|
|
entity.Deactivate();
|
|
}
|
|
|
|
TEST_F(PythonBindingLibTest, ImportProjectModules)
|
|
{
|
|
enum class LogTypes
|
|
{
|
|
Skip = 0,
|
|
ImportModule,
|
|
TestCallHit,
|
|
TestTypeDoCall1
|
|
};
|
|
|
|
PythonTraceMessageSink testSink;
|
|
testSink.m_evaluateMessage = [](const char* window, const char* message) -> int
|
|
{
|
|
if (AzFramework::StringFunc::Equal(window, "python"))
|
|
{
|
|
if (AzFramework::StringFunc::Equal(message, "ImportModule"))
|
|
{
|
|
return static_cast<int>(LogTypes::ImportModule);
|
|
}
|
|
else if (AzFramework::StringFunc::Equal(message, "test_call_hit"))
|
|
{
|
|
return static_cast<int>(LogTypes::TestCallHit);
|
|
}
|
|
else if (AzFramework::StringFunc::Equal(message, "TestType.do_call.1"))
|
|
{
|
|
return static_cast<int>(LogTypes::TestTypeDoCall1);
|
|
}
|
|
}
|
|
return static_cast<int>(LogTypes::Skip);
|
|
};
|
|
|
|
AZ::Entity e;
|
|
Activate(e);
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
try
|
|
{
|
|
pybind11::exec(R"(
|
|
import sys, os
|
|
import azlmbr.paths
|
|
sys.path.append(os.path.join(azlmbr.paths.engroot,'Gems','EditorPythonBindings','Code','Tests'))
|
|
from test_package import import_test as itest
|
|
print('ImportModule')
|
|
itest.test_call()
|
|
testInst = itest.TestType()
|
|
testInst.do_call(1)
|
|
)");
|
|
}
|
|
catch ([[maybe_unused]] const std::exception& exception)
|
|
{
|
|
AZ_Error("UnitTest", false, "Failed on with Python exception: %s", exception.what());
|
|
}
|
|
|
|
e.Deactivate();
|
|
|
|
EXPECT_EQ(1, testSink.m_evaluationMap[static_cast<int>(LogTypes::ImportModule)]);
|
|
EXPECT_EQ(1, testSink.m_evaluationMap[static_cast<int>(LogTypes::TestCallHit)]);
|
|
EXPECT_EQ(1, testSink.m_evaluationMap[static_cast<int>(LogTypes::TestTypeDoCall1)]);
|
|
}
|
|
|
|
TEST_F(PythonBindingLibTest, PyDocHelp_AzlmbrGlobals_Works)
|
|
{
|
|
enum class LogTypes
|
|
{
|
|
Skip = 0,
|
|
Worked
|
|
};
|
|
|
|
PythonTraceMessageSink testSink;
|
|
testSink.m_evaluateMessage = [](const char* window, const char* message) -> int
|
|
{
|
|
if (AzFramework::StringFunc::Equal(window, "python"))
|
|
{
|
|
if (AzFramework::StringFunc::StartsWith(message, "Worked"))
|
|
{
|
|
return aznumeric_cast<int>(LogTypes::Worked);
|
|
}
|
|
}
|
|
return aznumeric_cast<int>(LogTypes::Skip);
|
|
};
|
|
|
|
AZ::Entity e;
|
|
Activate(e);
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
try
|
|
{
|
|
pybind11::exec(R"(
|
|
import pydoc
|
|
import azlmbr.globals
|
|
pydoc.help(azlmbr.globals)
|
|
print('Worked')
|
|
)");
|
|
}
|
|
catch ([[maybe_unused]] const std::exception& exception)
|
|
{
|
|
AZ_Error("UnitTest", false, "Failed on with Python exception: %s", exception.what());
|
|
}
|
|
|
|
e.Deactivate();
|
|
|
|
EXPECT_EQ(1, testSink.m_evaluationMap[aznumeric_cast<int>(LogTypes::Worked)]);
|
|
}
|
|
|
|
TEST_F(PythonBindingLibTest, ImportAzLmbrTwice)
|
|
{
|
|
enum class LogTypes
|
|
{
|
|
Skip = 0,
|
|
ImportAzLmbrTwice,
|
|
SawEntityId
|
|
};
|
|
|
|
PythonTraceMessageSink testSink;
|
|
testSink.m_evaluateMessage = [](const char* window, const char* message) -> int
|
|
{
|
|
if (AzFramework::StringFunc::Equal(window, "python"))
|
|
{
|
|
if (AzFramework::StringFunc::Equal(message, "ImportAzLmbrTwice"))
|
|
{
|
|
return aznumeric_cast<int>(LogTypes::ImportAzLmbrTwice);
|
|
}
|
|
else if (AzFramework::StringFunc::StartsWith(message, "entity_id 101"))
|
|
{
|
|
return aznumeric_cast<int>(LogTypes::SawEntityId);
|
|
}
|
|
}
|
|
return aznumeric_cast<int>(LogTypes::Skip);
|
|
};
|
|
|
|
AZ::Entity e;
|
|
Activate(e);
|
|
SimulateEditorBecomingInitialized();
|
|
|
|
try
|
|
{
|
|
pybind11::exec(R"(
|
|
import sys, os
|
|
import azlmbr.paths
|
|
sys.path.append(os.path.join(azlmbr.paths.engroot,'Gems','EditorPythonBindings','Code','Tests'))
|
|
sys.path.append(os.path.join(azlmbr.paths.engroot,'Gems','EditorPythonBindings','Code','Tests','test_package'))
|
|
|
|
from test_package import import_many
|
|
import_many.test_many_entity_id()
|
|
print('ImportAzLmbrTwice')
|
|
)");
|
|
}
|
|
catch ([[maybe_unused]] const std::exception& exception)
|
|
{
|
|
AZ_Error("UnitTest", false, "Failed on with Python exception: %s", exception.what());
|
|
}
|
|
|
|
e.Deactivate();
|
|
|
|
EXPECT_EQ(1, testSink.m_evaluationMap[aznumeric_cast<int>(LogTypes::ImportAzLmbrTwice)]);
|
|
EXPECT_EQ(1, testSink.m_evaluationMap[aznumeric_cast<int>(LogTypes::SawEntityId)]);
|
|
}
|
|
}
|