This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-cpputests in repository https://gitbox.apache.org/repos/asf/celix.git
commit bcfb6b250831a8783afa66f25204a114d428b838 Merge: d1f7d10a 9ea03bc6 Author: Pepijn Noltes <[email protected]> AuthorDate: Sat Dec 30 17:32:52 2023 +0100 Merge branch 'master' into feature/509-remove-cpputests # Conflicts: # .github/workflows/coverity-scan.yml # .github/workflows/macos.yml # .github/workflows/ubuntu.yml # bundles/pubsub/examples/pubsub/pubsub_websocket/private/include/pubsub_websocket_private.h # bundles/pubsub/examples/pubsub/pubsub_websocket/private/src/ps_websocket_activator.c # bundles/pubsub/examples/pubsub/pubsub_websocket/private/src/pubsub_websocket_example.c # bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c # bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c # bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_receiver.c # bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c # bundles/pubsub/pubsub_utils/src/pubsub_utils.c .github/workflows/coverity-scan.yml | 2 +- .github/workflows/macos.yml | 7 +- .github/workflows/ubuntu.yml | 4 +- bundles/CMakeLists.txt | 1 - .../cxx_remote_services/integration/CMakeLists.txt | 81 +- bundles/cxx_remote_services/integration/README.md | 8 + .../integration/gtest/CMakeLists.txt | 15 - .../src/RemoteServicesIntegrationTestSuite.cc | 22 +- .../resources/Calculator$add$Invoke.descriptor | 9 - .../resources/Calculator$add$Return.descriptor | 9 - .../resources/Calculator$result$Event.descriptor | 9 - .../integration/resources/endpoint_discovery.json | 6 +- .../integration/src/CalculatorConsumer.cc | 1 - .../integration/src/CalculatorProvider.cc | 6 +- .../src/TestExportImportRemoteServiceFactory.cc | 547 ++++---- bundles/pubsub/CMakeLists.txt | 35 - bundles/pubsub/README.md | 116 -- bundles/pubsub/doc/pubsub_serialization.adoc | 263 ---- bundles/pubsub/examples/CMakeLists.txt | 361 ----- bundles/pubsub/examples/keys/README.md | 39 - .../examples/keys/publisher/private/.gitkeep | 14 - .../pubsub/examples/keys/publisher/public/.gitkeep | 16 - .../examples/keys/subscriber/private/.gitkeep | 16 - .../examples/keys/subscriber/public/.gitkeep | 16 - bundles/pubsub/examples/pubsub/CMakeLists.txt | 28 - .../pubsub/examples/pubsub/common/include/poi.h | 55 - .../pubsub/examples/pubsub/common/include/poiCmd.h | 39 - .../examples/pubsub/interceptors/CMakeLists.txt | 28 - .../include/first_interceptor_private.h | 43 - .../include/second_interceptor_private.h | 36 - .../pubsub/interceptors/src/first_interceptor.c | 73 - .../interceptors/src/ps_interceptor_activator.c | 95 -- .../pubsub/interceptors/src/second_interceptor.c | 58 - .../pubsub/msg_descriptors/msg_poi1.descriptor | 10 - .../pubsub/msg_descriptors/msg_poi2.descriptor | 11 - .../pubsub/msg_descriptors/msg_poiCmd.descriptor | 8 - .../pubsub/msg_descriptors/poi1.properties | 38 - .../pubsub/msg_descriptors/poi2.properties | 38 - .../pubsub/msg_descriptors/poiCmd.properties | 35 - .../examples/pubsub/publisher/CMakeLists.txt | 51 - .../private/include/pubsub_publisher_private.h | 55 - .../publisher/private/src/ps_pub_activator.c | 96 -- .../publisher/private/src/pubsub_publisher.c | 168 --- .../examples/pubsub/publisher2/CMakeLists.txt | 50 - .../pubsub/pubsub_websocket/CMakeLists.txt | 62 - .../private/include/pubsub_websocket_private.h | 97 -- .../private/src/ps_websocket_activator.c | 163 --- .../private/src/pubsub_websocket_example.c | 207 --- .../pubsub/pubsub_websocket/resources/index.html | 60 - .../pubsub/pubsub_websocket/resources/script.js | 54 - .../examples/pubsub/subscriber/CMakeLists.txt | 52 - .../private/include/pubsub_subscriber_private.h | 50 - .../subscriber/private/src/ps_sub_activator.c | 113 -- .../subscriber/private/src/pubsub_subscriber.c | 71 - bundles/pubsub/integration/CMakeLists.txt | 505 ------- .../gtest/PubSubEndpointIntegrationTestSuite.cc | 70 - .../gtest/PubSubIntegrationTestSuite.cc | 119 -- .../gtest/PubSubInterceptorTestSuite.cc | 235 ---- .../PubSubTopicAndScopeIntegrationTestSuite.cc | 69 - .../integration/gtest/PubSubWebsocketTestMain.cc | 28 - .../pubsub/integration/gtest/loopback_activator.c | 99 -- bundles/pubsub/integration/gtest/msg.h | 31 - .../integration/gtest/receive_count_service.h | 30 - .../integration/gtest/serializer_activator.cc | 87 -- bundles/pubsub/integration/gtest/sut_activator.c | 118 -- .../integration/gtest/sut_endpoint_activator.c | 120 -- bundles/pubsub/integration/gtest/tst_activator.c | 138 -- .../integration/gtest/tst_endpoint_activator.c | 103 -- .../meta_data/deadlock.scope.properties | 28 - .../meta_data/deadlock.scope2.properties | 28 - .../pubsub/integration/meta_data/msg.descriptor | 9 - .../pubsub/integration/meta_data/ping.properties | 29 - .../pubsub/integration/meta_data/ping2.properties | 23 - .../pubsub/integration/meta_data/ping3.properties | 22 - .../pubsub/integration/meta_data/pong2.properties | 23 - .../pubsub/integration/meta_data/pong3.properties | 22 - .../integration/pstm_deadlock_test/test_runner.cc | 161 --- bundles/pubsub/keygen/CMakeLists.txt | 30 - bundles/pubsub/keygen/ed_file.c | 309 ----- bundles/pubsub/keygen/makecert.c | 54 - bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 45 - .../pubsub/pubsub_admin_tcp/src/psa_activator.c | 128 -- .../src/pubsub_psa_tcp_constants.h | 140 -- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 710 ---------- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 87 -- .../pubsub_admin_tcp/src/pubsub_tcp_common.c | 39 - .../pubsub_admin_tcp/src/pubsub_tcp_common.h | 33 - .../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 1450 -------------------- .../pubsub_admin_tcp/src/pubsub_tcp_handler.h | 92 -- .../src/pubsub_tcp_topic_receiver.c | 674 --------- .../src/pubsub_tcp_topic_receiver.h | 56 - .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 435 ------ .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h | 52 - .../pubsub/pubsub_admin_websocket/CMakeLists.txt | 44 - .../pubsub_admin_websocket/src/psa_activator.c | 100 -- .../src/pubsub_psa_websocket_constants.h | 61 - .../src/pubsub_websocket_admin.c | 533 ------- .../src/pubsub_websocket_admin.h | 64 - .../src/pubsub_websocket_common.c | 68 - .../src/pubsub_websocket_common.h | 43 - .../src/pubsub_websocket_topic_receiver.c | 733 ---------- .../src/pubsub_websocket_topic_receiver.h | 48 - .../src/pubsub_websocket_topic_sender.c | 330 ----- .../src/pubsub_websocket_topic_sender.h | 43 - bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 58 - .../pubsub/pubsub_admin_zmq/src/psa_activator.c | 115 -- .../src/pubsub_psa_zmq_constants.h | 108 -- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 800 ----------- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 52 - .../src/pubsub_zmq_topic_receiver.c | 712 ---------- .../src/pubsub_zmq_topic_receiver.h | 53 - .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 559 -------- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.h | 55 - bundles/pubsub/pubsub_admin_zmq/src/zmq_crypto.c | 278 ---- bundles/pubsub/pubsub_admin_zmq/src/zmq_crypto.h | 41 - bundles/pubsub/pubsub_api/CMakeLists.txt | 33 - bundles/pubsub/pubsub_api/include/pubsub/api.h | 28 - .../pubsub/pubsub_api/include/pubsub/publisher.h | 78 -- .../pubsub/pubsub_api/include/pubsub/subscriber.h | 80 -- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 43 - .../pubsub/pubsub_discovery/src/psd_activator.c | 105 -- .../pubsub_discovery/src/pubsub_discovery_impl.c | 639 --------- .../pubsub_discovery/src/pubsub_discovery_impl.h | 100 -- bundles/pubsub/pubsub_protocol/CMakeLists.txt | 21 - .../pubsub_protocol_lib/CMakeLists.txt | 26 - .../pubsub_protocol_lib/gtest/CMakeLists.txt | 32 - .../gtest/src/PS_WP_common_ei_tests.cc | 233 ---- .../gtest/src/PS_WP_common_tests.cc | 311 ----- .../include/pubsub_wire_protocol_common.h | 86 -- .../src/pubsub_wire_protocol_common.c | 313 ----- .../pubsub_protocol_wire_v1/CMakeLists.txt | 48 - .../pubsub_protocol_wire_v1/gtest/CMakeLists.txt | 28 - .../gtest/src/PS_WP_tests.cc | 323 ----- .../pubsub_protocol_wire_v1/gtest/src/main.cc | 26 - .../src/ps_wire_protocol_activator.c | 72 - .../src/pubsub_wire_protocol_impl.c | 177 --- .../src/pubsub_wire_protocol_impl.h | 57 - .../pubsub_protocol_wire_v2/CMakeLists.txt | 45 - .../pubsub_protocol_wire_v2/gtest/CMakeLists.txt | 28 - .../gtest/src/PS_WP_v2_tests.cc | 309 ----- .../pubsub_protocol_wire_v2/gtest/src/main.cc | 26 - .../src/ps_wire_v2_protocol_activator.c | 73 - .../src/pubsub_wire_v2_protocol_impl.c | 210 --- .../src/pubsub_wire_v2_protocol_impl.h | 58 - .../pubsub/pubsub_serializer_json/CMakeLists.txt | 47 - .../pubsub_serializer_json/gtest/CMakeLists.txt | 36 - .../gtest/msg_descriptors/msg_poi1.descriptor | 10 - .../PubSubJsonSerializationProviderTestSuite.cc | 117 -- .../src/ps_json_serializer_activator.c | 41 - .../src/pubsub_json_serialization_provider.c | 117 -- .../src/pubsub_json_serialization_provider.h | 43 - bundles/pubsub/pubsub_spi/CMakeLists.txt | 45 - bundles/pubsub/pubsub_spi/gtest/CMakeLists.txt | 24 - .../gtest/src/PubSubEndpointUtilsTestSuite.cc | 47 - bundles/pubsub/pubsub_spi/include/pubsub_admin.h | 67 - .../pubsub_spi/include/pubsub_admin_metrics.h | 113 -- .../pubsub/pubsub_spi/include/pubsub_constants.h | 47 - .../pubsub/pubsub_spi/include/pubsub_endpoint.h | 90 -- .../pubsub/pubsub_spi/include/pubsub_interceptor.h | 116 -- .../include/pubsub_interceptors_handler.h | 81 -- .../pubsub/pubsub_spi/include/pubsub_listeners.h | 57 - .../include/pubsub_message_serialization_marker.h | 67 - .../include/pubsub_message_serialization_service.h | 102 -- .../pubsub/pubsub_spi/include/pubsub_protocol.h | 270 ---- .../pubsub/pubsub_spi/src/pubsub_admin_metrics.c | 51 - bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 230 ---- .../pubsub/pubsub_spi/src/pubsub_endpoint_match.c | 35 - .../pubsub_spi/src/pubsub_interceptors_handler.c | 216 --- .../pubsub/pubsub_topology_manager/CMakeLists.txt | 37 - .../pubsub_topology_manager/src/pstm_activator.c | 162 --- .../src/pubsub_topology_manager.c | 1406 ------------------- .../src/pubsub_topology_manager.h | 136 -- bundles/pubsub/pubsub_utils/CMakeLists.txt | 44 - bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt | 60 - .../gtest/msg_descriptors/fiets.properties | 39 - .../gtest/msg_descriptors/garbage.descriptor | 1 - .../gtest/msg_descriptors/int_calc.descriptor | 13 - .../gtest/msg_descriptors/msg_poi1.descriptor | 10 - .../msg_descriptors/msg_poi2_variant1.descriptor | 11 - .../msg_descriptors/msg_poi2_variant2.descriptor | 11 - .../msg_descriptors/msg_poi3_variant1.descriptor | 11 - .../msg_descriptors/msg_poi3_variant2.descriptor | 12 - .../msg_descriptors/msg_poi4_variant1.descriptor | 12 - .../msg_descriptors/msg_poi4_variant2.descriptor | 12 - .../gtest/msg_descriptors/msg_poiCmd.descriptor | 8 - .../gtest/src/PubSubMatchingTestSuite.cpp | 183 --- .../src/PubSubSerializationHandlerTestSuite.cc | 339 ----- .../src/PubSubSerializationProviderTestSuite.cc | 71 - .../pubsub/pubsub_utils/include/pubsub_matching.h | 140 -- .../include/pubsub_serialization_provider.h | 127 -- .../include/pubsub_serializer_handler.h | 206 --- bundles/pubsub/pubsub_utils/include/pubsub_utils.h | 99 -- .../pubsub/pubsub_utils/include/pubsub_utils_url.h | 55 - bundles/pubsub/pubsub_utils/src/pubsub_matching.c | 302 ---- .../src/pubsub_serialization_provider.c | 729 ---------- .../pubsub_utils/src/pubsub_serializer_handler.c | 482 ------- bundles/pubsub/pubsub_utils/src/pubsub_utils.c | 194 --- bundles/pubsub/pubsub_utils/src/pubsub_utils_url.c | 344 ----- conanfile.py | 70 +- documents/building/README.md | 4 +- documents/patterns.md | 5 - documents/services.md | 55 +- examples/conan_test_package/CMakeLists.txt | 97 -- examples/conan_test_package/conanfile.py | 28 - examples/conan_test_package/my_psa_activator.c | 154 --- examples/conan_test_package_v2/conanfile.py | 28 - libs/error_injector/stdio/CMakeLists.txt | 1 + libs/error_injector/stdio/include/stdio_ei.h | 2 + libs/error_injector/stdio/src/stdio_ei.cc | 10 + libs/framework/src/bundle_context.c | 52 +- libs/framework/src/dm_component_impl.c | 43 +- libs/framework/src/service_registration.c | 98 +- libs/framework/src/service_registration_private.h | 16 +- libs/framework/src/service_registry.c | 1 + libs/pushstreams/api/celix/PushStream.h | 2 +- libs/utils/benchmark/CMakeLists.txt | 7 + libs/utils/benchmark/src/FilterBenchmark.cc | 216 +++ libs/utils/gtest/CMakeLists.txt | 2 + .../src/ConvertUtilsErrorInjectionTestSuite.cc | 8 - libs/utils/gtest/src/ConvertUtilsTestSuite.cc | 9 + libs/utils/gtest/src/CxxFilterTestSuite.cc | 7 +- .../gtest/src/FilterErrorInjectionTestSuite.cc | 232 ++++ libs/utils/gtest/src/FilterTestSuite.cc | 696 ++++++---- libs/utils/include/celix/Filter.h | 25 +- libs/utils/include/celix_filter.h | 185 ++- libs/utils/src/celix_convert_utils.c | 42 +- libs/utils/src/filter.c | 1277 +++++++++-------- misc/experimental/bundles/CMakeLists.txt | 1 - .../bundles/pubsub_admin_nanomsg/CMakeLists.txt | 46 - .../bundles/pubsub_admin_nanomsg/src/LogHelper.h | 103 -- .../src/psa_nanomsg_activator.cc | 87 -- .../src/pubsub_nanomsg_admin.cc | 625 --------- .../src/pubsub_nanomsg_admin.h | 154 --- .../src/pubsub_nanomsg_common.cc | 56 - .../src/pubsub_nanomsg_common.h | 56 - .../src/pubsub_nanomsg_topic_receiver.cc | 319 ----- .../src/pubsub_nanomsg_topic_receiver.h | 127 -- .../src/pubsub_nanomsg_topic_sender.cc | 265 ---- .../src/pubsub_nanomsg_topic_sender.h | 114 -- .../src/pubsub_psa_nanomsg_constants.h | 39 - 240 files changed, 2303 insertions(+), 28870 deletions(-)
