Skip to content
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

Jump to bottom

Windows compilation: Ensure thrift_proxy tests/mocks do not fail to compile with missing Validate method on google::protobuf::Struct #10780

Merged
merged 4 commits into from
Apr 16, 2020
Merged

Windows compilation: Ensure thrift_proxy tests/mocks do not fail to compile with missing Validate method on google::protobuf::Struct #10780

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34d775b
Match dubbo_proxy mock structure in thrift_proxy mocks
wrowe Apr 14, 2020
73a2ad5
Kick CI
sunjayBhatia Apr 15, 2020
af2a951
Collapse unneeded template into simpler mock class
sunjayBhatia Apr 15, 2020
374abf2
mock_filter_ doesn't need to be public
sunjayBhatia Apr 15, 2020
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: 1 addition & 1 deletion test/extensions/filters/network/thrift_proxy/mocks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ MockDecoderFilterCallbacks::MockDecoderFilterCallbacks() {
MockDecoderFilterCallbacks::~MockDecoderFilterCallbacks() = default;

MockFilterConfigFactory::MockFilterConfigFactory()
: FactoryBase("envoy.filters.thrift.mock_filter") {
: MockFactoryBase("envoy.filters.thrift.mock_filter") {
mock_filter_ = std::make_shared<NiceMock<MockDecoderFilter>>();
}

Expand Down
30 changes: 29 additions & 1 deletion test/extensions/filters/network/thrift_proxy/mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,35 @@ class MockDecoderFilterCallbacks : public DecoderFilterCallbacks {
std::shared_ptr<Router::MockRoute> route_;
};

class MockFilterConfigFactory : public ThriftFilters::FactoryBase<ProtobufWkt::Struct> {
template <class ConfigProto> class MockFactoryBase : public NamedThriftFilterConfigFactory {
public:
FilterFactoryCb
createFilterFactoryFromProto(const Protobuf::Message& proto_config,
const std::string& stats_prefix,
Server::Configuration::FactoryContext& context) override {
const auto& typed_config = dynamic_cast<const ConfigProto&>(proto_config);
return createFilterFactoryFromProtoTyped(typed_config, stats_prefix, context);
sunjayBhatia marked this conversation as resolved.
Show resolved Hide resolved
}

ProtobufTypes::MessagePtr createEmptyConfigProto() override {
return std::make_unique<ConfigProto>();
}

std::string name() const override { return name_; }

protected:
MockFactoryBase(const std::string& name) : name_(name) {}

private:
virtual FilterFactoryCb
createFilterFactoryFromProtoTyped(const ConfigProto& proto_config,
const std::string& stats_prefix,
Server::Configuration::FactoryContext& context) PURE;

const std::string name_;
};

class MockFilterConfigFactory : public MockFactoryBase<ProtobufWkt::Struct> {
public:
MockFilterConfigFactory();
~MockFilterConfigFactory() override;
Expand Down