diff --git a/container/src/root/test/unit/utility.hh b/container/src/root/test/unit/utility.hh index 0981cea..e74db59 100644 --- a/container/src/root/test/unit/utility.hh +++ b/container/src/root/test/unit/utility.hh @@ -933,7 +933,7 @@ struct PluginCommands : public ::testing::Test, const std::string kValidFile{"repo/example/example.cc"}; const std::string kInvalidFile{"repo/should-not/exist.cc"}; - const std::string kValidArg{"dfi::plugin::example::Example e;"}; + const std::string kValidArg{"dfi::plugin::example::MyExamples my;"}; //! \note File is processed but plugin-implementation argument will intentionally throw const std::string kInvalidArg{ @@ -957,16 +957,16 @@ TEST_F(PluginCommands, LoadUnloadSingleSimpleNoArg) TEST_F(PluginCommands, LoadUnloadSingleSimpleWithArg) { - ASSERT_NO_THROW(plugin::load(kValidFile, kValidArg + " e.example1();")); + ASSERT_NO_THROW(plugin::load(kValidFile, kValidArg + " my.example1();")); ASSERT_NO_THROW(plugin::unload(kValidFile)); ASSERT_THROW( plugin::load(kValidFile, kInvalidArg), common::type::InvalidArgument); ASSERT_NO_THROW(common::line(kValidArg)); // File is still loaded - ASSERT_NO_THROW(plugin::unload(kValidFile, kValidArg + " e.example1();")); + ASSERT_NO_THROW(plugin::unload(kValidFile, kValidArg + " my.example1();")); ASSERT_THROW( - common::line(kValidArg + " e.example1();"), common::type::RuntimeError); + common::line(kValidArg + " my.example1();"), common::type::RuntimeError); } TEST_F(PluginCommands, LoadUnloadSinglePluggable) @@ -975,13 +975,14 @@ TEST_F(PluginCommands, LoadUnloadSinglePluggable) plugin::load( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " e.example1();", kValidArg + " /* unload code */"})); + kValidArg + " my.example1();", + kValidArg + " /* unload code */"})); ASSERT_NO_THROW( plugin::unload( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " /* load code */", kValidArg + " e.example2();"})); + kValidArg + " /* load code */", kValidArg + " my.example2();"})); ASSERT_THROW( plugin::load( @@ -995,12 +996,12 @@ TEST_F(PluginCommands, LoadUnloadSinglePluggable) plugin::unload( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " /* load code */", kValidArg + " e.example2();"})); + kValidArg + " /* load code */", kValidArg + " my.example2();"})); ASSERT_THROW( - common::line(kValidArg + " e.example1();"), common::type::RuntimeError); + common::line(kValidArg + " my.example1();"), common::type::RuntimeError); ASSERT_THROW( - common::line(kValidArg + " e.example2();"), common::type::RuntimeError); + common::line(kValidArg + " my.example2();"), common::type::RuntimeError); } // TODO(afiore): multiple load @@ -1026,7 +1027,7 @@ TEST_F(PluginCommands, ReloadSingleSimpleNoArg) TEST_F(PluginCommands, ReloadSingleSimpleWithArg) { - ASSERT_NO_THROW(plugin::load(kValidFile, kValidArg + " e.example1();")); + ASSERT_NO_THROW(plugin::load(kValidFile, kValidArg + " my.example1();")); ASSERT_NO_THROW( plugin::reload( @@ -1048,9 +1049,9 @@ TEST_F(PluginCommands, ReloadSingleSimpleWithArg) kValidFile, {kValidArg + " /* load code */", kValidArg + " /* unload code */"})); - ASSERT_NO_THROW(plugin::unload(kValidFile, kValidArg + " e.example1();")); + ASSERT_NO_THROW(plugin::unload(kValidFile, kValidArg + " my.example1();")); ASSERT_THROW( - common::line(kValidArg + " e.example1();"), common::type::RuntimeError); + common::line(kValidArg + " my.example1();"), common::type::RuntimeError); } TEST_F(PluginCommands, ReloadSinglePluggable) @@ -1059,13 +1060,14 @@ TEST_F(PluginCommands, ReloadSinglePluggable) plugin::load( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " e.example1();", kValidArg + " /* unload code */"})); + kValidArg + " my.example1();", + kValidArg + " /* unload code */"})); ASSERT_NO_THROW( plugin::reload( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " e.example1();", kValidArg + " e.example2();"})); + kValidArg + " my.example1();", kValidArg + " my.example2();"})); ASSERT_THROW( plugin::load( @@ -1079,7 +1081,7 @@ TEST_F(PluginCommands, ReloadSinglePluggable) plugin::reload( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " e.example1();", kValidArg + " e.example2();"})); + kValidArg + " my.example1();", kValidArg + " my.example2();"})); ASSERT_NO_THROW(common::line(kValidArg)); @@ -1087,15 +1089,15 @@ TEST_F(PluginCommands, ReloadSinglePluggable) plugin::unload( plugin::common::PluginPath{kValidFile}, plugin::common::PluginArgs{ - kValidArg + " /* load code */", kValidArg + " e.example3();"})); + kValidArg + " /* load code */", kValidArg + " my.example3();"})); ASSERT_THROW(common::line(kValidArg), common::type::RuntimeError); ASSERT_THROW( - common::line(kValidArg + " e.example1();"), common::type::RuntimeError); + common::line(kValidArg + " my.example1();"), common::type::RuntimeError); ASSERT_THROW( - common::line(kValidArg + " e.example2();"), common::type::RuntimeError); + common::line(kValidArg + " my.example2();"), common::type::RuntimeError); ASSERT_THROW( - common::line(kValidArg + " e.example3();"), common::type::RuntimeError); + common::line(kValidArg + " my.example3();"), common::type::RuntimeError); } TEST_F(PluginCommands, LoaderNPI) @@ -1107,7 +1109,7 @@ TEST_F(PluginCommands, LoaderNPI) ::dfi::common::type::Pluggable type{ t_path{kValidFile}, t_space{"example" /* inner */, "example_cc" /* class */}, - t_args{kValidArg + " e.example1();", kValidArg + " e.example2();"}}; + t_args{kValidArg + " my.example1();", kValidArg + " my.example2();"}}; plugin::common::Plugin plugin{type}; ASSERT_NO_THROW(plugin.load().reload().unload());