Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Unified Diff: chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc

Issue 2844063002: Add support for multiple simultaneous subresource_filter::Configurations. (Closed)
Patch Set: Address all comments. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
diff --git a/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc b/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
index 906be57b166cda0039a08700518926596742b3a0..4970171d014c46751dd18154a2916dbe51e684e8 100644
--- a/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
+++ b/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
@@ -8,6 +8,7 @@
#include <memory>
#include <string>
#include <utility>
+#include <vector>
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -86,9 +87,9 @@ class SubresourceFilterMockComponentUpdateService
};
subresource_filter::Configuration CreateConfigUsingRulesetFlavor(
- const char* ruleset_flavor) {
+ std::string ruleset_flavor) {
Sorin Jianu 2017/05/09 01:49:08 can we pass by ref to const and avoid the move bel
engedy 2017/05/09 11:39:35 Done.
subresource_filter::Configuration config;
- config.ruleset_flavor = ruleset_flavor;
+ config.general_settings.ruleset_flavor = std::move(ruleset_flavor);
return config;
}
@@ -171,14 +172,6 @@ class SubresourceFilterComponentInstallerTest : public PlatformTest {
return traits_->GetInstallerAttributes();
}
- void ExpectInstallerTag(const char* expected_tag,
- const char* ruleset_flavor) {
- subresource_filter::testing::ScopedSubresourceFilterConfigurator
- scoped_configuration(CreateConfigUsingRulesetFlavor(ruleset_flavor));
- EXPECT_EQ(expected_tag,
- SubresourceFilterComponentInstallerTraits::GetInstallerTag());
- }
-
private:
base::ScopedTempDir component_install_dir_;
base::ScopedTempDir ruleset_service_dir_;
@@ -262,13 +255,41 @@ TEST_F(SubresourceFilterComponentInstallerTest, LoadFileWithData) {
}
TEST_F(SubresourceFilterComponentInstallerTest, InstallerTag) {
- ExpectInstallerTag("", "");
- ExpectInstallerTag("a", "a");
- ExpectInstallerTag("b", "b");
- ExpectInstallerTag("c", "c");
- ExpectInstallerTag("d", "d");
- ExpectInstallerTag("invalid", "e");
- ExpectInstallerTag("invalid", "foo");
+ const struct {
+ const char* expected_installer_tag_selected;
+ std::vector<std::string> ruleset_flavors;
+ } kTestCases[] = {{"", std::vector<std::string>()},
+ {"", {""}},
+ {"a", {"a"}},
+ {"b", {"b"}},
+ {"c", {"c"}},
+ {"d", {"d"}},
+ {"invalid", {"e"}},
+ {"invalid", {"foo"}},
+ {"", {"", ""}},
+ {"a", {"a", ""}},
+ {"a", {"", "a"}},
+ {"a", {"a", "a"}},
+ {"c", {"b", "", "c"}},
+ {"b", {"", "b", "a"}},
+ {"c", {"aaa", "c", "aba"}},
+ {"invalid", {"", "a", "e"}},
+ {"invalid", {"foo", "a", "b"}}};
+
+ for (const auto& test_case : kTestCases) {
+ SCOPED_TRACE(::testing::Message()
+ << "ruleset_flavors: "
+ << ::testing::PrintToString(test_case.ruleset_flavors));
+
+ std::vector<subresource_filter::Configuration> configs;
+ for (const auto& ruleset_flavor : test_case.ruleset_flavors)
+ configs.push_back(CreateConfigUsingRulesetFlavor(ruleset_flavor));
+ subresource_filter::testing::ScopedSubresourceFilterConfigurator
+ scoped_configuration(std::move(configs));
+
+ EXPECT_EQ(test_case.expected_installer_tag_selected,
+ SubresourceFilterComponentInstallerTraits::GetInstallerTag());
+ }
}
TEST_F(SubresourceFilterComponentInstallerTest, InstallerAttributesDefault) {

Powered by Google App Engine
This is Rietveld 408576698