From ae0dbea8c2ccc10f231c4fc9faf07955a5c0f060 Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Thu, 27 Mar 2025 08:01:15 +0100 Subject: [PATCH 1/3] updated signature and up-cpp version --- up_client_socket/cpp/conanfile.txt | 2 +- up_client_socket/cpp/include/SocketUTransport.h | 2 +- up_client_socket/cpp/src/SocketUTransport.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/up_client_socket/cpp/conanfile.txt b/up_client_socket/cpp/conanfile.txt index 1fef6522..35d97e52 100644 --- a/up_client_socket/cpp/conanfile.txt +++ b/up_client_socket/cpp/conanfile.txt @@ -1,7 +1,7 @@ [requires] up-core-api/[~1.6, include_prerelease] protobuf/3.21.12 -up-cpp/1.0.1-rc1 +up-cpp/1.1.0-dev spdlog/1.13.0 fmt/10.2.1 diff --git a/up_client_socket/cpp/include/SocketUTransport.h b/up_client_socket/cpp/include/SocketUTransport.h index 69badf5c..31b4e46a 100644 --- a/up_client_socket/cpp/include/SocketUTransport.h +++ b/up_client_socket/cpp/include/SocketUTransport.h @@ -50,7 +50,7 @@ class SocketUTransport : public uprotocol::transport::UTransport { /// @brief Unregister a previously registered callback object. /// @param[in] listener Callback object to unregister. - void cleanupListener(CallableConn listener) override; + void cleanupListener(const CallableConn& listener) override; struct Impl; std::shared_ptr pImpl; diff --git a/up_client_socket/cpp/src/SocketUTransport.cpp b/up_client_socket/cpp/src/SocketUTransport.cpp index 2a9a62ba..e4de6d37 100644 --- a/up_client_socket/cpp/src/SocketUTransport.cpp +++ b/up_client_socket/cpp/src/SocketUTransport.cpp @@ -299,6 +299,6 @@ UStatus SocketUTransport::registerListenerImpl(CallableConn&& listener, return pImpl->registerListenerImpl(listener, source_filter, sink_filter); } -void SocketUTransport::cleanupListener(CallableConn listener) { +void SocketUTransport::cleanupListener(const CallableConn& listener) { pImpl->cleanupListener(listener); } From f9793dcacd5b4595e5f0e561718adc5778a9cb0b Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Sun, 6 Apr 2025 16:22:00 +0200 Subject: [PATCH 2/3] fixed formating --- .../features/steps/tck_step_implementations.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test_manager/features/steps/tck_step_implementations.py b/test_manager/features/steps/tck_step_implementations.py index 4230c8f3..d92dfa27 100644 --- a/test_manager/features/steps/tck_step_implementations.py +++ b/test_manager/features/steps/tck_step_implementations.py @@ -226,7 +226,7 @@ def serialized_uri_received(context, expected_uri: str): actual_uri: str = context.response_data assert_that(expected_uri, equal_to(actual_uri)) except AssertionError: - raise AssertionError(f"Assertion error. Expected is {expected_uri} but " f"received {actual_uri}") + raise AssertionError(f"Assertion error. Expected is {expected_uri} but received {actual_uri}") except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -238,7 +238,7 @@ def serialized_uuid_received(context, expected_uuid: str): assert_that(expected_uuid, equal_to(actual_uuid)) except AssertionError: - raise AssertionError(f"Assertion error. Expected is {expected_uuid} but " f"received {actual_uuid}") + raise AssertionError(f"Assertion error. Expected is {expected_uuid} but received {actual_uuid}") except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -252,7 +252,7 @@ def receive_validation_result(context, expected_result): actual_val_res = context.response_data["result"] assert_that(expected_result, equal_to(actual_val_res)) except AssertionError: - raise AssertionError(f"Assertion error. Expected is {expected_result} but " f"received {repr(actual_val_res)}") + raise AssertionError(f"Assertion error. Expected is {expected_result} but received {repr(actual_val_res)}") except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -264,7 +264,7 @@ def receive_validation_result(context, expected_message): actual_val_msg = context.response_data["message"] assert_that(expected_message, equal_to(actual_val_msg)) except AssertionError: - raise AssertionError(f"Assertion error. Expected is {expected_message} but " f"received {repr(actual_val_msg)}") + raise AssertionError(f"Assertion error. Expected is {expected_message} but received {repr(actual_val_msg)}") except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -391,7 +391,7 @@ def receive_status(context, field_name: str, expected_value: str): assert_that(expected_value_string, equal_to(actual_value)) except AssertionError: raise AssertionError( - f"Assertion error. Expected is {expected_value} but " f"received {context.response_data[field_name]}" + f"Assertion error. Expected is {expected_value} but received {context.response_data[field_name]}" ) except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -448,7 +448,7 @@ def receive_value_as_bytes(context, sender_sdk_name: str, field_name: str, expec except AssertionError: raise AssertionError( - f"Assertion error. Expected is {expected_value.encode('utf-8')} but " f"received {rec_field_value}" + f"Assertion error. Expected is {expected_value.encode('utf-8')} but received {rec_field_value}" ) except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -487,7 +487,7 @@ def receive_rpc_response_as_bytes(context, sdk_name, field_name: str, expected_v raise KeyError(f"Key error. {sdk_name} has not received rpc response.") except AssertionError: raise AssertionError( - f"Assertion error. Expected is {expected_value.encode('utf-8')} but " f"received {repr(actual_value)}" + f"Assertion error. Expected is {expected_value.encode('utf-8')} but received {repr(actual_value)}" ) except Exception as ae: raise ValueError(f"Exception occurred. {ae}") @@ -517,7 +517,7 @@ def receive_micro_serialized_uuri(context, expected_bytes_as_base64_str: str): context.logger.info(f"actual: {actual_bytes} | expect: {expected_bytes}") assert_that(expected_bytes, equal_to(actual_bytes)) except AssertionError: - raise AssertionError(f"Assertion error. Expected is {expected_bytes} but " f"received {actual_bytes}") + raise AssertionError(f"Assertion error. Expected is {expected_bytes} but received {actual_bytes}") except Exception as ae: raise ValueError(f"Exception occurred. {ae}") From c15dd91529c99fde2d054d5ae2495e64ad354f02 Mon Sep 17 00:00:00 2001 From: maximiliantoe Date: Sun, 6 Apr 2025 16:45:15 +0200 Subject: [PATCH 3/3] fixed typo in up-cpp version --- up_client_socket/cpp/conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/up_client_socket/cpp/conanfile.txt b/up_client_socket/cpp/conanfile.txt index 35d97e52..f89b3530 100644 --- a/up_client_socket/cpp/conanfile.txt +++ b/up_client_socket/cpp/conanfile.txt @@ -1,7 +1,7 @@ [requires] up-core-api/[~1.6, include_prerelease] protobuf/3.21.12 -up-cpp/1.1.0-dev +up-cpp/1.0.1-dev spdlog/1.13.0 fmt/10.2.1