This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-pubsub in repository https://gitbox.apache.org/repos/asf/celix.git
commit 54e60db6e124402a2f6ec0aa6ae4a193551a97ca Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Dec 3 22:49:23 2023 +0100 Re-enable cxx integration test, now using IPC MQ --- bundles/cxx_remote_services/integration/CMakeLists.txt | 6 +++--- .../cxx_remote_services/integration/gtest/CMakeLists.txt | 15 --------------- .../gtest/src/RemoteServicesIntegrationTestSuite.cc | 13 ------------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/bundles/cxx_remote_services/integration/CMakeLists.txt b/bundles/cxx_remote_services/integration/CMakeLists.txt index b19715fc..bad01c2d 100644 --- a/bundles/cxx_remote_services/integration/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/CMakeLists.txt @@ -36,9 +36,9 @@ if (CXX_RSA_INTEGRATION) target_link_libraries(CalculatorConsumer PRIVATE Celix::Promises Celix::PushStreams Celix::shell_api Celix::RsaConfiguredDiscovery_api) target_include_directories(CalculatorConsumer PRIVATE include) -# if (ENABLE_TESTING) -# add_subdirectory(gtest) -# endif() + if (ENABLE_TESTING) + add_subdirectory(gtest) + endif() ################# Integration examples ################################## diff --git a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt index 25572ed5..aead0299 100644 --- a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt @@ -22,10 +22,6 @@ target_link_libraries(test_cxx_remote_services_integration PRIVATE Celix::framew target_include_directories(test_cxx_remote_services_integration PRIVATE ../include) #Add ICalculator add_celix_bundle_dependencies(test_cxx_remote_services_integration - Celix::celix_pubsub_serializer_json - Celix::celix_pubsub_topology_manager - Celix::celix_pubsub_admin_zmq - Celix::celix_pubsub_protocol_wire_v2 Celix::RsaConfiguredDiscovery Celix::RemoteServiceAdmin TestExportImportRemoteServiceFactory @@ -33,17 +29,6 @@ add_celix_bundle_dependencies(test_cxx_remote_services_integration CalculatorConsumer ) -celix_get_bundle_file(Celix::celix_pubsub_serializer_json PS_SER_BUNDLE_LOC) -target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_SER_BUNDLE_LOC="${PS_SER_BUNDLE_LOC}") - -celix_get_bundle_file(Celix::celix_pubsub_topology_manager PS_PSTM_BUNDLE_LOC) -target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_PSTM_BUNDLE_LOC="${PS_PSTM_BUNDLE_LOC}") - -celix_get_bundle_file(Celix::celix_pubsub_admin_zmq PS_PSA_BUNDLE_LOC) -target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_PSA_BUNDLE_LOC="${PS_PSA_BUNDLE_LOC}") - -celix_get_bundle_file(Celix::celix_pubsub_protocol_wire_v2 PS_WIRE_BUNDLE_LOC) -target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_WIRE_BUNDLE_LOC="${PS_WIRE_BUNDLE_LOC}") celix_get_bundle_file(Celix::RsaConfiguredDiscovery RS_DISCOVERY_BUNDLE_LOC) target_compile_definitions(test_cxx_remote_services_integration PRIVATE RS_DISCOVERY_BUNDLE_LOC="${RS_DISCOVERY_BUNDLE_LOC}") diff --git a/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc b/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc index f611d666..007dd1f8 100644 --- a/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc +++ b/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc @@ -26,15 +26,9 @@ class RemoteServicesIntegrationTestSuite : public ::testing::Test { public: RemoteServicesIntegrationTestSuite() { - auto pubsubTestReturnIpc = std::string{"ipc:///tmp/pubsub-test-return"}; - auto pubsubTestInvokeIpc = std::string{"ipc:///tmp/pubsub-test-invoke"}; - celix::Properties clientConfig{ {"CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "info"}, {celix::FRAMEWORK_CACHE_DIR, ".clientCache"}, - //Static configuration to let the pubsub zmq operate without discovery - {"PSA_ZMQ_STATIC_BIND_URL_FOR_test_invoke_default", pubsubTestInvokeIpc}, - {"PSA_ZMQ_STATIC_CONNECT_URL_FOR_test_return_default", pubsubTestReturnIpc } }; clientFw = celix::createFramework(clientConfig); clientCtx = clientFw->getFrameworkBundleContext(); @@ -42,9 +36,6 @@ public: celix::Properties serverConfig{ {"CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "info"}, {celix::FRAMEWORK_CACHE_DIR, ".serverCache"}, - //Static configuration to let the pubsub zmq operate without discovery - {"PSA_ZMQ_STATIC_BIND_URL_FOR_test_return_default", pubsubTestReturnIpc }, - {"PSA_ZMQ_STATIC_CONNECT_URL_FOR_test_invoke_default", pubsubTestInvokeIpc } }; serverFw = celix::createFramework(serverConfig); serverCtx = serverFw->getFrameworkBundleContext(); @@ -52,10 +43,6 @@ public: static void installSharedBundles(std::shared_ptr<celix::BundleContext>& ctx) { auto sharedBundles = { - PS_SER_BUNDLE_LOC, - PS_PSTM_BUNDLE_LOC, - PS_PSA_BUNDLE_LOC, - PS_WIRE_BUNDLE_LOC, RS_DISCOVERY_BUNDLE_LOC, RS_FACTORY_BUNDLE_LOC , RS_RSA_BUNDLE_LOC};
