Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test_manager/features/steps/tck_step_implementations.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand All @@ -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}")

Expand All @@ -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}")

Expand All @@ -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}")

Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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}")

Expand Down
2 changes: 1 addition & 1 deletion up_client_socket/cpp/conanfile.txt
Original file line number Diff line number Diff line change
@@ -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.0.1-dev
spdlog/1.13.0
fmt/10.2.1

Expand Down
2 changes: 1 addition & 1 deletion up_client_socket/cpp/include/SocketUTransport.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<Impl> pImpl;
Expand Down
2 changes: 1 addition & 1 deletion up_client_socket/cpp/src/SocketUTransport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Loading