Skip to content

remove use of std::tuple in gzip_filter_test to avoid compilation err… #7099

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
htuch merged 1 commit into from
May 29, 2019
Merged

remove use of std::tuple in gzip_filter_test to avoid compilation err… #7099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions source/server/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,15 +594,15 @@ void InstanceImpl::shutdownAdmin() {
ServerLifecycleNotifier::HandlePtr InstanceImpl::registerCallback(Stage stage,
StageCallback callback) {
auto& callbacks = stage_callbacks_[stage];
return absl::make_unique<LifecycleCallbackHandle<StageCallback>>(callbacks, callback);
return std::make_unique<LifecycleCallbackHandle<StageCallback>>(callbacks, callback);
}

ServerLifecycleNotifier::HandlePtr
InstanceImpl::registerCallback(Stage stage, StageCallbackWithCompletion callback) {
ASSERT(stage == Stage::ShutdownExit);
auto& callbacks = stage_completable_callbacks_[stage];
return absl::make_unique<LifecycleCallbackHandle<StageCallbackWithCompletion>>(callbacks,
callback);
return std::make_unique<LifecycleCallbackHandle<StageCallbackWithCompletion>>(callbacks,
callback);
}

void InstanceImpl::notifyCallbacksForStage(Stage stage, Event::PostCb completion_cb) {
Expand Down
27 changes: 13 additions & 14 deletions test/extensions/filters/http/gzip/gzip_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,12 @@ class GzipFilterTest : public testing::Test {
}

void expectValidCompressionStrategyAndLevel(
std::tuple<Compressor::ZlibCompressorImpl::CompressionStrategy, std::string,
Compressor::ZlibCompressorImpl::CompressionLevel, std::string>
compression_settings) {
Compressor::ZlibCompressorImpl::CompressionStrategy strategy, absl::string_view strategy_name,
Compressor::ZlibCompressorImpl::CompressionLevel level, absl::string_view level_name) {
setUpFilter(fmt::format(R"EOF({{"compression_strategy": "{}", "compression_level": "{}"}})EOF",
std::get<1>(compression_settings), std::get<3>(compression_settings)));
EXPECT_EQ(std::get<0>(compression_settings), config_->compressionStrategy());
EXPECT_EQ(std::get<2>(compression_settings), config_->compressionLevel());
strategy_name, level_name));
EXPECT_EQ(strategy, config_->compressionStrategy());
EXPECT_EQ(level, config_->compressionLevel());
EXPECT_EQ(5, config_->memoryLevel());
EXPECT_EQ(30, config_->minimumLength());
EXPECT_EQ(28, config_->windowBits());
Expand Down Expand Up @@ -211,17 +210,17 @@ TEST_F(GzipFilterTest, DefaultConfigValues) {

TEST_F(GzipFilterTest, AvailableCombinationCompressionStrategyAndLevelConfig) {
expectValidCompressionStrategyAndLevel(
{Compressor::ZlibCompressorImpl::CompressionStrategy::Filtered, "FILTERED",
Compressor::ZlibCompressorImpl::CompressionLevel::Best, "BEST"});
Compressor::ZlibCompressorImpl::CompressionStrategy::Filtered, "FILTERED",
Compressor::ZlibCompressorImpl::CompressionLevel::Best, "BEST");
expectValidCompressionStrategyAndLevel(
{Compressor::ZlibCompressorImpl::CompressionStrategy::Huffman, "HUFFMAN",
Compressor::ZlibCompressorImpl::CompressionLevel::Best, "BEST"});
Compressor::ZlibCompressorImpl::CompressionStrategy::Huffman, "HUFFMAN",
Compressor::ZlibCompressorImpl::CompressionLevel::Best, "BEST");
expectValidCompressionStrategyAndLevel(
{Compressor::ZlibCompressorImpl::CompressionStrategy::Rle, "RLE",
Compressor::ZlibCompressorImpl::CompressionLevel::Speed, "SPEED"});
Compressor::ZlibCompressorImpl::CompressionStrategy::Rle, "RLE",
Compressor::ZlibCompressorImpl::CompressionLevel::Speed, "SPEED");
expectValidCompressionStrategyAndLevel(
{Compressor::ZlibCompressorImpl::CompressionStrategy::Standard, "DEFAULT",
Compressor::ZlibCompressorImpl::CompressionLevel::Standard, "DEFAULT"});
Compressor::ZlibCompressorImpl::CompressionStrategy::Standard, "DEFAULT",
Compressor::ZlibCompressorImpl::CompressionLevel::Standard, "DEFAULT");
}

// Acceptance Testing with default configuration.
Expand Down