diff --git a/CMakeLists.txt b/CMakeLists.txt index 14e65800..cf81a978 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ ign_find_package(DL #-------------------------------------- # Find ignition-tools -find_program(IGN_TOOLS_PROGRAM ign) +find_program(GZ_TOOLS_PROGRAM ign) #-------------------------------------- diff --git a/core/include/gz/plugin/detail/PluginPtr.hh b/core/include/gz/plugin/detail/PluginPtr.hh index edf984da..fa4e3af2 100644 --- a/core/include/gz/plugin/detail/PluginPtr.hh +++ b/core/include/gz/plugin/detail/PluginPtr.hh @@ -122,7 +122,7 @@ namespace gz } ////////////////////////////////////////////////// - #define DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR(op)\ + #define DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR(op)\ template \ bool TemplatePluginPtr::operator op (\ const TemplatePluginPtr &_other) const\ @@ -131,12 +131,12 @@ namespace gz _other.dataPtr->PrivateGetInstancePtr() );\ } - DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( == ) // NOLINT - DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( < ) // NOLINT - DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( > ) // NOLINT - DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( != ) // NOLINT - DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( <= ) // NOLINT - DETAIL_IGN_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( >= ) // NOLINT + DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( == ) // NOLINT + DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( < ) // NOLINT + DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( > ) // NOLINT + DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( != ) // NOLINT + DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( <= ) // NOLINT + DETAIL_GZ_PLUGIN_PLUGINPTR_IMPLEMENT_OPERATOR( >= ) // NOLINT ////////////////////////////////////////////////// template diff --git a/core/include/gz/plugin/detail/SpecializedPlugin.hh b/core/include/gz/plugin/detail/SpecializedPlugin.hh index 50f17f8b..d2d59747 100644 --- a/core/include/gz/plugin/detail/SpecializedPlugin.hh +++ b/core/include/gz/plugin/detail/SpecializedPlugin.hh @@ -221,7 +221,7 @@ namespace gz /// specializes for the requested Interface, if such a type is availabe /// within its inheritance structure. Otherwise, we cast to the generic /// Plugin type. - #define DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH( \ + #define DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH( \ ReturnType, Function, Suffix, CastTo, Args) \ public: \ template \ @@ -233,20 +233,20 @@ namespace gz } - DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH( + DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH( T*, QueryInterface, (), Specializer, ()) - DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH( + DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH( const T*, QueryInterface, () const, const Specializer, ()) - DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH( + DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH( std::shared_ptr, QueryInterfaceSharedPtr, (), Specializer, ()) - DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH( + DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH( std::shared_ptr, QueryInterfaceSharedPtr, () const, const Specializer, ()) - DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH( + DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH( bool, HasInterface, () const, const Specializer, ()) // Declare friendship @@ -260,7 +260,7 @@ namespace gz /// \brief ComposePlugin provides a way for a multi-specialized Plugin /// type to find its specializations within itself each time an /// interface-querying function is called. The macro - /// DETAIL_IGN_PLUGIN_COMPOSEPLUGIN_DISPATCH accomplishes this for each + /// DETAIL_GZ_PLUGIN_COMPOSEPLUGIN_DISPATCH accomplishes this for each /// of the different functions by doing a compile-time check on whether /// Base2 contains the specialization, and then picks Base1 if it does /// not. diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index de8ed2d1..816d5f1d 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -4,7 +4,7 @@ ign_get_libsources_and_unittests(sources tests) # Disable ign_TEST if ignition-tools is not found -if (MSVC OR NOT IGN_TOOLS_PROGRAM) +if (MSVC OR NOT GZ_TOOLS_PROGRAM) list(REMOVE_ITEM tests src/ign_TEST.cc) endif() @@ -25,25 +25,25 @@ ign_build_tests( foreach(test ${test_targets}) target_compile_definitions(${test} PRIVATE - "IGN_PLUGIN_LIB=\"$\"") + "GZ_PLUGIN_LIB=\"$\"") target_compile_definitions(${test} PRIVATE - "IGN_PLUGIN_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\"") + "GZ_PLUGIN_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\"") target_compile_definitions(${test} PRIVATE - "IGNDummyPlugins_LIB=\"$\"") + "GzDummyPlugins_LIB=\"$\"") target_compile_definitions(${test} PRIVATE - "IGN_PATH=\"${IGN_TOOLS_PROGRAM}\"") + "GZ_PATH=\"${GZ_TOOLS_PROGRAM}\"") target_compile_definitions(${test} PRIVATE - "IGN_VERSION_FULL=\"${PROJECT_VERSION_FULL}\"") + "GZ_VERSION_FULL=\"${PROJECT_VERSION_FULL}\"") endforeach() if(TARGET UNIT_ign_TEST) set(_env_vars) - list(APPEND _env_vars "IGN_CONFIG_PATH=${CMAKE_BINARY_DIR}/test/conf/$") + list(APPEND _env_vars "GZ_CONFIG_PATH=${CMAKE_BINARY_DIR}/test/conf/$") set_tests_properties(UNIT_ign_TEST PROPERTIES ENVIRONMENT "${_env_vars}") diff --git a/loader/src/Loader_TEST.cc b/loader/src/Loader_TEST.cc index edb6c1fa..5b081dba 100644 --- a/loader/src/Loader_TEST.cc +++ b/loader/src/Loader_TEST.cc @@ -43,7 +43,7 @@ TEST(Loader, LoadNonexistantLibrary) TEST(Loader, LoadNonLibrary) { gz::plugin::Loader loader; - EXPECT_TRUE(loader.LoadLib(std::string(IGN_PLUGIN_SOURCE_DIR) + EXPECT_TRUE(loader.LoadLib(std::string(GZ_PLUGIN_SOURCE_DIR) + "/core/src/Plugin.cc").empty()); } @@ -51,7 +51,7 @@ TEST(Loader, LoadNonLibrary) TEST(Loader, LoadNonPluginLibrary) { gz::plugin::Loader loader; - EXPECT_TRUE(loader.LoadLib(IGN_PLUGIN_LIB).empty()); + EXPECT_TRUE(loader.LoadLib(GZ_PLUGIN_LIB).empty()); } ///////////////////////////////////////////////// @@ -84,11 +84,11 @@ TEST(Loader, DoubleLoad) // when a user asks for a library to be loaded twice. gz::plugin::Loader loader; - loader.LoadLib(IGNDummyPlugins_LIB); + loader.LoadLib(GzDummyPlugins_LIB); const std::size_t interfaceCount = loader.InterfacesImplemented().size(); EXPECT_LT(0u, interfaceCount); - loader.LoadLib(IGNDummyPlugins_LIB); + loader.LoadLib(GzDummyPlugins_LIB); EXPECT_EQ(interfaceCount, loader.InterfacesImplemented().size()); } @@ -101,15 +101,15 @@ TEST(Loader, ForgetUnloadedLibrary) // 1. A library is not loaded, and // 2. We tell a loader to forget the library gz::plugin::Loader loader; - EXPECT_FALSE(loader.ForgetLibrary(IGNDummyPlugins_LIB)); + EXPECT_FALSE(loader.ForgetLibrary(GzDummyPlugins_LIB)); // This next test triggers lines for the case that: // 1. A library is loaded by some loader in the application, and // 2. We tell a *different* loader to forget the library gz::plugin::Loader hasTheLibrary; - EXPECT_LT(0u, hasTheLibrary.LoadLib(IGNDummyPlugins_LIB).size()); + EXPECT_LT(0u, hasTheLibrary.LoadLib(GzDummyPlugins_LIB).size()); - EXPECT_FALSE(loader.ForgetLibrary(IGNDummyPlugins_LIB)); + EXPECT_FALSE(loader.ForgetLibrary(GzDummyPlugins_LIB)); } ///////////////////////////////////////////////// diff --git a/loader/src/ign_TEST.cc b/loader/src/ign_TEST.cc index da768073..f37ca1b5 100644 --- a/loader/src/ign_TEST.cc +++ b/loader/src/ign_TEST.cc @@ -29,7 +29,7 @@ using namespace gz; static const std::string g_ignVersion("--force-version " + // NOLINT(*) - std::string(IGN_VERSION_FULL)); + std::string(GZ_VERSION_FULL)); ///////////////////////////////////////////////// std::string custom_exec_str(std::string _cmd) @@ -58,7 +58,7 @@ std::string custom_exec_str(std::string _cmd) TEST(ignTest, IgnPluginHelp) { // Path to ign executable - std::string ign = std::string(IGN_PATH); + std::string ign = std::string(GZ_PATH); std::string output = custom_exec_str(ign + " plugin --help"); EXPECT_NE(std::string::npos, output.find("-i,--info Get info about a plugin.")) @@ -81,7 +81,7 @@ TEST(ignTest, IgnPluginHelp) TEST(ignTest, PluginInfoNonexistentLibrary) { // Path to ign executable - std::string ign = std::string(IGN_PATH); + std::string ign = std::string(GZ_PATH); std::string output = custom_exec_str(ign + " plugin --info --plugin " + "/path/to/libDoesNotExist.so"); @@ -99,10 +99,10 @@ TEST(ignTest, PluginInfoNonexistentLibrary) TEST(ignTest, PluginInfoNonLibrary) { // Path to ign executable - std::string ign = std::string(IGN_PATH); + std::string ign = std::string(GZ_PATH); std::string output = custom_exec_str(ign + " plugin --info --plugin " + - std::string(IGN_PLUGIN_SOURCE_DIR) + "/core/src/Plugin.cc"); + std::string(GZ_PLUGIN_SOURCE_DIR) + "/core/src/Plugin.cc"); EXPECT_NE(std::string::npos, output.find("Error while loading the library")) << output; @@ -117,10 +117,10 @@ TEST(ignTest, PluginInfoNonLibrary) TEST(ignTest, PluginInfoNonPluginLibrary) { // Path to ign executable - std::string ign = std::string(IGN_PATH); + std::string ign = std::string(GZ_PATH); std::string output = custom_exec_str(ign + " plugin --info --plugin " + - IGN_PLUGIN_LIB); + GZ_PLUGIN_LIB); EXPECT_NE(std::string::npos, output.find("does not export any plugins. The " "symbol [IgnitionPluginHook] is missing, or it is not externally visible.")) @@ -136,10 +136,10 @@ TEST(ignTest, PluginInfoNonPluginLibrary) TEST(ignTest, PluginInfoDummyPlugins) { // Path to ign executable - std::string ign = std::string(IGN_PATH); + std::string ign = std::string(GZ_PATH); std::string output = custom_exec_str(ign + " plugin --info --plugin " + - IGNDummyPlugins_LIB); + GzDummyPlugins_LIB); EXPECT_NE(std::string::npos, output.find("Found 3 plugins in library file")) << output; @@ -175,10 +175,10 @@ TEST(ignTest, PluginInfoDummyPlugins) TEST(ignTest, PluginInfoVerboseDummyPlugins) { // Path to ign executable - std::string ign = std::string(IGN_PATH); + std::string ign = std::string(GZ_PATH); std::string output = custom_exec_str(ign + " plugin --info --plugin " + - IGNDummyPlugins_LIB + " --verbose"); + GzDummyPlugins_LIB + " --verbose"); EXPECT_NE(std::string::npos, output.find("Known Interfaces: 7")) << output; diff --git a/register/include/gz/plugin/Register.hh b/register/include/gz/plugin/Register.hh index 5b5a6842..568fca5d 100644 --- a/register/include/gz/plugin/Register.hh +++ b/register/include/gz/plugin/Register.hh @@ -51,7 +51,7 @@ /// the gz/plugin/RegisterMore.hh header in all of the rest of the /// translation units. #define IGNITION_ADD_PLUGIN(PluginClass, ...) \ - DETAIL_IGNITION_ADD_PLUGIN(PluginClass, __VA_ARGS__) + DETAIL_GZ_ADD_PLUGIN(PluginClass, __VA_ARGS__) /// \brief Add an alias for one of your plugins. /// @@ -72,7 +72,7 @@ /// of another plugin, then the Loader will always prefer to instantiate the /// plugin whose symbol name matches that string. #define IGNITION_ADD_PLUGIN_ALIAS(PluginClass, ...) \ - DETAIL_IGNITION_ADD_PLUGIN_ALIAS(PluginClass, __VA_ARGS__) + DETAIL_GZ_ADD_PLUGIN_ALIAS(PluginClass, __VA_ARGS__) /// \brief Add a plugin factory. @@ -117,7 +117,7 @@ /// IGNITION_ADD_FACTORY(MyType, MyFactory); /// \endcode #define IGNITION_ADD_FACTORY(ProductType, FactoryType) \ - DETAIL_IGNITION_ADD_FACTORY(ProductType, FactoryType) + DETAIL_GZ_ADD_FACTORY(ProductType, FactoryType) /// \brief Add an alias for a factory. /// @@ -134,7 +134,7 @@ /// IGNITION_ADD_FACTORY(), but there is nothing wrong with calling both (except /// it might imperceptibly increase your compile time). #define IGNITION_ADD_FACTORY_ALIAS(ProductType, FactoryType, ...) \ - DETAIL_IGNITION_ADD_FACTORY_ALIAS(ProductType, FactoryType, __VA_ARGS__) + DETAIL_GZ_ADD_FACTORY_ALIAS(ProductType, FactoryType, __VA_ARGS__) #endif diff --git a/register/include/gz/plugin/detail/Register.hh b/register/include/gz/plugin/detail/Register.hh index 81932cee..8fd2acee 100644 --- a/register/include/gz/plugin/detail/Register.hh +++ b/register/include/gz/plugin/detail/Register.hh @@ -34,15 +34,15 @@ #if defined _WIN32 || defined __CYGWIN__ #ifdef __GNUC__ - #define DETAIL_IGN_PLUGIN_VISIBLE __attribute__ ((dllexport)) + #define DETAIL_GZ_PLUGIN_VISIBLE __attribute__ ((dllexport)) #else - #define DETAIL_IGN_PLUGIN_VISIBLE __declspec(dllexport) + #define DETAIL_GZ_PLUGIN_VISIBLE __declspec(dllexport) #endif #else #if __GNUC__ >= 4 - #define DETAIL_IGN_PLUGIN_VISIBLE __attribute__ ((visibility ("default"))) + #define DETAIL_GZ_PLUGIN_VISIBLE __attribute__ ((visibility ("default"))) #else - #define DETAIL_IGN_PLUGIN_VISIBLE + #define DETAIL_GZ_PLUGIN_VISIBLE #endif #endif @@ -55,7 +55,7 @@ extern "C" /// retrieve Info from a shared library that provides plugins. /// /// The symbol is explicitly exported (visibility is turned on) using - /// DETAIL_IGN_PLUGIN_VISIBLE to ensure that dlsym(~) is able to find it. + /// DETAIL_GZ_PLUGIN_VISIBLE to ensure that dlsym(~) is able to find it. /// /// DO NOT CALL THIS FUNCTION DIRECTLY OR CREATE YOUR OWN IMPLEMENTATION OF IT /// This function is used by the Registrar and Loader classes. Nothing else @@ -100,7 +100,7 @@ extern "C" /// Similar to _inputAndOutputInfoSize, this is used for sanity checking. It /// inspects and returns the alignof(Info) value instead of the sizeof(Info) /// value. - DETAIL_IGN_PLUGIN_VISIBLE void IgnitionPluginHook( + DETAIL_GZ_PLUGIN_VISIBLE void IgnitionPluginHook( const void *_inputSingleInfo, const void ** const _outputAllInfo, int *_inputAndOutputAPIVersion, @@ -442,7 +442,7 @@ IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR /// instance has a static lifetime, it will be constructed when the shared /// library is loaded. When it is constructed, the Register function will /// be called. -#define DETAIL_IGNITION_ADD_PLUGIN_HELPER(UniqueID, ...) \ +#define DETAIL_GZ_ADD_PLUGIN_HELPER(UniqueID, ...) \ namespace gz \ { \ namespace plugin \ @@ -466,15 +466,15 @@ IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR ////////////////////////////////////////////////// /// This macro is needed to force the __COUNTER__ macro to expand to a value /// before being passed to the *_HELPER macro. -#define DETAIL_IGNITION_ADD_PLUGIN_WITH_COUNTER(UniqueID, ...) \ - DETAIL_IGNITION_ADD_PLUGIN_HELPER(UniqueID, __VA_ARGS__) +#define DETAIL_GZ_ADD_PLUGIN_WITH_COUNTER(UniqueID, ...) \ + DETAIL_GZ_ADD_PLUGIN_HELPER(UniqueID, __VA_ARGS__) ////////////////////////////////////////////////// /// We use the __COUNTER__ here to give each plugin registration its own unique /// name, which is required in order to statically initialize each one. -#define DETAIL_IGNITION_ADD_PLUGIN(...) \ - DETAIL_IGNITION_ADD_PLUGIN_WITH_COUNTER(__COUNTER__, __VA_ARGS__) +#define DETAIL_GZ_ADD_PLUGIN(...) \ + DETAIL_GZ_ADD_PLUGIN_WITH_COUNTER(__COUNTER__, __VA_ARGS__) ////////////////////////////////////////////////// @@ -484,7 +484,7 @@ IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR /// the class instance has a static lifetime, it will be constructed when the /// shared library is loaded. When it is constructed, the Register function will /// be called. -#define DETAIL_IGNITION_ADD_PLUGIN_ALIAS_HELPER(UniqueID, PluginClass, ...) \ +#define DETAIL_GZ_ADD_PLUGIN_ALIAS_HELPER(UniqueID, PluginClass, ...) \ namespace gz \ { \ namespace plugin \ @@ -509,31 +509,31 @@ IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR ////////////////////////////////////////////////// /// This macro is needed to force the __COUNTER__ macro to expand to a value /// before being passed to the *_HELPER macro. -#define DETAIL_IGNITION_ADD_PLUGIN_ALIAS_WITH_COUNTER( \ +#define DETAIL_GZ_ADD_PLUGIN_ALIAS_WITH_COUNTER( \ UniqueID, PluginClass, ...) \ - DETAIL_IGNITION_ADD_PLUGIN_ALIAS_HELPER(UniqueID, PluginClass, __VA_ARGS__) + DETAIL_GZ_ADD_PLUGIN_ALIAS_HELPER(UniqueID, PluginClass, __VA_ARGS__) ////////////////////////////////////////////////// /// We use the __COUNTER__ here to give each plugin registration its own unique /// name, which is required in order to statically initialize each one. -#define DETAIL_IGNITION_ADD_PLUGIN_ALIAS(PluginClass, ...) \ - DETAIL_IGNITION_ADD_PLUGIN_ALIAS_WITH_COUNTER( \ +#define DETAIL_GZ_ADD_PLUGIN_ALIAS(PluginClass, ...) \ + DETAIL_GZ_ADD_PLUGIN_ALIAS_WITH_COUNTER( \ __COUNTER__, PluginClass, __VA_ARGS__) ////////////////////////////////////////////////// -#define DETAIL_IGNITION_ADD_FACTORY(ProductType, FactoryType) \ - DETAIL_IGNITION_ADD_PLUGIN(FactoryType::Producing, FactoryType) \ - DETAIL_IGNITION_ADD_PLUGIN_ALIAS( \ +#define DETAIL_GZ_ADD_FACTORY(ProductType, FactoryType) \ + DETAIL_GZ_ADD_PLUGIN(FactoryType::Producing, FactoryType) \ + DETAIL_GZ_ADD_PLUGIN_ALIAS( \ FactoryType::Producing, \ ::gz::plugin::DemangleSymbol(typeid(ProductType).name())) ////////////////////////////////////////////////// -#define DETAIL_IGNITION_ADD_FACTORY_ALIAS(ProductType, FactoryType, ...) \ - DETAIL_IGNITION_ADD_FACTORY(ProductType, FactoryType) \ - DETAIL_IGNITION_ADD_PLUGIN_ALIAS(FactoryType::Producing, \ +#define DETAIL_GZ_ADD_FACTORY_ALIAS(ProductType, FactoryType, ...) \ + DETAIL_GZ_ADD_FACTORY(ProductType, FactoryType) \ + DETAIL_GZ_ADD_PLUGIN_ALIAS(FactoryType::Producing, \ __VA_ARGS__) #endif diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 193cdd0b..f0d98aec 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -18,7 +18,7 @@ foreach(test ${test_targets}) IGNBadPluginAPIVersionOld IGNBadPluginNoInfo IGNBadPluginSize - IGNDummyPlugins + GzDummyPlugins IGNFactoryPlugins IGNTemplatedPlugins) diff --git a/test/integration/EnablePluginFromThis_TEST.cc b/test/integration/EnablePluginFromThis_TEST.cc index f38e8b4f..73872cc6 100644 --- a/test/integration/EnablePluginFromThis_TEST.cc +++ b/test/integration/EnablePluginFromThis_TEST.cc @@ -29,7 +29,7 @@ TEST(EnablePluginFromThis, BasicInstantiate) { gz::plugin::Loader pl; - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); gz::plugin::PluginPtr plugin = pl.Instantiate("test::util::DummyMultiPlugin"); @@ -74,7 +74,7 @@ using MySpecializedPluginPtr = gz::plugin::SpecializedPluginPtr< TEST(EnablePluginFromThis, TemplatedInstantiate) { gz::plugin::Loader pl; - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); MySpecializedPluginPtr plugin = pl.Instantiate("test::util::DummyMultiPlugin"); @@ -101,7 +101,7 @@ TEST(EnablePluginFromThis, TemplatedInstantiate) ///////////////////////////////////////////////// TEST(EnablePluginFromThis, LibraryManagement) { - const std::string &libraryPath = IGNDummyPlugins_LIB; + const std::string &libraryPath = GzDummyPlugins_LIB; gz::plugin::WeakPluginPtr weak; diff --git a/test/integration/WeakPluginPtr.cc b/test/integration/WeakPluginPtr.cc index 2ebe14ff..b9cef79c 100644 --- a/test/integration/WeakPluginPtr.cc +++ b/test/integration/WeakPluginPtr.cc @@ -26,7 +26,7 @@ ///////////////////////////////////////////////// TEST(WeakPluginPtr, Lifecycle) { - const std::string &libraryPath = IGNDummyPlugins_LIB; + const std::string &libraryPath = GzDummyPlugins_LIB; gz::plugin::WeakPluginPtr weak; @@ -69,7 +69,7 @@ TEST(WeakPluginPtr, Lifecycle) TEST(WeakPluginPtr, CopyMove) { gz::plugin::Loader pl; - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); gz::plugin::PluginPtr plugin = pl.Instantiate("test::util::DummyMultiPlugin"); diff --git a/test/integration/aliases.cc b/test/integration/aliases.cc index 26b6dac0..877df783 100644 --- a/test/integration/aliases.cc +++ b/test/integration/aliases.cc @@ -28,7 +28,7 @@ TEST(Alias, InspectAliases) // Make sure the expected plugins were loaded. std::unordered_set pluginNames = - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); ASSERT_EQ(1u, pluginNames.count("test::util::DummySinglePlugin")); ASSERT_EQ(1u, pluginNames.count("test::util::DummyMultiPlugin")); ASSERT_EQ(1u, pluginNames.count("test::util::DummyNoAliasPlugin")); @@ -53,7 +53,7 @@ TEST(Alias, ConflictingAlias) // Make sure the expected plugins were loaded. std::unordered_set pluginNames = - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); ASSERT_EQ(1u, pluginNames.count("test::util::DummySinglePlugin")); ASSERT_EQ(1u, pluginNames.count("test::util::DummyMultiPlugin")); ASSERT_EQ(1u, pluginNames.count("test::util::DummyNoAliasPlugin")); diff --git a/test/integration/plugin.cc b/test/integration/plugin.cc index f719c292..74500474 100644 --- a/test/integration/plugin.cc +++ b/test/integration/plugin.cc @@ -57,7 +57,7 @@ TEST(Loader, LoadExistingLibrary) // Make sure the expected plugins were loaded. std::unordered_set pluginNames = - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); ASSERT_EQ(3u, pluginNames.size()); ASSERT_EQ(1u, pluginNames.count("test::util::DummySinglePlugin")); ASSERT_EQ(1u, pluginNames.count("test::util::DummyMultiPlugin")); @@ -185,7 +185,7 @@ using SomeSpecializedPluginPtr = TEST(SpecializedPluginPtr, Construction) { gz::plugin::Loader pl; - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); SomeSpecializedPluginPtr plugin( pl.Instantiate("test::util::DummyMultiPlugin")); @@ -330,7 +330,7 @@ TEST(PluginPtr, CopyMoveSemantics) EXPECT_TRUE(plugin.IsEmpty()); gz::plugin::Loader pl; - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); plugin = pl.Instantiate("test::util::DummySinglePlugin"); EXPECT_FALSE(plugin.IsEmpty()); @@ -411,7 +411,7 @@ void CheckSomeValues( TEST(PluginPtr, QueryInterfaceSharedPtr) { gz::plugin::Loader pl; - pl.LoadLib(IGNDummyPlugins_LIB); + pl.LoadLib(GzDummyPlugins_LIB); // QueryInterfaceSharedPtr without specialization { @@ -492,7 +492,7 @@ gz::plugin::PluginPtr GetSomePlugin(const std::string &path) ///////////////////////////////////////////////// TEST(PluginPtr, LibraryManagement) { - const std::string &path = IGNDummyPlugins_LIB; + const std::string &path = GzDummyPlugins_LIB; // Use scoping to destroy somePlugin { diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt index 365b2327..52bfbf88 100644 --- a/test/performance/CMakeLists.txt +++ b/test/performance/CMakeLists.txt @@ -16,5 +16,5 @@ ign_build_tests( foreach(test ${test_targets}) target_compile_definitions(${test} PRIVATE - "IGNDummyPlugin_LIB=\"$\"") + "IGNDummyPlugin_LIB=\"$\"") endforeach() diff --git a/test/plugins/CMakeLists.txt b/test/plugins/CMakeLists.txt index 8fc30dbb..2f5cc467 100644 --- a/test/plugins/CMakeLists.txt +++ b/test/plugins/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(IGNBadPluginSize SHARED BadPluginSize.cc) add_library(IGNFactoryPlugins SHARED FactoryPlugins.cc) add_library(IGNTemplatedPlugins SHARED TemplatedPlugins.cc) -add_library(IGNDummyPlugins SHARED +add_library(GzDummyPlugins SHARED DummyPlugins.cc DummyPluginsOtherTranslationUnit.cc) @@ -18,7 +18,7 @@ foreach(plugin_target IGNBadPluginAPIVersionOld IGNBadPluginNoInfo IGNBadPluginSize - IGNDummyPlugins + GzDummyPlugins IGNFactoryPlugins IGNTemplatedPlugins)