martinzink commented on code in PR #1424:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1424#discussion_r1044565861
##########
extensions/script/tests/TestExecuteScriptProcessorWithPythonScript.cpp:
##########
@@ -295,124 +291,119 @@ TEST_CASE("Python: Test Update Attribute",
"[executescriptPythonUpdateAttribute]
session.transfer(flow_file, REL_SUCCESS)
)");
- auto getFileDir = testController.createTempDirectory();
- plan->setProperty(getFile, minifi::processors::GetFile::Directory.getName(),
getFileDir);
+ auto get_file_dir = test_controller.createTempDirectory();
+ plan->setProperty(getFile, minifi::processors::GetFile::Directory.getName(),
get_file_dir.string());
- utils::putFileToDir(getFileDir, "tstFile.ext", "tempFile");
+ utils::putFileToDir(get_file_dir, "tstFile.ext", "tempFile");
- testController.runSession(plan, false);
- testController.runSession(plan, false);
- testController.runSession(plan, false);
+ test_controller.runSession(plan, false);
+ test_controller.runSession(plan, false);
+ test_controller.runSession(plan, false);
REQUIRE(LogTestController::getInstance().contains("key:test_attr value:2"));
- logTestController.reset();
+ log_test_controller.reset();
}
TEST_CASE("Python: Test Get Context Property",
"[executescriptPythonGetContextProperty]") {
- TestController testController;
+ TestController test_controller;
- LogTestController &logTestController = LogTestController::getInstance();
- logTestController.setDebug<TestPlan>();
- logTestController.setDebug<minifi::processors::LogAttribute>();
- logTestController.setDebug<minifi::processors::ExecuteScript>();
+ LogTestController& log_test_controller = LogTestController::getInstance();
+ log_test_controller.setDebug<TestPlan>();
+ log_test_controller.setDebug<minifi::processors::LogAttribute>();
+ log_test_controller.setDebug<minifi::processors::ExecuteScript>();
- auto plan = testController.createPlan();
+ auto plan = test_controller.createPlan();
- auto getFile = plan->addProcessor("GetFile", "getFile");
- auto executeScript = plan->addProcessor("ExecuteScript",
+ auto get_file = plan->addProcessor("GetFile", "getFile");
+ auto execute_script = plan->addProcessor("ExecuteScript",
"executeScript",
core::Relationship("success",
"description"),
true);
- auto logAttribute = plan->addProcessor("LogAttribute", "logAttribute",
+ auto log_attribute = plan->addProcessor("LogAttribute", "logAttribute",
core::Relationship("success",
"description"),
true);
- plan->setProperty(executeScript,
minifi::processors::ExecuteScript::ScriptBody.getName(), R"(
+ plan->setProperty(execute_script,
minifi::processors::ExecuteScript::ScriptBody.getName(), R"(
def onTrigger(context, session):
script_engine = context.getProperty('Script Engine')
log.info('got Script Engine property: %s' % script_engine)
)");
- auto getFileDir = testController.createTempDirectory();
- plan->setProperty(getFile, minifi::processors::GetFile::Directory.getName(),
getFileDir);
+ auto get_file_dir = test_controller.createTempDirectory();
+ plan->setProperty(get_file,
minifi::processors::GetFile::Directory.getName(), get_file_dir.string());
- utils::putFileToDir(getFileDir, "tstFile.ext", "tempFile");
+ utils::putFileToDir(get_file_dir, "tstFile.ext", "tempFile");
- testController.runSession(plan, false);
- testController.runSession(plan, false);
- testController.runSession(plan, false);
+ test_controller.runSession(plan, false);
+ test_controller.runSession(plan, false);
+ test_controller.runSession(plan, false);
REQUIRE(LogTestController::getInstance().contains("[info] got Script Engine
property: python"));
- logTestController.reset();
+ log_test_controller.reset();
}
TEST_CASE("Python: Test Module Directory property",
"[executescriptPythonModuleDirectoryProperty]") {
- using org::apache::nifi::minifi::utils::file::concat_path;
using org::apache::nifi::minifi::utils::file::get_executable_dir;
- TestController testController;
+ TestController test_controller;
- LogTestController &logTestController = LogTestController::getInstance();
- logTestController.setDebug<TestPlan>();
- logTestController.setDebug<minifi::processors::ExecuteScript>();
+ LogTestController& log_test_controller = LogTestController::getInstance();
+ log_test_controller.setDebug<TestPlan>();
+ log_test_controller.setDebug<minifi::processors::ExecuteScript>();
- std::string path;
- std::string filename;
- minifi::utils::file::getFileNameAndPath(__FILE__, path, filename);
- const std::string SCRIPT_FILES_DIRECTORY =
minifi::utils::file::getFullPath(concat_path(path, "test_python_scripts"));
+ const auto script_files_directory =
std::filesystem::path(__FILE__).parent_path() / "test_python_scripts";
- auto getScriptFullPath = [&SCRIPT_FILES_DIRECTORY](const std::string&
script_file_name) {
- return concat_path(SCRIPT_FILES_DIRECTORY, script_file_name);
- };
+ auto plan = test_controller.createPlan();
- auto plan = testController.createPlan();
-
- auto getFile = plan->addProcessor("GetFile", "getFile");
- auto executeScript = plan->addProcessor("ExecuteScript",
+ auto get_file = plan->addProcessor("GetFile", "getFile");
+ auto execute_script = plan->addProcessor("ExecuteScript",
"executeScript",
core::Relationship("success",
"description"),
true);
- plan->setProperty(executeScript,
minifi::processors::ExecuteScript::ScriptFile.getName(),
getScriptFullPath("foo_bar_processor.py"));
- plan->setProperty(executeScript,
minifi::processors::ExecuteScript::ModuleDirectory.getName(),
getScriptFullPath(concat_path("foo_modules", "foo.py")) + "," +
getScriptFullPath("bar_modules"));
+ plan->setProperty(execute_script,
minifi::processors::ExecuteScript::ScriptEngine.getName(), "python");
+ plan->setProperty(execute_script,
minifi::processors::ExecuteScript::ScriptFile.getName(),
(script_files_directory / "foo_bar_processor.py").string());
+ plan->setProperty(execute_script,
+
minifi::processors::ExecuteScript::ModuleDirectory.getName(),
+ (script_files_directory / "foo_modules/foo.py").string() +
"," + (script_files_directory / "bar_modules").string());
Review Comment:
:+1: fixed it in
https://github.com/apache/nifi-minifi-cpp/pull/1424/commits/6c775d116236c92105c7be38bb284f309c27887c#diff-d06feffd789b05c873c0c8ae46df2f5fa80f3652dcc5e89fc3e4d69c9b9c16e1R370
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
