diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/net/dns/dns_util_unittest.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/dns/dns_util_unittest.cc')
| -rw-r--r-- | chromium/net/dns/dns_util_unittest.cc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/chromium/net/dns/dns_util_unittest.cc b/chromium/net/dns/dns_util_unittest.cc index f07c342e442..39a89880b4f 100644 --- a/chromium/net/dns/dns_util_unittest.cc +++ b/chromium/net/dns/dns_util_unittest.cc @@ -6,6 +6,7 @@ #include "base/stl_util.h" #include "net/dns/public/dns_protocol.h" +#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { @@ -183,20 +184,24 @@ TEST_F(DNSUtilTest, GetDohUpgradeServersFromNameservers) { doh_servers = GetDohUpgradeServersFromNameservers(nameservers, std::vector<std::string>()); - EXPECT_EQ(3u, doh_servers.size()); - EXPECT_EQ("https://chrome.cloudflare-dns.com/dns-query", - doh_servers[0].server_template); - EXPECT_EQ("https://doh.cleanbrowsing.org/doh/family-filter{?dns}", - doh_servers[1].server_template); - EXPECT_EQ("https://doh.cleanbrowsing.org/doh/security-filter{?dns}", - doh_servers[2].server_template); + EXPECT_THAT( + doh_servers, + testing::ElementsAre( + DnsOverHttpsServerConfig( + "https://chrome.cloudflare-dns.com/dns-query", true), + DnsOverHttpsServerConfig( + "https://doh.cleanbrowsing.org/doh/family-filter{?dns}", false), + DnsOverHttpsServerConfig( + "https://doh.cleanbrowsing.org/doh/security-filter{?dns}", + false))); doh_servers = GetDohUpgradeServersFromNameservers( nameservers, std::vector<std::string>( {"CleanBrowsingSecure", "Cloudflare", "Unexpected"})); - EXPECT_EQ(1u, doh_servers.size()); - EXPECT_EQ("https://doh.cleanbrowsing.org/doh/family-filter{?dns}", - doh_servers[0].server_template); + EXPECT_THAT( + doh_servers, + testing::ElementsAre(DnsOverHttpsServerConfig( + "https://doh.cleanbrowsing.org/doh/family-filter{?dns}", false))); } TEST_F(DNSUtilTest, GetDohProviderIdForHistogramFromDohConfig) { |