Skip to content

contrib-sipproxy: Fix TRA Ut #20443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreenway merged 2 commits into from
Mar 30, 2022
Merged

contrib-sipproxy: Fix TRA Ut #20443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bd30c9
update tra test
durd07 Mar 21, 2022
2a8c572
update
durd07 Mar 23, 2022
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
2 changes: 0 additions & 2 deletions contrib/sip_proxy/filters/network/source/tra/tra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ class Client {

virtual void closeStream() PURE;

virtual void resetStream() PURE;

virtual void createTrafficRoutingAssistant(
const std::string& type, const absl::flat_hash_map<std::string, std::string>& data,
Tracing::Span& parent_span, const StreamInfo::StreamInfo& stream_info) PURE;
Expand Down
10 changes: 1 addition & 9 deletions contrib/sip_proxy/filters/network/source/tra/tra_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GrpcClientImpl::~GrpcClientImpl() {
}

if (stream_ != nullptr) {
stream_.closeStream();
stream_.resetStream();
}
}

Expand All @@ -58,14 +58,6 @@ void GrpcClientImpl::closeStream() {
}
}

void GrpcClientImpl::resetStream() {
ASSERT(callbacks_ != nullptr);
if (stream_ != nullptr) {
stream_.resetStream();
stream_ = nullptr;
}
}

void GrpcClientImpl::createTrafficRoutingAssistant(
const std::string& type, const absl::flat_hash_map<std::string, std::string>& data,
Tracing::Span& parent_span, const StreamInfo::StreamInfo& stream_info) {
Expand Down
2 changes: 0 additions & 2 deletions contrib/sip_proxy/filters/network/source/tra/tra_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ class GrpcClientImpl : public Client,

void closeStream() override;

void resetStream() override;

void createTrafficRoutingAssistant(const std::string& type,
const absl::flat_hash_map<std::string, std::string>& data,
Tracing::Span& parent_span,
Expand Down
38 changes: 19 additions & 19 deletions contrib/sip_proxy/filters/network/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,25 @@ envoy_cc_test(
],
)

#envoy_cc_test(
# name = "tra_test",
# srcs = ["tra_test.cc"],
# deps = [
# ":mocks",
# ":utility_lib",
# "//contrib/sip_proxy/filters/network/source:config",
# "//contrib/sip_proxy/filters/network/source:conn_manager_lib",
# "//contrib/sip_proxy/filters/network/source/filters:filter_interface",
# "//contrib/sip_proxy/filters/network/source/router:config",
# "//contrib/sip_proxy/filters/network/source/router:router_interface",
# "//contrib/sip_proxy/filters/network/source/tra:tra_lib",
# "//test/mocks/network:network_mocks",
# "//test/mocks/server:factory_context_mocks",
# "//test/test_common:printers_lib",
# "@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha:pkg_cc_proto",
# "@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/v3alpha:pkg_cc_proto",
# ],
#)
envoy_cc_test(
name = "tra_test",
srcs = ["tra_test.cc"],
deps = [
":mocks",
":utility_lib",
"//contrib/sip_proxy/filters/network/source:config",
"//contrib/sip_proxy/filters/network/source:conn_manager_lib",
"//contrib/sip_proxy/filters/network/source/filters:filter_interface",
"//contrib/sip_proxy/filters/network/source/router:config",
"//contrib/sip_proxy/filters/network/source/router:router_interface",
"//contrib/sip_proxy/filters/network/source/tra:tra_lib",
"//test/mocks/network:network_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:printers_lib",
"@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha:pkg_cc_proto",
"@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/v3alpha:pkg_cc_proto",
],
)

envoy_cc_test(
name = "decoder_test",
Expand Down
7 changes: 7 additions & 0 deletions contrib/sip_proxy/filters/network/test/app_exception_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ TEST(AppExceptionImplTest, CopyConstructor) {
EXPECT_STREQ("msg", copy.what());
}

TEST(AppExceptionImplTest, EncodeWithoutNecessaryHeaders) {
AppException app_ex(AppExceptionType::InternalError, "msg");
MessageMetadata metadata;
Buffer::OwnedImpl buffer;
app_ex.encode(metadata, buffer);
}

} // namespace SipProxy
} // namespace NetworkFilters
} // namespace Extensions
Expand Down
2 changes: 1 addition & 1 deletion contrib/sip_proxy/filters/network/test/mocks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ MockDecoderFilterCallbacks::MockDecoderFilterCallbacks() {

ON_CALL(*this, streamId()).WillByDefault(Return(stream_id_));
ON_CALL(*this, transactionInfos()).WillByDefault(Return(transaction_infos_));
ON_CALL(*this, streamInfo()).WillByDefault(ReturnRef(stream_info_));
ON_CALL(*this, streamInfo()).WillByDefault(ReturnRef(connection_.stream_info_));
}
MockDecoderFilterCallbacks::~MockDecoderFilterCallbacks() = default;

Expand Down
29 changes: 8 additions & 21 deletions contrib/sip_proxy/filters/network/test/mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ class MockDecoderFilterCallbacks : public DecoderFilterCallbacks {
uint64_t stream_id_{1};
std::string transaction_id_{"test"};
NiceMock<Network::MockConnection> connection_;
NiceMock<StreamInfo::MockStreamInfo> stream_info_;
std::shared_ptr<Router::MockRoute> route_;
std::shared_ptr<Router::TransactionInfos> transaction_infos_;
};
Expand Down Expand Up @@ -167,7 +166,7 @@ class MockRouteEntry : public RouteEntry {
MockRouteEntry();
~MockRouteEntry() override;

// // SipProxy::Router::RouteEntry
// SipProxy::Router::RouteEntry
MOCK_METHOD(const std::string&, clusterName, (), (const));
MOCK_METHOD(const Envoy::Router::MetadataMatchCriteria*, metadataMatchCriteria, (), (const));
std::string cluster_name_{"fake_cluster"};
Expand Down Expand Up @@ -221,25 +220,6 @@ class MockConnectionManager : public ConnectionManager {
MOCK_METHOD(std::shared_ptr<SipSettings>, settings, (), (const));
};

namespace TrafficRoutingAssistant {
class MockGrpcClientImpl : public GrpcClientImpl {
public:
MockGrpcClientImpl(const Grpc::RawAsyncClientSharedPtr& async_client,
const absl::optional<std::chrono::milliseconds>& timeout)
: GrpcClientImpl(async_client, timeout) {
async_client_ = std::make_shared<NiceMock<Grpc::MockAsyncClient>>();
request_ = new Grpc::MockAsyncRequest();
}
~MockGrpcClientImpl() override { delete request_; }

std::shared_ptr<Grpc::MockAsyncClient> asyncClient() { return async_client_; }

private:
std::shared_ptr<NiceMock<Grpc::MockAsyncClient>> async_client_;
Grpc::MockAsyncRequest* request_;
};
} // namespace TrafficRoutingAssistant

class MockTrafficRoutingAssistantHandlerDeep : public TrafficRoutingAssistantHandler {
public:
MockTrafficRoutingAssistantHandlerDeep(
Expand All @@ -250,6 +230,13 @@ class MockTrafficRoutingAssistantHandlerDeep : public TrafficRoutingAssistantHan
MOCK_METHOD(TrafficRoutingAssistant::ClientPtr&, traClient, (), (override));
};

class MockRequestCallbacks : public TrafficRoutingAssistant::RequestCallbacks {
public:
MOCK_METHOD(void, complete,
(const TrafficRoutingAssistant::ResponseType&, const std::string&, const absl::any&),
());
};

} // namespace SipProxy
} // namespace NetworkFilters
} // namespace Extensions
Expand Down
Loading